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

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index ef7bcd3a99..6367d148f1 100644
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -25,7 +25,7 @@
 
 include ./config.mak
 
-BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib tmp
+BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib tmp gecko-sdk
 
 all: FORCE
 #	@echo "Do you mean to make src or make bin ?"
@@ -69,6 +69,7 @@ clean: FORCE
 	@echo "    you probably wanna run 'make clean-src' then"
 	@echo "    you can still run 'make clean-bin' manually if needed"
 	$(MAKE) clean-src
+	rm -rf config.mak distro.mak
 
 package-macosx: FORCE
 	@if test -d tmp; then \
@@ -83,27 +84,35 @@ package-macosx: FORCE
 	(cd tmp; tar cf - .) | bzip2 -c > contrib-macosx.tar.bz2
 	rm -rf tmp
 
+DISTDIR = usr/win32
+
 package-win32: FORCE
 	@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/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: