[vlc-commits] commit: contrib: Build tools first. (Pierre d'Herbemont )

[git at videolan.org]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Wed Nov 17 19:47:22 2010 +0100| [16600c8ff8892b3adfd2ed4c751a8fe4d9db91a4] | committer: Pierre d'Herbemont 

contrib: Build tools first.

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

 extras/contrib/contrib.mak                    |    1 +
 extras/contrib/src/Distributions/macosx32.mak |    4 +++-
 extras/contrib/src/Distributions/macosx64.mak |    4 +++-
 extras/contrib/src/contrib-src.mak            |    2 ++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/contrib.mak b/extras/contrib/contrib.mak
index dc8d36c..dcbe5cf 100644
--- a/extras/contrib/contrib.mak
+++ b/extras/contrib/contrib.mak
@@ -37,6 +37,7 @@ endif
 all: $(TARGETALL)
 
 using-src:
+	$(MAKE) -C build-src tools
 	$(MAKE) -C build-src
 
 ifdef HAVE_DARWIN_10
diff --git a/extras/contrib/src/Distributions/macosx32.mak b/extras/contrib/src/Distributions/macosx32.mak
index 66f5497..e43ab55 100644
--- a/extras/contrib/src/Distributions/macosx32.mak
+++ b/extras/contrib/src/Distributions/macosx32.mak
@@ -1,5 +1,7 @@
 # Darwin rules
-all: .automake .libtool .intl .pkgcfg .yasm .freetype \
+TOOLS = .libtool .intl .pkgcfg .yasm .automake
+
+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 \
diff --git a/extras/contrib/src/Distributions/macosx64.mak b/extras/contrib/src/Distributions/macosx64.mak
index f464224..7db1a67 100644
--- a/extras/contrib/src/Distributions/macosx64.mak
+++ b/extras/contrib/src/Distributions/macosx64.mak
@@ -1,5 +1,7 @@
 # Darwin rules
-all: .automake .libtool .intl .pkgcfg .yasm .freetype \
+TOOLS = .libtool .intl .pkgcfg .yasm .automake
+
+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 \
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index f3d0684..abaa82a 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2671,6 +2671,8 @@ CLEAN_FILE += .gme
 CLEAN_PKG  += game-music-emu-$(GME_VERSION)
 DISTCLEAN_PKG += game-music-emu-$(GME_VERSION).tbz2
 
+tools: $(TOOLS)
+
 # ***************************************************************************
 # Some cleaning
 # ***************************************************************************