all options enabled by "true" or "yes" can now also be enabled by using "1".

[vlc] / extras / contrib / Makefile

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 9bef79459f966c48058f961561a85f342df8c38e..93141b34bfd140461e964804911f9be32f1b869a 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -1,10 +1,11 @@
 # ***************************************************************************
 # Makefile : Build vlc-contrib files
 # ***************************************************************************
-# Copyright (C) 2003 VideoLAN
-# $Id: Makefile,v 1.3 2003/11/23 13:06:43 massiot Exp $
+# Copyright (C) 2003-2005 VideoLAN
+# $Id$
 # 
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
+#          Derk-Jan Hartman <hartman 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
@@ -34,18 +35,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
+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)
        $(MAKE) -C src clean-src
 
 clean-bin: FORCE
@@ -61,7 +68,7 @@ package: FORCE
                exit 1 ; \
        fi
        mkdir tmp
-       tar cf - bin include lib vlc-lib share/aclocal* share/autoconf* \
+       tar cf - bin sbin include lib vlc-lib share/aclocal* share/autoconf* \
                share/automake* share/gettext* \
                | (cd tmp; tar xf -)
        ./change_prefix.sh tmp $(PREFIX) @@CONTRIB_PREFIX@@