Commit 257d6f3b authored by Pierre's avatar Pierre
Browse files

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...
parent f2c170d6
# 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
......
# 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
......
......@@ -2632,12 +2632,6 @@ CLEAN_FILE += .gme
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
# ***************************************************************************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment