Skip to content

V
vlc-2-2
Commit 87506de9 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

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

We only need additional tools on OSX
parent 68b5e21e
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 4 deletions
extras/contrib/src/Distributions/darwin.mak
View file @ 87506de9
# Darwin rules # Darwin rules
all: .libtool .intl .pkgcfg .yasm .freetype \ all: .freetype .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
.fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \ .flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \
.dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \ .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
.png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \ .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
.SDL_image .gecko .mpcdec .dirac_encoder .dirac_decoder \ .SDL_image .gecko .mpcdec .dirac_encoder .dirac_decoder \
.dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses \ .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses \
.schroedinger .libass .libupnp .kate .sqlite3 .Sparkle .schroedinger .libass .libupnp .kate .sqlite3 .Sparkle
TOOLS = .libtool .intl .pkgcfg .yasm
# .expat don't work with SDK yet # .expat don't work with SDK yet
# .glib .IDL .gecko are required to build the mozilla plugin # .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 # .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package
......
extras/contrib/src/Distributions/darwin64.mak
View file @ 87506de9
# Darwin rules # Darwin rules
all: .libtool .intl .pkgcfg .yasm .freetype \ all: .freetype .fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
.fribidi .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \ .flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \
.dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \ .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
.png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \ .png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
.gecko .mpcdec .dirac_encoder .dirac_decoder \ .gecko .mpcdec .dirac_encoder .dirac_decoder \
.dca .tag .x264 .lua .zvbi .fontconfig .ncurses \ .dca .tag .x264 .lua .zvbi .fontconfig .ncurses \
.schroedinger .libass .libupnp .kate .sqlite3 .Sparkle .schroedinger .libass .libupnp .kate .sqlite3 .Sparkle
TOOLS = .libtool .intl .pkgcfg .yasm
# .expat don't work with SDK yet # .expat don't work with SDK yet
# .glib .IDL .gecko are required to build the mozilla plugin # .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 # .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package
......
extras/contrib/src/contrib-src.mak
View file @ 87506de9
...@@ -2577,6 +2577,11 @@ CLEAN_FILE += .sqlite3 ...@@ -2577,6 +2577,11 @@ CLEAN_FILE += .sqlite3
CLEAN_PKG += sqlite-$(SQLITE_VERSION) CLEAN_PKG += sqlite-$(SQLITE_VERSION)
DISTCLEAN_PKG += sqlite-amalgamation-$(SQLITE_VERSION).tar.gz DISTCLEAN_PKG += sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
# ***************************************************************************
# Make sure the build tools are built before the other targets
# ***************************************************************************
$(CLEAN_PKG): $(TOOLS)
# *************************************************************************** # ***************************************************************************
# Some cleaning # 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