X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2FMakefile;h=3fed21832be3c41e694f6da707c51837844ac261;hb=1e5cb576a6fa7432299c86ac0e42b5a6db5a71dd;hp=1c62f5bf7ec5dfeab29328f52cc132c99bcd474f;hpb=35824733e305214dfada18dd6362cfa02a86dcd3;p=vlc

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 1c62f5bf7e..3fed21832b 100644
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -27,11 +27,38 @@ include ./config.mak
 
 BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib tmp gecko-sdk
 
-all:
+ifdef HAVE_DARWIN_OS_ON_INTEL
+TARGETALL=using-bin
+else
+TARGETALL=using-src
+endif
+
+all: $(TARGETALL)
+
+using-src:
 	$(MAKE) -C src
 
-contrib-macosx.tar.bz2:
-	$(WGET) $(CONTRIB_URL)
+# shortcut
+src: using-src
+
+ifdef HAVE_DARWIN_OS
+
+CONTRIBREV=2
+contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
+	$(WGET) ftp://ftp.videolan.org/pub/videolan/testing/contrib/$@
+
+using-bin: contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
+	@if test -d tmp; then \
+		echo "Move away ./tmp, it's in the way" ; \
+		exit 1 ; \
+	fi
+	mkdir tmp
+	(cd tmp && tar jxvf ../$<)
+	./change_prefix.sh tmp @@CONTRIB_PREFIX@@  $(PREFIX)
+	for dir in `(cd tmp && find . -type d)`; do mkdir -p -- $$dir; done
+	for i in `(cd tmp && find . -not -type d)`; do mv -f tmp/$$i $$i; done
+	rm -rf tmp
+endif
 
 clean-src:
 	rm -rf $(BUILDDIRS)
@@ -45,6 +72,8 @@ clean:
 	$(MAKE) clean-src
 	rm -rf config.mak distro.mak
 
+bin: using-bin
+
 package-macosx:
 	@if test -d tmp; then \
 		echo "Move away ./tmp, it's in the way" ; \
@@ -52,7 +81,7 @@ package-macosx:
 	fi
 	mkdir tmp
 	tar cf - bin sbin include lib vlc-lib share/aclocal* share/autoconf* \
-		share/automake* share/gettext* \
+		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