Commit 24deda44 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

contrib: helper macro for autoreconf

parent 29999684
......@@ -19,7 +19,7 @@ endif
.a52: a52dec
ifdef HAVE_WIN64
cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
$(RECONF)
endif
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $</liba52 && $(MAKE) install
......
......@@ -16,7 +16,7 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass
#TODO .fontconfig
.ass: libass .freetype2
#cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
#$(RECONF)
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) --disable-png --disable-enca
cd $< && $(MAKE) install
touch $@
......@@ -22,7 +22,7 @@ endif
$(MOVE)
.faad2: faad2
cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(NOTHUMB)"
cd $< && sed -i.orig "s/shrext_cmds/shrext/g" libtool
cd $</libfaad && $(MAKE) install
......
......@@ -181,6 +181,7 @@ UNPACK_DIR = $(basename $(basename $(notdir $<)))
APPLY = (cd $(UNPACK_DIR) && patch -p1) <
MOVE = mv $(UNPACK_DIR) $@ && touch $@
RECONF = cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
-DCMAKE_INSTALL_PREFIX=$(PREFIX)
......
......@@ -27,7 +27,7 @@ else
PKGS += ogg
.ogg: libogg
#cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
#$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
endif
......
......@@ -14,9 +14,7 @@ $(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz:
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 $(ACLOCAL_AMFLAGS)
endif
echo 'ACLOCAL_AMFLAGS = -I m4' >> $(UNPACK_DIR)/Makefile.am
$(MOVE)
THEORACONF := $(HOSTCONF) \
......@@ -41,9 +39,8 @@ endif
.theora: libtheora .ogg
ifdef HAVE_WIN32
cd $<; $(HOSTVARS) ./autogen.sh $(THEORACONF)
$(RECONF)
endif
test -f $</config.status || \
(cd $< && $(HOSTVARGS) ./configure $(THEORACONF))
cd $< && $(HOSTVARGS) ./configure $(THEORACONF)
cd $< && $(MAKE) install
touch $@
......@@ -18,7 +18,7 @@ libtiger: libtiger-$(TIGER_VERSION).tar.gz .sum-tiger
$(MOVE)
.tiger: libtiger .kate
cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-doc
cd $< && $(MAKE) install
touch $@
......@@ -24,7 +24,7 @@ tremor: tremor-svn.tar.xz .sum-tremor
.tremor: tremor .ogg
# Stuff that depends on libogg
cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
$(RECONF)
cd $< && \
$(HOSTVARS) CFLAGS="$(CFLAGS) $(NOTHUMB)" ./configure $(HOSTCONF)
cd $< && $(MAKE) install
......
Supports Markdown
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