Contribs: refactor flac build

9c473ff8 · Rémi Denis-Courmont · 5a109618 · 9c473ff8
Commit 9c473ff8 authored Feb 14, 2010 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 10 deletions

extras/contrib/src/Makefile extras/contrib/src/Makefile +7 -10

No files found.
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -850,19 +850,16 @@ endif
 FLAC_DISABLE_FLAGS = --disable-oggtest --disable-xmms-plugin --disable-cpplibs
 .flac: flac .ogg
-ifdef HAVE_WIN32
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install)
-else
-ifdef HAVE_DARWIN_OS
 ifdef HAVE_DARWIN_OS_ON_INTEL
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm-optimizations && cd src && make -C libFLAC && make -C libFLAC install  && cd .. && make -C include install)
+	cd $< && \
+	$(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm-optimizations $(FLAC_DISABLE_FLAGS)
 else
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) && cd src && make -C libFLAC && make -C libFLAC install  && cd .. && make -C include install)
+	cd $< && \
-endif
+	$(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  $(FLAC_DISABLE_FLAGS)
-else
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  $(FLAC_DISABLE_FLAGS) && cd src && make -C libFLAC && make -C libFLAC install  && cd .. && make -C include install)
-endif
 endif
+	cd $</src && \
+	make -C libFLAC install
+	cd $< && make -C include install
 	$(INSTALL_NAME)
 	touch $@