contribs: updated contrib package for Mac OS X including the recent x264, libdvdcss...

[vlc] / extras / contrib / Makefile

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 73d132c4a8e27a9cede30e28b9cd97995652bb46..de6859c17ebb7db578b07589b293639fc112dfed 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -29,7 +29,7 @@ include ./config.mak
 BUILDDIRS = hosts build
 
 ifdef HAVE_DARWIN_OS
-TARGETALL=fat-bin
+TARGETALL=using-bin
 else
 TARGETALL=using-src
 endif
@@ -47,7 +47,7 @@ src: using-src
 
 ifdef HAVE_DARWIN_OS
 
-CONTRIBREV=22
+CONTRIBREV=25
 
 contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
        $(WGET) http://downloads.videolan.org/pub/videolan/testing/contrib/$@
@@ -68,43 +68,25 @@ hosts/$(HOST)/.$(CONTRIBREV): contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
     # result in linking issues
 ifdef HAVE_DARWIN_10
        (cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
-       (cd src && $(MAKE) .iconv)
+       (cd src && rm .iconv && $(MAKE) .iconv)
 endif
-       touch $@
+       touch hosts/$(HOST)/.$(CONTRIBREV)
 
 using-bin: hosts/$(HOST)/.$(CONTRIBREV) 
 
-hosts/fat/.$(CONTRIBREV)-from-archs:
-       @if test -d tmp; then \
-               echo "Move away ./tmp, it's in the way" ; \
-               exit 1 ; \
-       fi
-       # FIXME - Doing this without rerunning bootstrap & make would be nicer
-       ./bootstrap i686-apple-darwin10 && make && \
-       ./bootstrap x86_64-apple-darwin10 && make && \
-       mkdir tmp;
-       cp -R hosts/x86_64-apple-darwin10/ tmp;
-       (cd tmp/lib && find . -name "*.dylib" -or -name "*.a") | while read lib; do rm tmp/lib/$$lib \
-          lipo -create hosts/x86_64-apple-darwin10/lib/$$lib hosts/i686-apple-darwin10/lib/$$lib -output tmp/lib/$$lib; \
-       done;
-       rm -Rf hosts/fat && \
-       mv tmp hosts/fat && \
-       touch $@
-        
-fat-bin: hosts/fat/.$(CONTRIBREV)-from-archs
-
 endif
 
-clean-src:
+clean:
        rm -rf $(BUILDDIRS)
-       $(MAKE) -C src clean-src
+       $(MAKE) -C src clean
 
 clean-bin:
        rm -rf $(BUILDDIRS)
        $(MAKE) -C src clean-dots
 
-clean:
-       $(MAKE) clean-src
+distclean:
+       $(MAKE) clean
+       $(MAKE) -C src clean-src
        rm -rf config.mak distro.mak
 
 bin: using-bin