Add a package-win32 target

[vlc] / extras / contrib / Makefile

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index a549ec9ed0be03935f7691b3ef4ba7fd40987115..835d4d14c22a617807a76991359cc5e9d3f4f4ef 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -1,10 +1,12 @@
 # ***************************************************************************
 # Makefile : Build vlc-contrib files
 # ***************************************************************************
-# Copyright (C) 2003 VideoLAN
+# Copyright (C) 2003-2006 the VideoLAN team
 # $Id$
 # 
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
+#          Derk-Jan Hartman <hartman at videolan dot org>
+#          Christophe Mutricy <xtophe at videolan dot org>
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +28,10 @@ include ./config.mak
 BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib tmp
 
 all: FORCE
-       @echo "Do you mean to make src or make bin ?"
+#      @echo "Do you mean to make src or make bin ?"
+       @echo "    'make bin' isn't functional at the moment,"
+       @echo "    running 'make src' instead..."
+       $(MAKE) src
 
 src: FORCE
        $(MAKE) -C src all
@@ -34,20 +39,24 @@ src: FORCE
 contrib-macosx.tar.bz2: FORCE
        $(WGET) $(CONTRIB_URL)
 
-bin: contrib-macosx.tar.bz2
-       @if test -d tmp; then \
-               echo "Move away ./tmp, it's in the way" ; \
-               exit 1 ; \
-       fi
-       mkdir tmp
-       bunzip2 -c $< | (cd tmp; tar xf -)
-       ./change_prefix.sh tmp @@CONTRIB_PREFIX@@ $(PREFIX)
-       (cd tmp; tar cf - .) | tar xf -
-       rm -rf tmp
-       ranlib lib/*\.a
+bin: FORCE
+       @echo "make bin isn't in a functional state at this moment. Please use make src"
+
+#The disabled make bin
+#bin: contrib-macosx.tar.bz2
+#      @if test -d tmp; then \
+#              echo "Move away ./tmp, it's in the way" ; \
+#              exit 1 ; \
+#      fi
+#      mkdir tmp
+#      bunzip2 -c $< | (cd tmp; tar xf -)
+#      ./change_prefix.sh tmp @@CONTRIB_PREFIX@@ $(PREFIX)
+#      (cd tmp; tar cf - .) | tar xf -
+#      rm -rf tmp
+#      ranlib lib/*\.a
 
 clean-src: FORCE
-    rm -rf $(BUILDDIRS)
+       rm -rf $(BUILDDIRS)
        $(MAKE) -C src clean-src
 
 clean-bin: FORCE
@@ -55,9 +64,13 @@ clean-bin: FORCE
        $(MAKE) -C src clean-dots
 
 clean: FORCE
-       @echo "Do you mean to clean-src or clean-bin ?"
+#      @echo "    Do you mean to clean-src or clean-bin ?"
+       @echo "    'make bin' isn't available at the moment"
+       @echo "    you probably wanna run 'make clean-src' then"
+       @echo "    you can still run 'make clean-bin' manually if needed"
+       $(MAKE) clean-src
 
-package: FORCE
+package-macosx: FORCE
        @if test -d tmp; then \
                echo "Move away ./tmp, it's in the way" ; \
                exit 1 ; \
@@ -70,4 +83,16 @@ package: FORCE
        (cd tmp; tar cf - .) | bzip2 -c > contrib-macosx.tar.bz2
        rm -rf tmp
 
+package-win32: FORCE
+       @if test -d tmp; then \
+               echo "Move away ./tmp, it's in the way" ; \
+               exit 1 ; \
+       fi
+       mkdir -p tmp/usr/win32
+       tar cf - bin sbin include lib share/aclocal* share/autoconf* \
+               share/automake* share/gettext* \
+               | (cd tmp/usr/win32; tar xf -)
+       ./change_prefix.sh tmp $(PREFIX) /usr/win32
+       (cd tmp; tar cf - usr/win32/) | bzip2 -c > contrib-`date +%Y%m%d`-win32-bin-gcc-`$(CC) --version|head -n 1|cut -f 3 -d ' '`-only.tar.bz2
+       rm -rf tmp
 FORCE: