Skip to content

V
vlc
Commit 58df463b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

contribs: pass our aclocal directory to autoreconf 

And use autoreconf instead of autogen for tremor.
parent b13ddaef
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
contrib/src/a52/rules.mak
View file @ 58df463b
...@@ -19,7 +19,7 @@ endif ...@@ -19,7 +19,7 @@ endif
.a52: a52dec .a52: a52dec
ifdef HAVE_WIN64 ifdef HAVE_WIN64
cd $< && autoreconf -fi cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
endif endif
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $</liba52 && $(MAKE) install cd $</liba52 && $(MAKE) install
......
contrib/src/ass/rules.mak
View file @ 58df463b
...@@ -16,7 +16,7 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass ...@@ -16,7 +16,7 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass
#TODO .fontconfig #TODO .fontconfig
.ass: libass .freetype2 .ass: libass .freetype2
#cd $< && autoreconf -fiv #cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) --disable-png --disable-enca cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) --disable-png --disable-enca
cd $< && $(MAKE) install cd $< && $(MAKE) install
touch $@ touch $@
contrib/src/faad2/rules.mak
View file @ 58df463b
...@@ -22,7 +22,7 @@ endif ...@@ -22,7 +22,7 @@ endif
$(MOVE) $(MOVE)
.faad2: faad2 .faad2: faad2
cd $< && autoreconf -fiv cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(NOTHUMB)" cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(NOTHUMB)"
cd $< && sed -i.orig "s/shrext_cmds/shrext/g" libtool cd $< && sed -i.orig "s/shrext_cmds/shrext/g" libtool
cd $</libfaad && $(MAKE) install cd $</libfaad && $(MAKE) install
......
contrib/src/ogg/rules.mak
View file @ 58df463b
...@@ -27,7 +27,7 @@ else ...@@ -27,7 +27,7 @@ else
PKGS += ogg PKGS += ogg
.ogg: libogg .ogg: libogg
#cd $< && autoreconf #cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install cd $< && $(MAKE) install
endif endif
......
contrib/src/theora/rules.mak
View file @ 58df463b
...@@ -15,7 +15,7 @@ libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora ...@@ -15,7 +15,7 @@ libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/theora/libtheora-includes.patch $(APPLY) $(SRC)/theora/libtheora-includes.patch
ifdef HAVE_WIN64 ifdef HAVE_WIN64
cd $(UNPACK_DIR) && autoreconf -fi -I m4 cd $(UNPACK_DIR) && autoreconf -fi -I m4 $(ACLOCAL_AMFLAGS)
endif endif
$(MOVE) $(MOVE)
......
contrib/src/tiger/rules.mak
View file @ 58df463b
...@@ -18,7 +18,7 @@ libtiger: libtiger-$(TIGER_VERSION).tar.gz .sum-tiger ...@@ -18,7 +18,7 @@ libtiger: libtiger-$(TIGER_VERSION).tar.gz .sum-tiger
$(MOVE) $(MOVE)
.tiger: libtiger .kate .tiger: libtiger .kate
cd $< && autoreconf -fiv cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-doc cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-doc
cd $< && $(MAKE) install cd $< && $(MAKE) install
touch $@ touch $@
contrib/src/tremor/rules.mak
View file @ 58df463b
...@@ -24,7 +24,8 @@ tremor: tremor-svn.tar.xz .sum-tremor ...@@ -24,7 +24,8 @@ tremor: tremor-svn.tar.xz .sum-tremor
.tremor: tremor .ogg .tremor: tremor .ogg
# Stuff that depends on libogg # Stuff that depends on libogg
cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
cd $< && \ cd $< && \
$(HOSTVARS) CFLAGS="$(CFLAGS) $(NOTHUMB)" ./autogen.sh $(HOSTCONF) $(HOSTVARS) CFLAGS="$(CFLAGS) $(NOTHUMB)" ./configure $(HOSTCONF)
cd $< && $(MAKE) install cd $< && $(MAKE) install
touch $@ touch $@
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