Removed --disable-audio-beos from ffmpeg configure line since it breaks non-beos...

[vlc] / extras / contrib / Makefile

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index a16307605e559b9271633140c91e4f5815ef5c1d..cac8600fe67e02deefdc0f000187d150058f1984 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.1 2003/11/15 01:21:48 massiot Exp $
+# Copyright (C) 2003-2005 the VideoLAN team
+# $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
@@ -23,19 +24,38 @@
 
 include ./config.mak
 
-BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib
+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
 
-bin: FORCE
+contrib-macosx.tar.bz2: FORCE
        $(WGET) $(CONTRIB_URL)
-       bunzip2 -c $< | tar xf -
+
+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
@@ -43,11 +63,23 @@ 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
-       tar cf - bin include lib vlc-lib share/aclocal* share/autoconf* \
+       @if test -d tmp; then \
+               echo "Move away ./tmp, it's in the way" ; \
+               exit 1 ; \
+       fi
+       mkdir tmp
+       tar cf - bin sbin include lib vlc-lib share/aclocal* share/autoconf* \
                share/automake* share/gettext* \
-               | bzip2 -c > contrib.tar.bz2
+               | (cd tmp; tar xf -)
+       ./change_prefix.sh tmp $(PREFIX) @@CONTRIB_PREFIX@@
+       (cd tmp; tar cf - .) | bzip2 -c > contrib-macosx.tar.bz2
+       rm -rf tmp
 
 FORCE: