contrib: guess OS automatically, make package will create:

[vlc] / contrib / src / main.mak

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 741035676402c90d588b995158e2b566e9f277d6..ef5b64a30b66fd91d0adc28ea6b33a1edf0834c4 100644 (file)
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -89,6 +89,28 @@ STRIP := $(HOST)-strip
 endif
 endif
 
+ifdef HAVE_MACOSX
+OSX_VERSION=10.6
+MACOSX_SDK=/Developer/SDKs/MacOSX$(OSX_VERSION).sdk
+CC=gcc-4.2
+CXX=g++-4.2
+AR=ar
+LD=ld
+STRIP=strip
+RANLIB=ranlib
+EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(OSX_VERSION)
+EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(OSX_VERSION) -isysroot $(MACOSX_SDK)
+#TODO ppc
+ifeq ($(ARCH),x86_64)
+EXTRA_CFLAGS += -m64
+EXTRA_LDFLAGS += -m64
+else
+EXTRA_CFLAGS += -m32
+EXTRA_LDFLAGS += -m32
+endif
+endif
+
+
 EXTRA_CFLAGS += -I$(PREFIX)/include
 CPPFLAGS := $(CPPFLAGS) $(EXTRA_CFLAGS)
 CFLAGS := $(CFLAGS) $(EXTRA_CFLAGS)
@@ -159,12 +181,7 @@ HOSTCONF := --prefix="$(PREFIX)"
 HOSTCONF += --build="$(BUILD)" --host="$(HOST)" --target="$(HOST)"
 HOSTCONF += --program-prefix=""
 # libtool stuff:
-ifdef HAVE_MACOSX
-HOSTCONF += --enable-shared --disable-static
-else
-HOSTCONF += --enable-static --disable-shared
-endif
-HOSTCONF += --disable-dependency-tracking
+HOSTCONF += --enable-static --disable-shared --disable-dependency-tracking
 ifdef HAVE_WIN32
 HOSTCONF += --without-pic
 PIC :=
@@ -253,9 +270,25 @@ distclean: clean
        $(RM) config.mak
        unlink Makefile
 
+OS=
+ifdef HAVE_MACOSX
+OS=macosx
+endif
+ifdef HAVE_WIN32
+OS=win32
+endif
+
 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-$(OS)-$(HOST)-$(DATE).tar.bz2
 
 list:
        @echo All packages: