[vlc-commits] commit: contribs: build automake 1.11.1 on Darwin ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Mon Nov  1 19:37:29 2010 +0100| [1147701912ac3bb28f7ee1b36db89be516ec776d] | committer: Rafaël Carré 

contribs: build automake 1.11.1 on Darwin

OSX automake 1.10 can build the contribs but not VLC

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1147701912ac3bb28f7ee1b36db89be516ec776d
---

 extras/contrib/src/Distributions/darwin.mak   |    2 +-
 extras/contrib/src/Distributions/darwin64.mak |    2 +-
 extras/contrib/src/contrib-src.mak            |   18 ++++++++++++++++++
 extras/contrib/src/packages.mak               |    2 ++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 0b35e0d..9a66c68 100644
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -7,7 +7,7 @@ all: .freetype .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
     .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses \
     .schroedinger .libass .libupnp .kate .sqlite3 .Sparkle
 
-TOOLS = .libtool .intl .pkgcfg .yasm
+TOOLS = .libtool .intl .pkgcfg .yasm .automake
 
 # .expat don't work with SDK yet
 # .glib .IDL .gecko are required to build the mozilla plugin
diff --git a/extras/contrib/src/Distributions/darwin64.mak b/extras/contrib/src/Distributions/darwin64.mak
index 7ef230c..cafc664 100644
--- a/extras/contrib/src/Distributions/darwin64.mak
+++ b/extras/contrib/src/Distributions/darwin64.mak
@@ -7,7 +7,7 @@ all: .freetype .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
     .dca .tag .x264 .lua .zvbi .fontconfig .ncurses \
     .schroedinger .libass .libupnp .kate .sqlite3 .Sparkle
 
-TOOLS = .libtool .intl .pkgcfg .yasm
+TOOLS = .libtool .intl .pkgcfg .yasm .automake
 
 # .expat don't work with SDK yet
 # .glib .IDL .gecko are required to build the mozilla plugin
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 585843f..36d47e9 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -299,6 +299,24 @@ CLEAN_FILE += .libtool
 endif
 
 # ***************************************************************************
+# automake
+# ***************************************************************************
+
+automake-$(AUTOMAKE_VERSION).tar.gz:
+	$(WGET) $(AUTOMAKE_URL)
+
+automake: automake-$(AUTOMAKE_VERSION).tar.gz
+	$(EXTRACT_GZ)
+
+.automake: automake
+	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+	touch $@
+
+CLEAN_FILE += .automake
+CLEAN_PKG += automake
+DISTCLEAN_PKG += automake-$(AUTOMAKE_VERSION).tar.gz
+
+# ***************************************************************************
 # pkgconfig
 # ***************************************************************************
 
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 81ba4cc..a090c99 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -38,6 +38,8 @@ CMAKE_VERSION=2.6.4
 CMAKE_URL=http://www.cmake.org/files/v2.6/cmake-$(CMAKE_VERSION).tar.gz
 LIBTOOL_VERSION=2.2.10
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
+AUTOMAKE_VERSION=1.11.1
+AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
 PKGCFG_VERSION=0.23
 #PKGCFG_URL=$(CONTRIB_VIDEOLAN)/pkg-config-$(PKGCFG_VERSION).tar.gz
 PKGCFG_URL=http://pkgconfig.freedesktop.org/releases/pkg-config-$(PKGCFG_VERSION).tar.gz