contribs: Use GCC 4.2 instead of LLVM-GCC 4.2 to compile the 32bit contribs on Darwin...

[vlc] / extras / contrib / Makefile

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 71fec98e7d22af01ff3def9854692f70199ef027..aacd1220466b2c58b1f2e7f00a636501a460aa6c 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -1,13 +1,14 @@
 # ***************************************************************************
 # Makefile : Build vlc-contrib files
 # ***************************************************************************
-# Copyright (C) 2003-2006 the VideoLAN team
+# Copyright (C) 2003-2009 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>
-# 
+#          Felix Paul Kühne <fkuehne 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
 # the Free Software Foundation; either version 2 of the License, or    
@@ -25,13 +26,40 @@
 
 include ./config.mak
 
-BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib tmp gecko-sdk config.mak distro.mak
+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)
 
-all:
+using-src:
        $(MAKE) -C src
 
-contrib-macosx.tar.bz2:
-       $(WGET) $(CONTRIB_URL)
+# shortcut
+src: using-src
+
+ifdef HAVE_DARWIN_OS
+
+CONTRIBREV=10
+contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
+       $(WGET) http://downloads.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
+       (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)
@@ -45,18 +73,22 @@ clean:
        $(MAKE) clean-src
        rm -rf config.mak distro.mak
 
+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
+       rm -f contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
+       mv contrib-macosx.tar.bz2 contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
 
 DISTDIR = usr/win32
 
@@ -67,7 +99,7 @@ package-win32:
        fi
        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/$(DISTDIR); tar xpf -)
 #kludge for live.com