X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2FMakefile;h=243128ef31bb0c7def7f26efbcd3c6b67fa9f4e2;hb=43dc8a8d99b061bb1551c55289d1cd30ec6a6285;hp=0ecd51a2512bde1feddb0b245628aceae3c92472;hpb=55f81512c7f26045c32845c355706d6631646fd6;p=vlc

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 0ecd51a251..243128ef31 100644
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -38,13 +38,17 @@ all: $(TARGETALL)
 
 using-src:
 	$(MAKE) -C src
+ifdef HAVE_DARWIN_10
+	(cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
+endif
 
 # shortcut
 src: using-src
 
 ifdef HAVE_DARWIN_OS
 
-CONTRIBREV=17
+CONTRIBREV=22
+
 contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
 	$(WGET) http://downloads.videolan.org/pub/videolan/testing/contrib/$@
 
@@ -54,11 +58,18 @@ using-bin: contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
 		exit 1 ; \
 	fi
 	mkdir tmp
+	mkdir -p $(PREFIX)
 	(cd tmp && tar jxvf ../$<)
 	./change_prefix.sh tmp @@CONTRIB_PREFIX@@  $(PREFIX)
-	(cd tmp && find . -type d) | while read dir; do mkdir -p -- "$$dir"; done
-	(cd tmp && find . -not -type d) | while read i; do mv -f -- tmp/"$$i" "$$i"; done
+	(cd tmp && find . -type d) | while read dir; do mkdir -p -- "$(PREFIX)/$$dir"; done
+	(cd tmp && find . -not -type d) | while read i; do mv -f -- tmp/"$$i" "$(PREFIX)/$$i"; done
 	rm -rf tmp
+    # libiconv.la is no longer present on Snow Leopard, so fix possible references to it, which would
+    # result in linking issues
+ifdef HAVE_DARWIN_10
+	(cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
+	(cd src && $(MAKE) .iconv)
+endif
 endif
 
 clean-src:
@@ -81,26 +92,24 @@ package-macosx:
 		exit 1 ; \
 	fi
 	mkdir tmp
-	tar cf - bin sbin include lib share/aclocal* share/autoconf* \
-		share/automake* share/gettext* share/libtool* gecko-sdk Sparkle \
-		| (cd tmp; tar xf -)
+	(cd $(PREFIX); tar cf - *) | (cd tmp; tar xf -)
 	./change_prefix.sh tmp $(PREFIX) @@CONTRIB_PREFIX@@
 	(cd tmp; tar cf - .) | bzip2 -c > contrib-macosx.tar.bz2
 	rm -rf tmp
 	rm -f contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
 	mv contrib-macosx.tar.bz2 contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
 
-DISTDIR = usr/win32
+DISTDIR = usr/win$*
 
-package-win32:
+package-win%:
 	@if test -d tmp; then \
 		echo "Move away ./tmp, it's in the way" ; \
 		exit 1 ; \
 	fi
 	mkdir -p tmp/$(DISTDIR)
-	tar cf - --dereference bin sbin include lib share/aclocal*\
+	(cd $(PREFIX); tar cf - --dereference bin sbin include lib share/aclocal*\
 		share/autoconf* share/qt4* \
-		share/automake* share/gettext* gecko-sdk\
+		share/automake* share/gettext* gecko-sdk)\
 		| (cd tmp/$(DISTDIR); tar xpf -)
 #kludge for live.com
 	mkdir -p tmp/$(DISTDIR)/live.com
@@ -111,14 +120,10 @@ package-win32:
 	done;
 # Change Prefix.
 	./change_prefix.sh tmp $(PREFIX) $(DISTDIR)
-# Hack for qt4
-	(cd tmp/$(DISTDIR)/bin; mv uic.exe uic.ex; mv rcc.exe rcc.ex; mv moc.exe moc.ex)
-#	Remove unused and potentially harmful files	
-	(cd tmp/$(DISTDIR)/bin; rm -rfv *.exe; chmod a+x *)
-# Hack for qt4
-	(cd tmp/$(DISTDIR)/bin; mv uic.ex uic.exe; mv rcc.ex rcc.exe; mv moc.ex moc.exe)
+# Remove unused and potentially harmful files (but skip qt4 executables)
+	(cd tmp/$(DISTDIR)/bin && rm -fv `find . -name 'uic.exe' -o -name 'rcc.exe' -o -name 'moc.exe' -o -name '*.exe' -printf '%p '` && chmod a+x * || true)
 # Tar it.
-	(cd tmp; tar cf - $(DISTDIR)) | bzip2 -c > contrib-`date +%Y%m%d`-win32-bin-gcc-`$(CC) --version|head -n 1|cut -f 3 -d ' '`-runtime-`/bin/echo -e "#include <_mingw.h>\n__MINGW32_VERSION"|$(CC) -E -|grep -v ^#|grep -v ' '`-only.tar.bz2
+	(cd tmp; tar cf - $(DISTDIR)) | bzip2 -c > contrib-`date +%Y%m%d`-win$*-bin-gcc-`$(CC) --version|head -n 1|cut -f 3 -d ' '`-runtime-`/bin/echo -e "#include <_mingw.h>\n__MINGW32_VERSION"|$(CC) -E -|grep -v ^#|grep -v ' '`-only.tar.bz2
 	rm -rf tmp
 
-.PHONY: all clean-src clean-bin clean package-macosx package-win32
+.PHONY: all clean-src clean-bin clean package-macosx