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 a16307605e559b9271633140c91e4f5815ef5c1d..6367d148f12091a8faa5a58731c58bf5f23f4886 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -1,10 +1,12 @@
 # ***************************************************************************
 # Makefile : Build vlc-contrib files
 # ***************************************************************************
-# Copyright (C) 2003 VideoLAN
-# $Id: Makefile,v 1.1 2003/11/15 01:21:48 massiot Exp $
+# Copyright (C) 2003-2006 the VideoLAN team
+# $Id$
 # 
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
+#          Derk-Jan Hartman <hartman at videolan dot org>
+#          Christophe Mutricy <xtophe at videolan dot org>
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,24 +20,43 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 # ***************************************************************************
 
 include ./config.mak
 
-BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib
+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 ?"
+#      @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
 
-bin: FORCE
+contrib-macosx.tar.bz2: FORCE
        $(WGET) $(CONTRIB_URL)
-       bunzip2 -c $< | tar xf -
+
+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
+       rm -rf $(BUILDDIRS)
        $(MAKE) -C src clean-src
 
 clean-bin: FORCE
@@ -43,11 +64,55 @@ clean-bin: FORCE
        $(MAKE) -C src clean-dots
 
 clean: FORCE
-       @echo "Do you mean to clean-src or clean-bin ?"
+#      @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"
+       $(MAKE) clean-src
+       rm -rf config.mak distro.mak
 
-package: FORCE
-       tar cf - bin include lib vlc-lib share/aclocal* share/autoconf* \
+package-macosx: FORCE
+       @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* \
-               | bzip2 -c > contrib.tar.bz2
+               | (cd tmp; tar xf -)
+       ./change_prefix.sh tmp $(PREFIX) @@CONTRIB_PREFIX@@
+       (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/$(DISTDIR)
+       tar cf - --dereference bin sbin include lib share/aclocal*\
+               share/autoconf* \
+               share/automake* share/gettext* gecko-sdk\
+               | (cd tmp/$(DISTDIR); tar xpf -)
+#kludge for live.com
+       mkdir -p tmp/$(DISTDIR)/live.com
+       for i in groupsock liveMedia UsageEnvironment BasicUsageEnvironment; do \
+               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.
+       ./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:
+