From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sun, 14 Feb 2010 08:20:13 +0000 (+0200)
Subject: Contribs: refactor flac build
X-Git-Tag: 1.1.0-ff~71
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9c473ff83cd398c7361b1fce295a4bbbda14d3ad;p=vlc

Contribs: refactor flac build
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b0647bfe27..1221df4176 100644
--- 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)
-endif
-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
+	cd $< && \
+	$(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  $(FLAC_DISABLE_FLAGS)
 endif
+	cd $</src && \
+	make -C libFLAC install
+	cd $< && make -C include install
 	$(INSTALL_NAME)
 	touch $@