Bump libgnutls - Note that 2.3.4 was available when last bumped

[vlc] / extras / contrib / Makefile

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 94ff22aec93cc0c50e9abfda49ca74c1944ab069..6367d148f12091a8faa5a58731c58bf5f23f4886 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -68,8 +68,8 @@ clean: FORCE
        @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"
-       rm -rf config.mak
        $(MAKE) clean-src
+       rm -rf config.mak distro.mak
 
 package-macosx: FORCE
        @if test -d tmp; then \
@@ -84,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 xpf -)
+               | (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 a+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: