X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2FMakefile;h=97efcece9e98ea6a325e1e657ad612b8fbbf5719;hb=178f2e27fc5353f488638a6d7a43c22baf874cd2;hp=243128ef31bb0c7def7f26efbcd3c6b67fa9f4e2;hpb=43dc8a8d99b061bb1551c55289d1cd30ec6a6285;p=vlc

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 243128ef31..97efcece9e 100644
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -1,7 +1,7 @@
 # ***************************************************************************
 # Makefile : Build vlc-contrib files
 # ***************************************************************************
-# Copyright (C) 2003-2009 the VideoLAN team
+# Copyright (C) 2003-2010 the VideoLAN team
 # $Id$
 # 
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -26,7 +26,7 @@
 
 include ./config.mak
 
-BUILDDIRS = bin doc etc include info lib man sbin share tmp gecko-sdk Sparkle
+BUILDDIRS = hosts build
 
 ifdef HAVE_DARWIN_OS
 TARGETALL=using-bin
@@ -47,12 +47,12 @@ src: using-src
 
 ifdef HAVE_DARWIN_OS
 
-CONTRIBREV=22
+CONTRIBREV=32
 
 contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
 	$(WGET) http://downloads.videolan.org/pub/videolan/testing/contrib/$@
 
-using-bin: contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
+hosts/$(HOST)/.$(CONTRIBREV): contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
 	@if test -d tmp; then \
 		echo "Move away ./tmp, it's in the way" ; \
 		exit 1 ; \
@@ -64,24 +64,31 @@ using-bin: contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
 	(cd tmp && find . -type d) | while read dir; do mkdir -p -- "$(PREFIX)/$$dir"; done
 	(cd tmp && find . -not -type d) | while read i; do mv -f -- tmp/"$$i" "$(PREFIX)/$$i"; done
 	rm -rf tmp
+	# install the gecko-sdk, which isn't part of the package for size and speed reasons
+	(cd src && rm -rf *gecko* && $(MAKE) .gecko)
     # libiconv.la is no longer present on Snow Leopard, so fix possible references to it, which would
     # 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 -f .iconv && $(MAKE) .iconv)
 endif
+	touch hosts/$(HOST)/.$(CONTRIBREV)
+
+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
@@ -92,7 +99,8 @@ package-macosx:
 		exit 1 ; \
 	fi
 	mkdir tmp
-	(cd $(PREFIX); tar cf - *) | (cd tmp; tar xf -)
+	(cd $(PREFIX); tar cf - Sparkle bin sbin include lib share/aclocal* share/autoconf* \
+		share/automake* share/gettext* share/libtool*) | (cd tmp; tar xf -)
 	./change_prefix.sh tmp $(PREFIX) @@CONTRIB_PREFIX@@
 	(cd tmp; tar cf - .) | bzip2 -c > contrib-macosx.tar.bz2
 	rm -rf tmp