vlc | branch: master | Rafaël Carré <[email protected]> | Fri Oct 8 20:08:39 2010 +0200| [d85d6537739f9f088d3b96be996dde7d8a075b56] | committer: Rafaël Carré
contribs: fix copy of aclocal m4 files make sure they are copied only after all contribs have been built > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d85d6537739f9f088d3b96be996dde7d8a075b56 --- extras/contrib/Makefile | 5 +++++ extras/contrib/src/Distributions/beos.mak | 4 ++-- extras/contrib/src/Distributions/darwin.mak | 2 +- extras/contrib/src/Distributions/darwin64.mak | 2 +- extras/contrib/src/Distributions/debian.mak | 3 +-- extras/contrib/src/Distributions/unix.mak | 3 +-- extras/contrib/src/Distributions/win32.mak | 2 +- extras/contrib/src/Distributions/win64.mak | 2 +- extras/contrib/src/Makefile | 12 ------------ 9 files changed, 13 insertions(+), 22 deletions(-) diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile index 4b65bb5..805942d 100644 --- a/extras/contrib/Makefile +++ b/extras/contrib/Makefile @@ -38,6 +38,11 @@ all: $(TARGETALL) using-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 (cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig) endif diff --git a/extras/contrib/src/Distributions/beos.mak b/extras/contrib/src/Distributions/beos.mak index 7b6451e..91a9f55 100644 --- a/extras/contrib/src/Distributions/beos.mak +++ b/extras/contrib/src/Distributions/beos.mak @@ -4,7 +4,7 @@ ifeq ($(HOST),$(BUILD)) all: .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \ .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \ .flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss \ - .dvdnav .dvbpsi .dca .aclocal + .dvdnav .dvbpsi .dca #.speex seems else # Cross compiling: we already have the Linux tools, only build the @@ -12,6 +12,6 @@ else all: .iconv .intl .freetype .fribidi \ .a52 .mpeg2 .mad .ogg .vorbis .vorbisenc .theora \ .flac .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \ - .dvdnav .dvbpsi .dca .aclocal + .dvdnav .dvbpsi .dca endif #.speex diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak index 2df0d6a..5c01be3 100644 --- a/extras/contrib/src/Distributions/darwin.mak +++ b/extras/contrib/src/Distributions/darwin.mak @@ -6,7 +6,7 @@ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \ .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \ .SDL_image .gecko .mpcdec .dirac_encoder .dirac_decoder \ .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 # .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 775df4c..392b00d 100644 --- a/extras/contrib/src/Distributions/darwin64.mak +++ b/extras/contrib/src/Distributions/darwin64.mak @@ -6,7 +6,7 @@ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \ .png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \ .gecko .mpcdec .dirac_encoder .dirac_decoder \ .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 # .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/debian.mak b/extras/contrib/src/Distributions/debian.mak index 268fb1d..28a80dc 100644 --- a/extras/contrib/src/Distributions/debian.mak +++ b/extras/contrib/src/Distributions/debian.mak @@ -6,7 +6,6 @@ all: .iconv .intl .freetype .fribidi .zlib \ .png .gpg-error .gcrypt .gnutls .mpcdec \ .dvdnav .dvbpsi .dirac \ .dca .raw1394 .dc1394 .lua .zvbi \ - .kate .tiger \ - .aclocal + .kate .tiger # .SDL_image .daap .cddb .cdio .vcdimager diff --git a/extras/contrib/src/Distributions/unix.mak b/extras/contrib/src/Distributions/unix.mak index 8a553ab..46eded8 100644 --- a/extras/contrib/src/Distributions/unix.mak +++ b/extras/contrib/src/Distributions/unix.mak @@ -6,8 +6,7 @@ all: .iconv .intl .freetype .fribidi .zlib \ .png .gpg-error .gcrypt .gnutls .mpcdec \ .dvdnav .dvbpsi .dirac \ .dca .raw1394 .dc1394 .lua .zvbi \ - .kate .tiger \ - .aclocal + .kate .tiger # .png .gpg-error .gcrypt .gnutls .mpcdec \ # .SDL_image .daap .cddb .cdio .vcdimager diff --git a/extras/contrib/src/Distributions/win32.mak b/extras/contrib/src/Distributions/win32.mak index bc2c338..f74a364 100644 --- a/extras/contrib/src/Distributions/win32.mak +++ b/extras/contrib/src/Distributions/win32.mak @@ -7,5 +7,5 @@ all: .iconv .intl .freetype .fribidi .zlib \ .dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \ .dx_headers .dshow_headers .gecko .dca \ .lua .tag .fontconfig .portaudio .kate .libass .zvbi \ - .fluid .aclocal .peflags .cddb .sqlite3 .libprojectM + .fluid .peflags .cddb .sqlite3 .libprojectM # .daap .cdio .vcdimager diff --git a/extras/contrib/src/Distributions/win64.mak b/extras/contrib/src/Distributions/win64.mak index 42e5cc0..b6a0232 100644 --- a/extras/contrib/src/Distributions/win64.mak +++ b/extras/contrib/src/Distributions/win64.mak @@ -9,5 +9,5 @@ all: .iconv .intl .freetype .fribidi .zlib \ .lua .tag .fontconfig .portaudio .kate .libass # .pthreads #.zvbi \ -# .fluid .aclocal +# .fluid # .daap .cddb .cdio .vcdimager diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index bfd2274..6616393 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -2211,18 +2211,6 @@ CLEAN_PKG += libtiger 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 # *************************************************************************** _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
