vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Jun 30 21:01:46 2011 +0300| [58df463bd127352f3cfffddfa205c6d8da5594e8] | committer: Rémi Denis-Courmont
contribs: pass our aclocal directory to autoreconf And use autoreconf instead of autogen for tremor. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=58df463bd127352f3cfffddfa205c6d8da5594e8 --- contrib/src/a52/rules.mak | 2 +- contrib/src/ass/rules.mak | 2 +- contrib/src/faad2/rules.mak | 2 +- contrib/src/ogg/rules.mak | 2 +- contrib/src/theora/rules.mak | 2 +- contrib/src/tiger/rules.mak | 2 +- contrib/src/tremor/rules.mak | 3 ++- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/contrib/src/a52/rules.mak b/contrib/src/a52/rules.mak index 687bce3..e8e455c 100644 --- a/contrib/src/a52/rules.mak +++ b/contrib/src/a52/rules.mak @@ -19,7 +19,7 @@ endif .a52: a52dec ifdef HAVE_WIN64 - cd $< && autoreconf -fi + cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS) endif cd $< && $(HOSTVARS) ./configure $(HOSTCONF) cd $</liba52 && $(MAKE) install diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak index e5bea2b..1c5cba0 100644 --- a/contrib/src/ass/rules.mak +++ b/contrib/src/ass/rules.mak @@ -16,7 +16,7 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass #TODO .fontconfig .ass: libass .freetype2 - #cd $< && autoreconf -fiv + #cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS) cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) --disable-png --disable-enca cd $< && $(MAKE) install touch $@ diff --git a/contrib/src/faad2/rules.mak b/contrib/src/faad2/rules.mak index d3fef5d..1ab2ad8 100644 --- a/contrib/src/faad2/rules.mak +++ b/contrib/src/faad2/rules.mak @@ -22,7 +22,7 @@ endif $(MOVE) .faad2: faad2 - cd $< && autoreconf -fiv + cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(NOTHUMB)" cd $< && sed -i.orig "s/shrext_cmds/shrext/g" libtool cd $</libfaad && $(MAKE) install diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak index 83696e6..59141fe 100644 --- a/contrib/src/ogg/rules.mak +++ b/contrib/src/ogg/rules.mak @@ -27,7 +27,7 @@ else PKGS += ogg .ogg: libogg - #cd $< && autoreconf + #cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) cd $< && $(MAKE) install endif diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak index a6f27fc..aa68e7b 100644 --- a/contrib/src/theora/rules.mak +++ b/contrib/src/theora/rules.mak @@ -15,7 +15,7 @@ libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora $(UNPACK) $(APPLY) $(SRC)/theora/libtheora-includes.patch ifdef HAVE_WIN64 - cd $(UNPACK_DIR) && autoreconf -fi -I m4 + cd $(UNPACK_DIR) && autoreconf -fi -I m4 $(ACLOCAL_AMFLAGS) endif $(MOVE) diff --git a/contrib/src/tiger/rules.mak b/contrib/src/tiger/rules.mak index 26a6012..cd7bc66 100644 --- a/contrib/src/tiger/rules.mak +++ b/contrib/src/tiger/rules.mak @@ -18,7 +18,7 @@ libtiger: libtiger-$(TIGER_VERSION).tar.gz .sum-tiger $(MOVE) .tiger: libtiger .kate - cd $< && autoreconf -fiv + cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-doc cd $< && $(MAKE) install touch $@ diff --git a/contrib/src/tremor/rules.mak b/contrib/src/tremor/rules.mak index 30ba69e..907860b 100644 --- a/contrib/src/tremor/rules.mak +++ b/contrib/src/tremor/rules.mak @@ -24,7 +24,8 @@ tremor: tremor-svn.tar.xz .sum-tremor .tremor: tremor .ogg # Stuff that depends on libogg + cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS) cd $< && \ - $(HOSTVARS) CFLAGS="$(CFLAGS) $(NOTHUMB)" ./autogen.sh $(HOSTCONF) + $(HOSTVARS) CFLAGS="$(CFLAGS) $(NOTHUMB)" ./configure $(HOSTCONF) cd $< && $(MAKE) install touch $@ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
