contribs/osx: compilation fixes for libtool on PPC and FFmpeg in general

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6b4dc5bd3f43e13b91b1833f912024f8f705d8c0..647ef28082ab067c867b5200973d42a0eb4f6691 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -44,6 +44,14 @@ export CFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
 export CPPFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
 export CXXFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
 export LDFLAGS = -L$(PREFIX)/lib $(EXTRA_LDFLAGS)
+ifdef HAVE_DARWIN_OS
+export CC
+export CXX
+export LD
+export RANLIB
+export AR
+export STRIP
+endif
 
 # ***************************************************************************
 # Cross compilation variables
@@ -141,6 +149,7 @@ endif
 
 ifdef HAVE_DARWIN_OS
 X264CONF += --enable-pic
+FFMPEGCONF += --cc=$(CC)
 FFMPEGCONF += --arch=$(ARCH)
 ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEG_CFLAGS += -DHAVE_LRINTF
@@ -2302,7 +2311,6 @@ libkate-$(KATE_VERSION).tar.gz:
 
 libkate: libkate-$(KATE_VERSION).tar.gz
        $(EXTRACT_GZ)
-       (cd $@; autoconf)
 
 .kate: libkate .ogg
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-valgrind && make && make install)
@@ -2313,6 +2321,25 @@ CLEAN_FILE += .kate
 CLEAN_PKG += libkate
 DISTCLEAN_PKG += libkate-$(KATE_VERSION).tar.gz
 
+# ***************************************************************************
+# tiger
+# ***************************************************************************
+
+libtiger-$(TIGER_VERSION).tar.gz:
+       $(WGET) $(TIGER_URL)
+
+libtiger: libtiger-$(TIGER_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.tiger: libtiger .kate
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       $(INSTALL_NAME)
+       touch $@
+
+CLEAN_FILE += .tiger
+CLEAN_PKG += libtiger
+DISTCLEAN_PKG += libtiger-$(TIGER_VERSION).tar.gz
+
 # ***************************************************************************
 # Copy aclocal files
 # This is necessary for --missing aclocal to succeed after a