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 7ccc993d9b8b85d50b93f00a18db07a6ba73ac12..de6859c17ebb7db578b07589b293639fc112dfed 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -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,7 +68,7 @@ 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 hosts/$(HOST)/.$(CONTRIBREV)
 
@@ -76,16 +76,17 @@ using-bin: hosts/$(HOST)/.$(CONTRIBREV)
 
 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