[vlc-commits] Revert "contrib: run $(RECONF) in an arbitrary list of packages"

[Rafaël Carré]

vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Thu Jan  5 04:22:35 2012 -0500| [88fa831f074e870623ca7060f01704ab6f0dbd71] | committer: Jean-Baptiste Kempf

Revert "contrib: run $(RECONF) in an arbitrary list of packages"

This reverts commit c9a3688176a1571ab5cd9b77b6fddc3e1a110b62.

Conflicts:

	contrib/src/dvbpsi/rules.mak
(cherry picked from commit aa2748bdc5f45139ec803c9597d80f1f0321f6fd)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=88fa831f074e870623ca7060f01704ab6f0dbd71
---

 contrib/src/dvbpsi/rules.mak     |    1 -
 contrib/src/flac/rules.mak       |    1 -
 contrib/src/modplug/rules.mak    |    1 -
 contrib/src/ogg/rules.mak        |    2 +-
 contrib/src/samplerate/rules.mak |    1 -
 contrib/src/theora/rules.mak     |    2 ++
 contrib/src/upnp/rules.mak       |    2 ++
 contrib/src/vorbis/rules.mak     |    1 -
 8 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index ed9d93e..944c6c1 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -18,7 +18,6 @@ libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
 	$(MOVE)
 
 .dvbpsi: libdvbpsi
-	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index 9b1aa0d..dbd0512 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -38,7 +38,6 @@ endif
 DEPS_flac = ogg $(DEPS_ogg)
 
 .flac: flac
-	$(RECONF) -I m4
 	cd $< && $(HOSTVARS) ./configure $(FLACCONF)
 	cd $</src && $(MAKE) -C libFLAC install
 	cd $< && $(MAKE) -C include install
diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
index abdb55b..378fd18 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -18,7 +18,6 @@ libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
 	$(MOVE)
 
 .modplug: libmodplug
-	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index 1c84895..3c84f18 100644
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -25,7 +25,7 @@ endif
 	$(MOVE)
 
 .ogg: libogg
-	$(RECONF)
+	#$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/samplerate/rules.mak b/contrib/src/samplerate/rules.mak
index 113353f..6766e46 100644
--- a/contrib/src/samplerate/rules.mak
+++ b/contrib/src/samplerate/rules.mak
@@ -17,7 +17,6 @@ samplerate: libsamplerate-$(SAMPLERATE_VERSION).tar.gz .sum-samplerate
 	$(MOVE)
 
 .samplerate: samplerate
-	$(RECONF) -I M4
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak
index fc380e5..c3b6c1e 100644
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -43,7 +43,9 @@ endif
 DEPS_theora = ogg $(DEPS_ogg)
 
 .theora: libtheora
+ifdef HAVE_WIN32
 	$(RECONF)
+endif
 	cd $< && $(HOSTVARS) ./configure $(THEORACONF)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index 6bf5907..8c6184a 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -24,7 +24,9 @@ endif
 	$(MOVE)
 
 .upnp: upnp
+ifdef HAVE_WIN32
 	$(RECONF)
+endif
 	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3 -DUPNP_STATIC_LIB $(LIBUPNP_ECFLAGS)" ./configure --disable-samples --without-documentation --disable-webserver $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
index 3ca0950..89df937 100644
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -30,7 +30,6 @@ libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
 DEPS_vorbis = ogg $(DEPS_ogg)
 
 .vorbis: libvorbis
-	$(RECONF) -I m4
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-docs --disable-examples --disable-oggtest
 	cd $< && $(MAKE) install
 	touch $@