Commit 7baf9cf0 authored by Christophe Mutricy's avatar Christophe Mutricy Committed by Rémi Denis-Courmont

contribs: Use autoreconf --force to avoid libtool pb.

Also use autoreconf where possible
And no need to reun automake after autoreconf
(cherry picked from commit 968754f8)
Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent baa02d52
...@@ -475,7 +475,7 @@ fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch ...@@ -475,7 +475,7 @@ fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch
$(EXTRACT_GZ) $(EXTRACT_GZ)
patch -p0 < Patches/fontconfig.patch patch -p0 < Patches/fontconfig.patch
patch -p0 < Patches/fontconfig-nodocs.patch patch -p0 < Patches/fontconfig-nodocs.patch
(cd $@; autoreconf) (cd $@; autoreconf -ivf)
.fontconfig: fontconfig .xml .freetype .fontconfig: fontconfig .xml .freetype
ifdef HAVE_WIN32 ifdef HAVE_WIN32
...@@ -1339,7 +1339,7 @@ endif ...@@ -1339,7 +1339,7 @@ endif
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
(cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
else else
(cd $< && rm -f configure; aclocal -I m4/ && automake --add-missing && autoconf configure.in > configure && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install) (cd $< && rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
endif endif
touch $@ touch $@
...@@ -1470,7 +1470,7 @@ libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz ...@@ -1470,7 +1470,7 @@ libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
ifdef HAVE_WIN32 ifdef HAVE_WIN32
patch -p0 < Patches/libmodplug-win32.patch patch -p0 < Patches/libmodplug-win32.patch
(cd $@; autoreconf) (cd $@; autoreconf -ivf )
endif endif
.mod: libmodplug .mod: libmodplug
...@@ -1787,7 +1787,7 @@ zvbi-$(ZVBI_VERSION).tar.bz2: ...@@ -1787,7 +1787,7 @@ zvbi-$(ZVBI_VERSION).tar.bz2:
zvbi: zvbi-$(ZVBI_VERSION).tar.bz2 zvbi: zvbi-$(ZVBI_VERSION).tar.bz2
$(EXTRACT_BZ2) $(EXTRACT_BZ2)
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $@; patch -p1 < ../Patches/zvbi-win32.patch; patch -p1 < ../Patches/zvbi-makefile.patch; autoreconf) (cd $@; patch -p1 < ../Patches/zvbi-win32.patch; patch -p1 < ../Patches/zvbi-makefile.patch; autoreconf -ivf)
endif endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
...@@ -2188,7 +2188,7 @@ libmpcdec-$(MUSE_VERSION).tar.bz2: ...@@ -2188,7 +2188,7 @@ libmpcdec-$(MUSE_VERSION).tar.bz2:
mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2
$(EXTRACT_BZ2) $(EXTRACT_BZ2)
patch -p0 < Patches/mpcdec.patch patch -p0 < Patches/mpcdec.patch
(cd $@; autoreconf) (cd $@; autoreconf -ivf)
.mpcdec: mpcdec .mpcdec: mpcdec
ifdef HAVE_WIN32 ifdef HAVE_WIN32
...@@ -2547,7 +2547,7 @@ libass: libass-$(ASS_VERSION).tar.bz2 ...@@ -2547,7 +2547,7 @@ libass: libass-$(ASS_VERSION).tar.bz2
(cd $@; patch -p1 < ../Patches/libass_mplayer_updates.patch) (cd $@; patch -p1 < ../Patches/libass_mplayer_updates.patch)
ifneq ($(HOST),$(BUILD)) ifneq ($(HOST),$(BUILD))
patch -p0 < Patches/libass-cross.patch patch -p0 < Patches/libass-cross.patch
(cd $@; autoreconf; automake) (cd $@; autoreconf -ivf)
endif endif
.libass: libass .png .libass: libass .png
......
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