[vlc-commits] commit: contrib: Remove the TOOLS hack for darwin. (Pierre d'Herbemont )

[git at videolan.org]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Tue Nov  2 22:25:59 2010 +0100| [257d6f3ba1463429b8f624c9b436758d7e02b7be] | committer: Pierre d'Herbemont 

contrib: Remove the TOOLS hack for darwin.

This introduce a circular dependency. The correct way (which what Rafael is doing) is to explicitely set the dependencies in the .package to automake, libtool...

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

 extras/contrib/src/Distributions/darwin.mak   |    5 ++---
 extras/contrib/src/Distributions/darwin64.mak |    5 ++---
 extras/contrib/src/contrib-src.mak            |    6 ------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 9a66c68..553196b 100644
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -1,5 +1,6 @@
 # Darwin rules
-all: .freetype .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
+all: .libtool .intl .pkgcfg .yasm .automake .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 \
     .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
@@ -7,8 +8,6 @@ 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 .automake
-
 # .expat don't work with SDK yet
 # .glib .IDL .gecko are required to build the mozilla plugin
 # .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package
diff --git a/extras/contrib/src/Distributions/darwin64.mak b/extras/contrib/src/Distributions/darwin64.mak
index cafc664..b90f760 100644
--- a/extras/contrib/src/Distributions/darwin64.mak
+++ b/extras/contrib/src/Distributions/darwin64.mak
@@ -1,5 +1,6 @@
 # Darwin rules
-all: .freetype .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
+all: .libtool .intl .pkgcfg .yasm .automake .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 \
     .png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
@@ -7,8 +8,6 @@ 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 .automake
-
 # .expat don't work with SDK yet
 # .glib .IDL .gecko are required to build the mozilla plugin
 # .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index d0c1a8d..e5b1d90 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2633,12 +2633,6 @@ CLEAN_PKG  += game-music-emu-$(GME_VERSION)
 DISTCLEAN_PKG += game-music-emu-$(GME_VERSION).tbz2
 
 # ***************************************************************************
-# Make sure the build tools are built before the other targets
-# ***************************************************************************
-
-$(CLEAN_PKG): $(TOOLS)
-
-# ***************************************************************************
 # Some cleaning
 # ***************************************************************************