[vlc-commits] commit: contrib: Fix and simplify libvpx build settings. (Pierre d' Herbemont )

[git at videolan.org]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Wed Nov 10 00:25:59 2010 +0100| [41373a85a2c343cf06dd6312fefd04346400ba6b] | committer: Pierre d'Herbemont 

contrib: Fix and simplify libvpx build settings.

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

 extras/contrib/src/contrib-src.mak |   29 ++++++++---------------------
 1 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 176df23..7798b9e 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -874,30 +874,17 @@ libvpx:
 	$(GIT) clone git://review.webmproject.org/libvpx.git
 
 ifdef HAVE_WIN32
-VPX_TARGET=x86-win32-gcc
 CROSS=$(HOST)-
-else
-ifdef HAVE_MACOSX
-ifdef HAVE_MACOSX64
-VPX_TARGET=x86_64-MACOSX9-gcc
-else
-ifdef HAVE_MACOSX_ON_INTEL
-VPX_TARGET=x86-MACOSX9-gcc
-else
-VPX_TARGET=ppc32-MACOSX9-gcc
-endif
-endif
-else
-VPX_TARGET=FIXME
-endif
 endif
 
-ifdef HAVE_MACOSX_ON_INTEL
-.libvpx: libvpx .yasm
-else
-.libvpx: libvpx
-endif
-	(cd $<; CROSS=$(CROSS) ./configure --target=$(VPX_TARGET) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-install-docs --disable-examples --disable-vp8-decoder && make && make install)
+VPX_TARGET-$(ENABLED)             = $(TARGET)
+VPX_TARGET-$(HAVE_WIN32)          = x86-win32-gcc
+
+VPX_DEPS-$(ENABLED)               =
+VLX_DEPS-$(HAVE_MACOSX_ON_INTEL) += .yasm
+
+.libvpx: libvpx $(VPX_DEPS-1)
+	(cd $<; CROSS=$(CROSS) ./configure --target=$(VPX_TARGET-1) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-install-docs --disable-examples --disable-vp8-decoder && make && make install)
 	(rm -rf $(PREFIX)/include/vpx/ && mkdir -p $(PREFIX)/include/vpx/; cd $< && cp vpx/*.h vpx_ports/*.h $(PREFIX)/include/vpx/) # Of course, why the hell would one expect it to be listed or in make install?
 	rm $(PREFIX)/include/vpx/config.h
 	(cd $<; $(RANLIB) libvpx.a && mkdir -p $(PREFIX)/lib && cp libvpx.a $(PREFIX)/lib/) # Of course, why the hell would one expect it to be listed or in make install?