Commit 88fa831f authored by Rafaël Carré's avatar Rafaël Carré Committed by Jean-Baptiste Kempf

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

This reverts commit c9a36881.

Conflicts:

	contrib/src/dvbpsi/rules.mak
(cherry picked from commit aa2748bdc5f45139ec803c9597d80f1f0321f6fd)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 68aa15d6
......@@ -18,7 +18,6 @@ libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
$(MOVE)
.dvbpsi: libdvbpsi
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
touch $@
......@@ -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
......
......@@ -18,7 +18,6 @@ libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
$(MOVE)
.modplug: libmodplug
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
touch $@
......@@ -25,7 +25,7 @@ endif
$(MOVE)
.ogg: libogg
$(RECONF)
#$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
touch $@
......@@ -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 $@
......@@ -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 $@
......@@ -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 $@
......@@ -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 $@
......
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