[vlc-commits] contrib: helper macro for autoreconf

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jul  1 18:08:17 2011 +0300| [24deda448122d84407386347324c263e42e7aae9] | committer: Rémi Denis-Courmont

contrib: helper macro for autoreconf

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=24deda448122d84407386347324c263e42e7aae9
---

 contrib/src/a52/rules.mak    |    2 +-
 contrib/src/ass/rules.mak    |    2 +-
 contrib/src/faad2/rules.mak  |    2 +-
 contrib/src/main.mak         |    1 +
 contrib/src/ogg/rules.mak    |    2 +-
 contrib/src/theora/rules.mak |    9 +++------
 contrib/src/tiger/rules.mak  |    2 +-
 contrib/src/tremor/rules.mak |    2 +-
 8 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/contrib/src/a52/rules.mak b/contrib/src/a52/rules.mak
index e8e455c..d84a7b3 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 -fiv $(ACLOCAL_AMFLAGS)
+	$(RECONF)
 endif
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $</liba52 && $(MAKE) install
diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index 1c5cba0..522c6e5 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 $(ACLOCAL_AMFLAGS)
+	#$(RECONF)
 	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 1ab2ad8..6341aba 100644
--- a/contrib/src/faad2/rules.mak
+++ b/contrib/src/faad2/rules.mak
@@ -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
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index baddcc2..f2f23bd 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -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)
 
diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index 59141fe..ce6adb0 100644
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -27,7 +27,7 @@ else
 PKGS += ogg
 
 .ogg: libogg
-	#cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
+	#$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
 endif
diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak
index aa68e7b..455ef8f 100644
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -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 $@
diff --git a/contrib/src/tiger/rules.mak b/contrib/src/tiger/rules.mak
index cd7bc66..4618243 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 $(ACLOCAL_AMFLAGS)
+	$(RECONF)
 	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 907860b..b0d7ace 100644
--- a/contrib/src/tremor/rules.mak
+++ b/contrib/src/tremor/rules.mak
@@ -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