contrib: make AUTOPOINT point to the script installed by gettext

[vlc] / contrib / src / main.mak

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index a2f3898fceec0475c01061feb32a40162acb79c1..815f18a19ccabd316304d922a79cbff288bc8a56 100644 (file)
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -90,7 +90,7 @@ endif
 endif
 
 ifdef HAVE_MACOSX
-OSX_VERSION=10.6
+OSX_VERSION?=10.5
 MACOSX_SDK=/Developer/SDKs/MacOSX$(OSX_VERSION).sdk
 CC=gcc-4.2
 CXX=g++-4.2
@@ -108,6 +108,14 @@ else
 EXTRA_CFLAGS += -m32
 EXTRA_LDFLAGS += -m32
 endif
+
+XCODE_FLAGS = -sdk macosx$(OSX_VERSION)
+ifeq ($(xcodebuild -version 2>/dev/null | tee /dev/null|head -1|cut -d\  -f2|cut -d. -f1), 3)
+# XCode 3 doesn't support -arch
+else
+XCODE_FLAGS += -arch $(ARCH)
+endif
+
 endif
 
 
@@ -140,6 +148,11 @@ endif
 endif
 GIT ?= $(error git not found!)
 
+ifndef AUTOPOINT
+AUTOPOINT := "$(PREFIX)/bin/autopoint"
+export AUTOPOINT
+endif
+
 ifndef SVN
 ifeq ($(shell svn --version >/dev/null 2>&1 || echo FAIL),)
 SVN = svn
@@ -208,6 +221,7 @@ HOSTVARS_PIC := $(HOSTTOOLS) \
 download_git = \
        rm -Rf $(@:.tar.xz=) && \
        $(GIT) clone $(2:%=--branch %) $(1) $(@:.tar.xz=) && \
+       (cd $(@:.tar.xz=) && $(GIT) checkout $(3:%= %)) && \
        rm -Rf $(@:%.tar.xz=%)/.git && \
        (cd $(dir $@) && \
         tar cvJ $(notdir $(@:.tar.xz=))) > $@ && \
@@ -270,9 +284,26 @@ distclean: clean
        $(RM) config.mak
        unlink Makefile
 
+PREBUILT_URL=ftp://ftp.videolan.org/pub/videolan/contrib/$(HOST)/vlc-contrib-$(HOST)-latest.tar.bz2
+
+vlc-contrib-$(HOST)-latest.tar.bz2:
+       $(call download,$(PREBUILT_URL))
+
+prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2
+       $(UNPACK) && mv $(HOST) $(TOPDST)
+       cd $(TOPDST)/$(HOST) && ./change_prefix.sh
+
 package: install
-       (cd $(PREFIX)/.. && \
-       tar cvJ $(notdir $(PREFIX))/) > ../vlc-contrib-$(HOST)-$(DATE).tar.xz
+       rm -Rf tmp/
+       mkdir -p tmp/
+       cp -r $(PREFIX) tmp/
+       # remove useless files
+       cd tmp/$(notdir $(PREFIX)); \
+               cd share; rm -Rf man doc gtk-doc info lua projectM gettext; cd ..; \
+               rm -Rf man sbin etc lib/lua lib/sidplay
+       cp $(SRC)/change_prefix.sh tmp/$(notdir $(PREFIX))/
+       cd tmp/$(notdir $(PREFIX)) && ./change_prefix.sh $(PREFIX) @@CONTRIB_PREFIX@@
+       (cd tmp && tar c $(notdir $(PREFIX))/) | bzip2 -c > ../vlc-contrib-$(HOST)-$(DATE).tar.bz2
 
 list:
        @echo All packages:
@@ -290,7 +321,7 @@ list:
        @echo To-be-built packages:
        @echo '  $(PKGS)' | fmt
 
-.PHONY: all fetch fetch-all install mostlyclean clean distclean package list
+.PHONY: all fetch fetch-all install mostlyclean clean distclean package list prebuilt
 
 # CMake toolchain
 toolchain.cmake: