[vlc-devel] commit: Contribs: refactor flac build ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Feb 14 10:20:13 2010 +0200| [9c473ff83cd398c7361b1fce295a4bbbda14d3ad] | committer: Rémi Denis-Courmont 

Contribs: refactor flac build

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9c473ff83cd398c7361b1fce295a4bbbda14d3ad
---

 extras/contrib/src/Makefile |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b0647bf..1221df4 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 $@