contribs: updated binary package for Mac OS X (i686 and x86_64 only for now)

[vlc] / extras / contrib / Makefile

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index a549ec9ed0be03935f7691b3ef4ba7fd40987115..87403374d1918801391bbd197000a24af35f4c51 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -1,10 +1,12 @@
 # ***************************************************************************
 # Makefile : Build vlc-contrib files
 # ***************************************************************************
-# Copyright (C) 2003 VideoLAN
+# 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,56 +20,106 @@
 #
 # 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 tmp
+BUILDDIRS = bin doc etc include info lib man sbin share tmp gecko-sdk
 
-all: FORCE
-       @echo "Do you mean to make src or make bin ?"
+ifdef HAVE_DARWIN_OS
+TARGETALL=using-bin
+else
+TARGETALL=using-src
+endif
 
-src: FORCE
-       $(MAKE) -C src all
+all: $(TARGETALL)
 
-contrib-macosx.tar.bz2: FORCE
-       $(WGET) $(CONTRIB_URL)
+using-src:
+       $(MAKE) -C src
 
-bin: contrib-macosx.tar.bz2
+# shortcut
+src: using-src
+
+ifdef HAVE_DARWIN_OS
+
+ifdef HAVE_DARWIN_OS_ON_INTEL
+CONTRIBREV=6
+else
+CONTRIBREV=5
+endif
+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
-       bunzip2 -c $< | (cd tmp; tar xf -)
-       ./change_prefix.sh tmp @@CONTRIB_PREFIX@@ $(PREFIX)
-       (cd tmp; tar cf - .) | tar xf -
+       (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
-       ranlib lib/*\.a
+endif
 
-clean-src: FORCE
-    rm -rf $(BUILDDIRS)
+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 ?"
+clean:
+       $(MAKE) clean-src
+       rm -rf config.mak distro.mak
+
+bin: using-bin
 
-package: FORCE
+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
 
-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/$(DISTDIR)
+       tar cf - --dereference bin sbin include lib share/aclocal*\
+               share/autoconf* share/qt4* \
+               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
+
+.PHONY: all clean-src clean-bin clean package-macosx package-win32