Commit d85d6537 authored by Rafaël Carré's avatar Rafaël Carré

contribs: fix copy of aclocal m4 files

make sure they are copied only after all contribs have been built
parent 81d3d945
...@@ -38,6 +38,11 @@ all: $(TARGETALL) ...@@ -38,6 +38,11 @@ all: $(TARGETALL)
using-src: using-src:
$(MAKE) -C src $(MAKE) -C src
#Copy aclocal files
# This is necessary for --missing aclocal to succeed after a
# configure.ac/Makefile.am change in the vlc root dir
cp -R $(PREFIX)/share/aclocal/* ../../m4/
ifdef HAVE_DARWIN_10 ifdef HAVE_DARWIN_10
(cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig) (cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
endif endif
......
...@@ -4,7 +4,7 @@ ifeq ($(HOST),$(BUILD)) ...@@ -4,7 +4,7 @@ ifeq ($(HOST),$(BUILD))
all: .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \ all: .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \
.a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \ .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss \ .flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss \
.dvdnav .dvbpsi .dca .aclocal .dvdnav .dvbpsi .dca
#.speex seems #.speex seems
else else
# Cross compiling: we already have the Linux tools, only build the # Cross compiling: we already have the Linux tools, only build the
...@@ -12,6 +12,6 @@ else ...@@ -12,6 +12,6 @@ else
all: .iconv .intl .freetype .fribidi \ all: .iconv .intl .freetype .fribidi \
.a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \ .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \
.flac .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \ .flac .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \
.dvdnav .dvbpsi .dca .aclocal .dvdnav .dvbpsi .dca
endif endif
#.speex #.speex
...@@ -6,7 +6,7 @@ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \ ...@@ -6,7 +6,7 @@ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
.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 .liboil \ .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .liboil \
.schroedinger .libass .libupnp .kate .sqlite3 .Sparkle .aclocal .schroedinger .libass .libupnp .kate .sqlite3 .Sparkle
# .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
......
...@@ -6,7 +6,7 @@ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \ ...@@ -6,7 +6,7 @@ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
.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 .liboil \ .dca .tag .x264 .lua .zvbi .fontconfig .ncurses .liboil \
.schroedinger .libass .libupnp .kate .sqlite3 .Sparkle .aclocal .schroedinger .libass .libupnp .kate .sqlite3 .Sparkle
# .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
......
...@@ -6,7 +6,6 @@ all: .iconv .intl .freetype .fribidi .zlib \ ...@@ -6,7 +6,6 @@ all: .iconv .intl .freetype .fribidi .zlib \
.png .gpg-error .gcrypt .gnutls .mpcdec \ .png .gpg-error .gcrypt .gnutls .mpcdec \
.dvdnav .dvbpsi .dirac \ .dvdnav .dvbpsi .dirac \
.dca .raw1394 .dc1394 .lua .zvbi \ .dca .raw1394 .dc1394 .lua .zvbi \
.kate .tiger \ .kate .tiger
.aclocal
# .SDL_image .daap .cddb .cdio .vcdimager # .SDL_image .daap .cddb .cdio .vcdimager
...@@ -6,8 +6,7 @@ all: .iconv .intl .freetype .fribidi .zlib \ ...@@ -6,8 +6,7 @@ all: .iconv .intl .freetype .fribidi .zlib \
.png .gpg-error .gcrypt .gnutls .mpcdec \ .png .gpg-error .gcrypt .gnutls .mpcdec \
.dvdnav .dvbpsi .dirac \ .dvdnav .dvbpsi .dirac \
.dca .raw1394 .dc1394 .lua .zvbi \ .dca .raw1394 .dc1394 .lua .zvbi \
.kate .tiger \ .kate .tiger
.aclocal
# .png .gpg-error .gcrypt .gnutls .mpcdec \ # .png .gpg-error .gcrypt .gnutls .mpcdec \
# .SDL_image .daap .cddb .cdio .vcdimager # .SDL_image .daap .cddb .cdio .vcdimager
...@@ -7,5 +7,5 @@ all: .iconv .intl .freetype .fribidi .zlib \ ...@@ -7,5 +7,5 @@ all: .iconv .intl .freetype .fribidi .zlib \
.dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \ .dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \
.dx_headers .dshow_headers .gecko .dca \ .dx_headers .dshow_headers .gecko .dca \
.lua .tag .fontconfig .portaudio .kate .libass .zvbi \ .lua .tag .fontconfig .portaudio .kate .libass .zvbi \
.fluid .aclocal .peflags .cddb .sqlite3 .libprojectM .fluid .peflags .cddb .sqlite3 .libprojectM
# .daap .cdio .vcdimager # .daap .cdio .vcdimager
...@@ -9,5 +9,5 @@ all: .iconv .intl .freetype .fribidi .zlib \ ...@@ -9,5 +9,5 @@ all: .iconv .intl .freetype .fribidi .zlib \
.lua .tag .fontconfig .portaudio .kate .libass .lua .tag .fontconfig .portaudio .kate .libass
# .pthreads # .pthreads
#.zvbi \ #.zvbi \
# .fluid .aclocal # .fluid
# .daap .cddb .cdio .vcdimager # .daap .cddb .cdio .vcdimager
...@@ -2210,18 +2210,6 @@ CLEAN_FILE += .tiger ...@@ -2210,18 +2210,6 @@ CLEAN_FILE += .tiger
CLEAN_PKG += libtiger CLEAN_PKG += libtiger
DISTCLEAN_PKG += libtiger-$(TIGER_VERSION).tar.gz DISTCLEAN_PKG += libtiger-$(TIGER_VERSION).tar.gz
# ***************************************************************************
# Copy aclocal files
# This is necessary for --missing aclocal to succeed after a
# configure.ac/Makefile.am change in the vlc root dir
# **************************************************************************
.aclocal:
cp -R $(PREFIX)/share/aclocal/* ../../../m4/
touch $@
CLEAN_FILE += .aclocal
# *************************************************************************** # ***************************************************************************
# TagLib read and editing of tags of popular audio formats # TagLib read and editing of tags of popular audio formats
# *************************************************************************** # ***************************************************************************
......
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