contribs: pass our aclocal directory to autoreconf

And use autoreconf instead of autogen for tremor.
This commit is contained in:
Rémi Denis-Courmont 2011-06-30 21:01:46 +03:00
parent b13ddaef0e
commit 58df463bd1
7 changed files with 8 additions and 7 deletions

View File

@ -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

View File

@ -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 $@

View File

@ -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

View File

@ -27,7 +27,7 @@ else
PKGS += ogg
.ogg: libogg
#cd $< && autoreconf
#cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
endif

View File

@ -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)

View File

@ -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 $@

View File

@ -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 $@