Contribs: update libtiff URL.

[vlc] / extras / contrib / contrib.mak

diff --git a/extras/contrib/contrib.mak b/extras/contrib/contrib.mak
index ef99bae95264c030c9dea6817ebf7b4e03eac956..d8d657a906ae1c7596aac23a8ca6fd68390d2ff8 100644 (file)
--- a/extras/contrib/contrib.mak
+++ b/extras/contrib/contrib.mak
@@ -1,7 +1,7 @@
 # ***************************************************************************
 # Makefile : Build vlc-contrib files
 # ***************************************************************************
-# Copyright (C) 2003-2010 the VideoLAN team
+# Copyright (C) 2003-2011 the VideoLAN team
 # $Id$
 # 
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -28,7 +28,7 @@ include ./config.mak
 
 BUILDDIRS = hosts build
 
-ifdef HAVE_DARWIN_OS
+ifdef HAVE_MACOSX
 TARGETALL=using-bin
 else
 TARGETALL=using-src
@@ -37,15 +37,10 @@ endif
 all: $(TARGETALL)
 
 using-src:
+       $(MAKE) -C build-src tools
        $(MAKE) -C build-src
-# Copy aclocal files
-# This is necessary for --missing aclocal to succeed after a
-# configure.ac/Makefile.am change in the vlc root dir
-       if test -e "$(PREFIX)/share/aclocal"; then \
-           cp -Rf $(PREFIX)/share/aclocal/* $(VLCROOTDIR)/m4; \
-       fi
 
-ifdef HAVE_DARWIN_10
+ifdef HAVE_MACOSX_DARWIN_10
        (cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
 endif
 
@@ -54,10 +49,10 @@ src: using-src
 
 ifdef HAVE_DARWIN_OS
 
-CONTRIBREV=34
+CONTRIBREV=50
 
 contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
-       $(WGET) http://downloads.videolan.org/pub/videolan/testing/contrib/$@
+       $(WGET) http://downloads.videolan.org/pub/videolan/testing/contrib/macosx/$@
 
 .$(CONTRIBREV): contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
        @if test -d tmp; then \
@@ -75,9 +70,9 @@ contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
        (cd build-src && rm -rf *gecko* && $(MAKE) .gecko)
     # libiconv.la is no longer present on Snow Leopard, so fix possible references to it, which would
     # result in linking issues
-ifdef HAVE_DARWIN_10
+ifdef HAVE_MACOSX_DARWIN_10
        (cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
-       (cd build-src && rm -f .iconv && $(MAKE) .iconv)
+       (cd build-src && rm -f .iconv && $(MAKE) .iconv-from-os)
 endif
        touch .$(CONTRIBREV)
 
@@ -94,9 +89,7 @@ clean-bin:
        $(MAKE) -C build-src clean-dots
 
 distclean:
-       $(MAKE) clean
-       $(MAKE) -C build-src clean-src
-       rm -rf config.mak distro.mak
+       rm -rf $(BUILDDIRS) config.mak distro.mak build-src toolchain.cmake Makefile
 
 bin: using-bin
 
@@ -106,7 +99,7 @@ package-macosx:
                exit 1 ; \
        fi
        mkdir tmp
-       (cd $(PREFIX); tar cf - Sparkle bin sbin include lib share/aclocal* share/autoconf* \
+       (cd $(PREFIX); tar cf - Sparkle Growl BGHUDAppKit bin sbin include lib share/aclocal* share/autoconf* \
                share/automake* share/gettext* share/libtool*) | (cd tmp; tar xf -)
        ./change_prefix.sh tmp $(PREFIX) @@CONTRIB_PREFIX@@
        (cd tmp; tar cf - .) | bzip2 -c > contrib-macosx.tar.bz2