[vlc-commits] commit: contribs: Remove build rules for autoconf/automake/gnumake ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sun Oct 31 22:55:32 2010 +0100| [cd0bfcc0536d9203008706af3a6c3af9b4043d9d] | committer: Rafaël Carré 

contribs: Remove build rules for autoconf/automake/gnumake

OSX 10.5 tools are recent enough

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

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

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 92b0c8d..8253d26 100644
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -1,5 +1,5 @@
 # Darwin rules
-all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
+all: .libtool .intl .pkgcfg .yasm .freetype \
     .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
     .flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \
     .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
diff --git a/extras/contrib/src/Distributions/darwin64.mak b/extras/contrib/src/Distributions/darwin64.mak
index b56a963..4ed6b61 100644
--- a/extras/contrib/src/Distributions/darwin64.mak
+++ b/extras/contrib/src/Distributions/darwin64.mak
@@ -1,5 +1,5 @@
 # Darwin rules
-all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
+all: .libtool .intl .pkgcfg .yasm .freetype \
     .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
     .flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \
     .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 06cd760..8488ec9 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -259,46 +259,6 @@ CLEAN_FILE += .errno
 CLEAN_PKG += errno
 
 # ***************************************************************************
-# autoconf
-# ***************************************************************************
-
-autoconf-$(AUTOCONF_VERSION).tar.bz2:
-	$(WGET) $(AUTOCONF_URL)
-
-autoconf: autoconf-$(AUTOCONF_VERSION).tar.bz2
-	$(EXTRACT_BZ2)
-
-.autoconf: autoconf
-	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
-	touch $@
-
-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
 # ***************************************************************************
 cmake-$(CMAKE_VERSION).tar.gz:
@@ -338,24 +298,6 @@ 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 6e03a09..8d308e2 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -34,16 +34,10 @@ LIBAMR_NB=$(PENGUIN)/amrnb-$(LIBAMR_NB_VERSION).tar.bz2
 LIBAMR_WB_VERSION=7.0.0.2
 LIBAMR_WB=$(PENGUIN)/amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 ERRNO_URL=http://altair.videolan.org/~linkfanel/errno
-AUTOCONF_VERSION=2.63
-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.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
-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