# ***************************************************************************
# Makefile : Build vlc-contrib files
# ***************************************************************************
-# Copyright (C) 2003-2009 the VideoLAN team
+# Copyright (C) 2003-2010 the VideoLAN team
# $Id$
#
# Authors: Christophe Massiot <massiot@via.ecp.fr>
BUILDDIRS = hosts build
ifdef HAVE_DARWIN_OS
-TARGETALL=fat-bin
+TARGETALL=using-bin
else
TARGETALL=using-src
endif
ifdef HAVE_DARWIN_OS
-CONTRIBREV=22
+CONTRIBREV=34
contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
$(WGET) http://downloads.videolan.org/pub/videolan/testing/contrib/$@
(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
+ # install the gecko-sdk, which isn't part of the package for size and speed reasons
+ (cd src && rm -rf *gecko* && $(MAKE) .gecko)
# 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)
+ (cd src && rm -f .iconv && $(MAKE) .iconv)
endif
- touch $@
+ touch hosts/$(HOST)/.$(CONTRIBREV)
using-bin: hosts/$(HOST)/.$(CONTRIBREV)
-hosts/fat/.$(CONTRIBREV)-from-archs:
- @if test -d tmp; then \
- echo "Move away ./tmp, it's in the way" ; \
- exit 1 ; \
- fi
- # FIXME - Doing this without rerunning bootstrap & make would be nicer
- ./bootstrap i686-apple-darwin10 && make using-bin && \
- ./bootstrap x86_64-apple-darwin10 && make using-bin && \
- mkdir tmp;
- cp -R hosts/x86_64-apple-darwin10/ tmp;
- (cd tmp/lib && find . -name "*.dylib" -or -name "*.a") | while read lib; do rm tmp/lib/$$lib; \
- lipo -create hosts/x86_64-apple-darwin10/lib/$$lib hosts/i686-apple-darwin10/lib/$$lib -output tmp/lib/$$lib; \
- done;
- rm -Rf hosts/fat && \
- mv tmp hosts/fat && \
- touch $@
-
-fat-bin: hosts/fat/.$(CONTRIBREV)-from-archs
-
endif
-clean-src:
+clean:
rm -rf $(BUILDDIRS)
- $(MAKE) -C src clean-src
+ $(MAKE) -C src clean
clean-bin:
rm -rf $(BUILDDIRS)
$(MAKE) -C src clean-dots
-clean:
- $(MAKE) clean-src
+distclean:
+ $(MAKE) clean
+ $(MAKE) -C src clean-src
rm -rf config.mak distro.mak
bin: using-bin
exit 1 ; \
fi
mkdir tmp
- (cd $(PREFIX); tar cf - *) | (cd tmp; tar xf -)
+ (cd $(PREFIX); tar cf - Sparkle bin sbin include lib share/aclocal* share/autoconf* \
+ share/automake* share/gettext* share/libtool*) | (cd tmp; tar xf -)
./change_prefix.sh tmp $(PREFIX) @@CONTRIB_PREFIX@@
(cd tmp; tar cf - .) | bzip2 -c > contrib-macosx.tar.bz2
rm -rf tmp