X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2FMakefile;h=dc70f88e597947e428854f7f719cc3ec10976ea0;hb=62eec6f8a0828cdffaff3499d659aa6d75a1e3ef;hp=ef7bcd3a99233e77c90df267b209705f230d0d1e;hpb=2276b7e77329e91ce77452656ff6aa7cf0057465;p=vlc

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index ef7bcd3a99..dc70f88e59 100644
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -25,85 +25,97 @@
 
 include ./config.mak
 
-BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib tmp
-
-all: FORCE
-#	@echo "Do you mean to make src or make bin ?"
-	@echo "    'make bin' isn't functional at the moment,"
-	@echo "    running 'make src' instead..."
-	$(MAKE) src
-
-src: FORCE
-	$(MAKE) -C src all
-
-contrib-macosx.tar.bz2: FORCE
-	$(WGET) $(CONTRIB_URL)
-
-bin: FORCE
-	@echo "make bin isn't in a functional state at this moment. Please use make src"
-
-#The disabled make bin
-#bin: contrib-macosx.tar.bz2
-#	@if test -d tmp; then \
-#		echo "Move away ./tmp, it's in the way" ; \
-#		exit 1 ; \
-#	fi
-#	mkdir tmp
-#	bunzip2 -c $< | (cd tmp; tar xf -)
-#	./change_prefix.sh tmp @@CONTRIB_PREFIX@@ $(PREFIX)
-#	(cd tmp; tar cf - .) | tar xf -
-#	rm -rf tmp
-#	ranlib lib/*\.a
-
-clean-src: FORCE
+BUILDDIRS = bin doc etc include info lib man sbin share tmp gecko-sdk
+
+ifdef HAVE_DARWIN_OS
+TARGETALL=using-bin
+else
+TARGETALL=using-src
+endif
+
+all: $(TARGETALL)
+
+using-src:
+	$(MAKE) -C src
+
+# shortcut
+src: using-src
+
+ifdef HAVE_DARWIN_OS
+
+CONTRIBREV=5
+contrib-macosx-$(ARCH)-$(CONTRIBREV)-$(DARWIN_COMPILER).tar.bz2:
+	$(WGET) ftp://ftp.videolan.org/pub/videolan/testing/contrib/$@
+
+using-bin: contrib-macosx-$(ARCH)-$(CONTRIBREV)-$(DARWIN_COMPILER).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)
 	$(MAKE) -C src clean-src
 
-clean-bin: FORCE
+clean-bin:
 	rm -rf $(BUILDDIRS)
 	$(MAKE) -C src clean-dots
 
-clean: FORCE
-#	@echo "    Do you mean to clean-src or clean-bin ?"
-	@echo "    'make bin' isn't available at the moment"
-	@echo "    you probably wanna run 'make clean-src' then"
-	@echo "    you can still run 'make clean-bin' manually if needed"
+clean:
 	$(MAKE) clean-src
+	rm -rf config.mak distro.mak
 
-package-macosx: FORCE
+bin: using-bin
+
+package-macosx:
 	@if test -d tmp; then \
 		echo "Move away ./tmp, it's in the way" ; \
 		exit 1 ; \
 	fi
 	mkdir tmp
-	tar cf - bin sbin include lib vlc-lib share/aclocal* share/autoconf* \
-		share/automake* share/gettext* \
+	tar cf - bin sbin include lib share/aclocal* share/autoconf* \
+		share/automake* share/gettext* share/libtool* gecko-sdk \
 		| (cd tmp; tar xf -)
 	./change_prefix.sh tmp $(PREFIX) @@CONTRIB_PREFIX@@
 	(cd tmp; tar cf - .) | bzip2 -c > contrib-macosx.tar.bz2
 	rm -rf tmp
 
-package-win32: FORCE
+DISTDIR = usr/win32
+
+package-win32:
 	@if test -d tmp; then \
 		echo "Move away ./tmp, it's in the way" ; \
 		exit 1 ; \
 	fi
-	mkdir -p tmp/usr/win32
+	mkdir -p tmp/$(DISTDIR)
 	tar cf - --dereference bin sbin include lib share/aclocal*\
-		share/autoconf* \
+		share/autoconf* share/qt4* \
 		share/automake* share/gettext* gecko-sdk\
-		| (cd tmp/usr/win32; tar xf -)
+		| (cd tmp/$(DISTDIR); tar xpf -)
 #kludge for live.com
-	mkdir -p tmp/usr/win32/live.com
+	mkdir -p tmp/$(DISTDIR)/live.com
 	for i in groupsock liveMedia UsageEnvironment BasicUsageEnvironment; do \
-		mkdir -p  tmp/usr/win32/live.com/$$i/include; \
-		cp -r src/live/$$i/include tmp/usr/win32/live.com/$$i; \
-		cp src/live/$$i/lib$${i}.a  tmp/usr/win32/live.com/$$i; \
+		mkdir -p  tmp/$(DISTDIR)/live.com/$$i/include; \
+		cp -r src/live/$$i/include tmp/$(DISTDIR)/live.com/$$i; \
+		cp src/live/$$i/lib$${i}.a  tmp/$(DISTDIR)/live.com/$$i; \
 	done;
-	./change_prefix.sh tmp $(PREFIX) /usr/win32
-#	Klugy kludge	
-	(cd tmp/usr/win32/bin; rm -f *.exe; chmod u+x *)
-	(cd tmp; tar cf - usr/win32/) | bzip2 -c > contrib-`date +%Y%m%d`-win32-bin-gcc-`$(CC) --version|head -n 1|cut -f 3 -d ' '`-only.tar.bz2
+# Change Prefix.
+	./change_prefix.sh tmp $(PREFIX) $(DISTDIR)
+# Hack for qt4
+	(cd tmp/$(DISTDIR)/bin; mv uic.exe uic.ex; mv rcc.exe rcc.ex; mv moc.exe moc.ex)
+#	Remove unused and potentially harmful files	
+	(cd tmp/$(DISTDIR)/bin; rm -rfv *.exe; chmod a+x *)
+# Hack for qt4
+	(cd tmp/$(DISTDIR)/bin; mv uic.ex uic.exe; mv rcc.ex rcc.exe; mv moc.ex moc.exe)
+# Tar it.
+	(cd tmp; tar cf - $(DISTDIR)) | bzip2 -c > contrib-`date +%Y%m%d`-win32-bin-gcc-`$(CC) --version|head -n 1|cut -f 3 -d ' '`-runtime-`/bin/echo -e "#include <_mingw.h>\n__MINGW32_VERSION"|$(CC) -E -|grep -v ^#|grep -v ' '`-only.tar.bz2
 	rm -rf tmp
-FORCE:
 
+.PHONY: all clean-src clean-bin clean package-macosx package-win32