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

Now they recognize arm-linux-androideabi toolchain

diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index a28cd04b6f5669d73244f6caa8fe5cea8236f7f3..093e62064f70c0ddb05146334a86328d42593958 100644 (file)
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -18,6 +18,7 @@ libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
        $(MOVE)
 
 .dvbpsi: libdvbpsi
+       $(RECONF)
        cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-release
        cd $< && $(MAKE) install
        touch $@

diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index efb402b7d46172fe329c6926f34cb53410f09da6..9b1aa0d757700d012d37c8d18af3216043624ddf 100644 (file)
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -23,7 +23,7 @@ endif
        $(MOVE)
 
 FLACCONF := $(HOSTCONF) \
-       --disable--thorough-tests \
+       --disable-thorough-tests \
        --disable-doxygen-docs \
        --disable-xmms-plugin \
        --disable-cpplibs \
@@ -38,6 +38,7 @@ 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 378fd18d91aa3291960e55b066e3ed1c4388b07d..abdb55b643dca63f0bfdd07e26605fbac679da70 100644 (file)
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -18,6 +18,7 @@ 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 3c84f1875ccc5f3f0ee2c39f4b37d97d21342d0d..1c8489582b731b2399ab1265a1d96486856a9f96 100644 (file)
--- 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 6766e469dc830580d5006e03ae2ecb29b935a3fb..113353fd0ae12c2a05ed0cca7df3193d768f3499 100644 (file)
--- a/contrib/src/samplerate/rules.mak
+++ b/contrib/src/samplerate/rules.mak
@@ -17,6 +17,7 @@ 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 c3b6c1e89922f23bad5fee2bc69b1ca9274392a5..fc380e5a73aa32d2258f76f4f83c92f3895e8bef 100644 (file)
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -43,9 +43,7 @@ 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 8c6184abc10a8b561af4eb83d602c36f16a00c4b..6bf59071f386526181b12cf834be87b406a80ace 100644 (file)
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -24,9 +24,7 @@ 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 89df9377d60603f50945c524edc31904cb638552..3ca09506e84a3e5a03e0052ec9accda705cf157b 100644 (file)
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -30,6 +30,7 @@ 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 $@