[vlc-commits] commit: contribs: make sure build tools are built before the other targets ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Sun Oct 31 23:51:20 2010 +0100| [87506de9d89cc3225cfc668fc7373447294cd6f3] | committer: Rafaël Carré 

contribs: make sure build tools are built before the other targets

We only need additional tools on OSX

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

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

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 8253d26..0b35e0d 100644
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -1,12 +1,14 @@
 # Darwin rules
-all: .libtool .intl .pkgcfg .yasm .freetype \
-    .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
+all: .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 \
     .SDL_image .gecko .mpcdec .dirac_encoder .dirac_decoder \
     .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses \
     .schroedinger .libass .libupnp .kate .sqlite3 .Sparkle
+
+TOOLS = .libtool .intl .pkgcfg .yasm
+
 # .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 4ed6b61..7ef230c 100644
--- a/extras/contrib/src/Distributions/darwin64.mak
+++ b/extras/contrib/src/Distributions/darwin64.mak
@@ -1,12 +1,14 @@
 # Darwin rules
-all: .libtool .intl .pkgcfg .yasm .freetype \
-    .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
+all: .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 \
     .gecko .mpcdec .dirac_encoder .dirac_decoder \
     .dca .tag .x264 .lua .zvbi .fontconfig .ncurses \
     .schroedinger .libass .libupnp .kate .sqlite3 .Sparkle
+
+TOOLS = .libtool .intl .pkgcfg .yasm
+
 # .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 bbaa23f..aa4b83c 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2577,6 +2577,11 @@ CLEAN_FILE += .sqlite3
 CLEAN_PKG += sqlite-$(SQLITE_VERSION)
 DISTCLEAN_PKG += sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
 
+# ***************************************************************************
+# Make sure the build tools are built before the other targets
+# ***************************************************************************
+
+$(CLEAN_PKG): $(TOOLS)
 
 # ***************************************************************************
 # Some cleaning