* fixed the compilation of gettext&libiconv on Darwin and updated the copyright-dates

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 29d5d346fbd256c849defd584b2b57157628c1d9..28c673d247873f5f6f6456a8c93fba89e3c58cb6 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1,13 +1,13 @@
 # ***************************************************************************
 # src/Makefile : Dearchive and compile all files necessary
 # ***************************************************************************
-# Copyright (C) 2003 - 2005 the VideoLAN team
+# Copyright (C) 2003 - 2006 the VideoLAN team
 # $Id$
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 #          Derk-Jan Hartman <hartman at videolan dot org>
 #          Eric Petit <titer@m0k.org>
-#          Felix Kühne <fkuehne@users.sourceforge.net>
+#          Felix Kühne <fkuehne@users.sourceforge.net>
 #          Christophe Mutricy <xtophe@nxtelevision.com>
 #          Gildas Bazin <gbazin at videolan dot org>
 #
@@ -407,7 +407,7 @@ ifdef HAVE_DARWIN_OS
 endif
 
 ifdef HAVE_DARWIN_OS
-.iconv:
+.iconv: libiconv
        touch $@
        (cd libiconv; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
 else
@@ -1387,7 +1387,7 @@ libpng-$(PNG_VERSION).tar.bz2:
 libpng: libpng-$(PNG_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 ifdef HAVE_WIN32
-       (cd $@; cat ../Patches/libpng-1.2.5-win32.patch | sed s,££PREFIX££,$(PREFIX), | patch -p0)
+       (cd $@; cat ../Patches/libpng-1.2.5-win32.patch | sed s,??PREFIX??,$(PREFIX), | patch -p0)
 else
        (cat Patches/libpng-osx.patch | sed -e 's%??PREFIX??%$(PREFIX)%' -e 's%??EXTRA_CFLAGS??%$(EXTRA_CFLAGS)%' -e 's%??EXTRA_LDFLAGS??%$(EXTRA_LDFLAGS)%' | patch -p0)
 endif
@@ -1438,7 +1438,7 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .gpg-error: libgpg-error
-       (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
+       (cd $<; ./autogen.sh && libtoolize --force && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
        $(INSTALL_NAME)
        touch $@