From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Sat, 24 May 2008 13:55:24 +0000 (+0200)
Subject: Add GNU Make 3.81 for Darwin 8
X-Git-Tag: 0.9.0-test0~760
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=876df3a7f4b60549f6006414f218976a122923c9;p=vlc

Add GNU Make 3.81 for Darwin 8
---

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 981458592a..6082a5ef89 100644
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -1,12 +1,12 @@
 # Darwin rules
-download-all: autoconf automake libtool gettext pkgconfig freetype2 \
+download-all: autoconf gnumake automake libtool gettext pkgconfig freetype2 \
     fribidi a52dec mpeg2dec libid3tag libmad libogg libvorbis libtheora flac \
     speex libshout faad2 faac lame twolame libebml libmatroska ffmpeg libdca \
     libdvdcss libdvdnav libdvbpsi live libcaca libmodplug xml asa jpeg tiff \
     SDL zlib libpng libgpg-error libgcrypt opencdk gnutls libopendaap libcddb \
     libcdio vcdimager SDL_image glib gecko-sdk mpcdec dirac expat taglib \
     x264 yasm goom lua zvbi fontconfig ncurses all
-all: .autoconf .automake .libtool .intl .pkgcfg .freetype \
+all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .freetype \
     .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
     .flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
     .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod .asa \
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 1e278c06af..289da9c3a2 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -259,6 +259,28 @@ CLEAN_FILE += .autoconf
 CLEAN_PKG += autoconf
 DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2
 
+# ***************************************************************************
+# gnumake
+# ***************************************************************************
+
+make-$(GNUMAKE_VERSION).tar.bz2:
+	$(WGET) $(GNUMAKE_URL)
+
+gnumake: make-$(GNUMAKE_VERSION).tar.bz2
+	$(EXTRACT_BZ2)
+
+.gnumake: gnumake
+ifdef HAVE_DARWIN_OS
+ifndef HAVE_DARWIN_9
+	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+endif
+endif
+	touch $@
+
+CLEAN_FILE += .gnumake
+CLEAN_PKG += gnumake
+DISTCLEAN_PKG += make-$(GNUMAKE_VERSION).tar.bz2
+
 # ***************************************************************************
 # CMake
 # ***************************************************************************
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 02e40d5d48..bb558156a7 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -38,6 +38,8 @@ LIBAMR_WB=$(PENGUIN)/amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 # we have to use a newer though, because bootstrap won't work otherwise
 AUTOCONF_VERSION=2.61
 AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.bz2
+GNUMAKE_VERSION=3.81
+GNUMAKE_URL=$(GNU)/make/make-$(GNUMAKE_VERSION).tar.bz2
 CMAKE_VERSION=2.6.0
 CMAKE_URL=http://www.cmake.org/files/v2.6/cmake-$(CMAKE_VERSION).tar.gz
 LIBTOOL_VERSION=1.5.24