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 3fed21832be3c41e694f6da707c51837844ac261..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,9 +26,9 @@
 
 include ./config.mak
 
-BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib tmp gecko-sdk
+BUILDDIRS = bin doc etc include info lib man sbin share tmp gecko-sdk
 
-ifdef HAVE_DARWIN_OS_ON_INTEL
+ifdef HAVE_DARWIN_OS
 TARGETALL=using-bin
 else
 TARGETALL=using-src
@@ -43,9 +44,9 @@ src: using-src
 
 ifdef HAVE_DARWIN_OS
 
-CONTRIBREV=2
+CONTRIBREV=10
 contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
-       $(WGET) ftp://ftp.videolan.org/pub/videolan/testing/contrib/$@
+       $(WGET) http://downloads.videolan.org/pub/videolan/testing/contrib/$@
 
 using-bin: contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
        @if test -d tmp; then \
@@ -80,12 +81,14 @@ package-macosx:
                exit 1 ; \
        fi
        mkdir tmp
-       tar cf - bin sbin include lib vlc-lib share/aclocal* share/autoconf* \
-               share/automake* share/gettext* share/libtool* \
+       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