added cyclone to build system

svn path=/trunk/; revision=794

5 files changed, 78 insertions, 14 deletions

diff --git a/externals/debian/control b/externals/debian/control
index f9768527..88f9460b 100644
--- a/externals/debian/control
+++ b/externals/debian/control
@@ -2,7 +2,7 @@ Source: pd-externals
 Section: sound
 Priority: optional
 Maintainer: Guenter Geiger <geiger@debian.org>
-Build-Depends: debhelper (>> 3.0.0), pd, libsndobj-dev, libvorbis-dev, libogg-dev, libfluidsynth-dev, autoconf
+Build-Depends: debhelper (>> 3.0.0), pd, libquicktime-dev, libsndobj-dev, libvorbis-dev, libogg-dev, libfluidsynth-dev, autoconf
 Standards-Version: 3.8.0
 
 Package: pd-zexy
@@ -43,4 +43,10 @@ Depends: pd, ${shlibs:Depends}
 Description: PD external collection
  This is a collection of pd externals (plugins for the pure data software
  synthesizer). The collection includes tons of well known pd externals.
-  
+
+Package: pd-cyclone
+Architecture: any
+Depends: pd, ${shlibs:Depends}
+Description: PD cyclone extension
+ This extension to PD adds a MAX/MSP compatibility mode. MAX/MSP is
+ a trademark of Cycling74. 
diff --git a/externals/debian/pd-cyclone.copyright b/externals/debian/pd-cyclone.copyright
new file mode 100644
index 00000000..34ee8399
--- /dev/null
+++ b/externals/debian/pd-cyclone.copyright
@@ -0,0 +1,31 @@
+This software is copyrighted by Miller Puckette and others.  The following
+terms apply to all files associated with the software unless explicitly
+disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+MODIFICATIONS.
+
+RESTRICTED RIGHTS: Use, duplication or disclosure by the government
+is subject to the restrictions as set forth in subparagraph (c) (1) (ii)
+of the Rights in Technical Data and Computer Software Clause as DFARS
+252.227-7013 and FAR 52.227-19.
diff --git a/externals/debian/pd-cyclone.files b/externals/debian/pd-cyclone.files
new file mode 100644
index 00000000..518e160b
--- /dev/null
+++ b/externals/debian/pd-cyclone.files
@@ -0,0 +1,2 @@
+usr/lib/pd/externs/cyclone/
+usr/lib/pd/doc/cyclone
diff --git a/externals/debian/pd-flext-ext.files b/externals/debian/pd-flext-ext.files
new file mode 100644
index 00000000..46a5b909
--- /dev/null
+++ b/externals/debian/pd-flext-ext.files
@@ -0,0 +1,7 @@
+/usr/lib/pd/extra/shabby*
+/usr/lib/pd/extra/shaffy*
+/usr/lib/pd/extra/syncgrain~.pd_linux
+/usr/lib/pd/extra/fluid*
+/usr/lib/pd/doc/5.reference/help-fluid.pd
+/usr/lib/pd/doc/5.reference/help-shaffy~.pd
+/usr/lib/pd/doc/5.reference/help-shabby~.pd
diff --git a/externals/debian/rules b/externals/debian/rules
index b107bb06..8f1d11be 100755
--- a/externals/debian/rules
+++ b/externals/debian/rules
@@ -40,17 +40,17 @@ build-stamp: configure-stamp
 	(cd build/linux; $(MAKE))
 
         # Build zexy
-	
+
 	(cd zexy/src; $(MAKE) -f makefile.linux LINCLUDE="-I ../../build/include")
 
 	# Build flext
-	
+
 	(cd grill/flext; $(MAKE) -f makefile.pd-linux PDPATH=../../build/include)
 
 	# Flext externals
 	#
 	 
-	(cd footils; make PD_DIR=../../build/include \
+	-(cd footils; make PD_DIR=../../build/include \
                           FLEXTPATH=../../grill/flext/pd-linux \
 	                  FLEXTINC=../../grill/flext/source \
                           FLUIDLIB=" -lfluidsynth")
@@ -61,10 +61,15 @@ build-stamp: configure-stamp
 	(cd OSCx/OSC; $(MAKE))
 
         # build PDP
-	
+
 	(cd pdp;autoconf;./configure;$(MAKE))
 	(cd pdp/scaf/;autoconf;./configure;$(MAKE))
 
+	# build cyclone
+	-mkdir miXed/bin
+	(cd miXed/cyclone; make PD_DIR='../../build/include')
+
+
 	touch build-stamp
 
 clean:
@@ -80,7 +85,7 @@ clean:
 	-rm `find . -name "*.obj"` 
 
 	# fix up wrong permissions
-	
+
 	chmod 644 `find . -name "*.h"`
 	chmod 644 `find . -name "*.c"`
 	chmod 644 `find . -name "*.pd"`
@@ -91,8 +96,8 @@ clean:
 	(cd zexy/src; $(MAKE) -f makefile.linux  clean)
 
 	(cd grill/flext; $(MAKE) -f makefile.pd-linux clean)
-	
-	(cd footils; make clean)
+
+	-(cd footils; make clean)
 
 	(cd OSCx/libOSC;$(MAKE) clean)
 	(cd OSCx/OSC; $(MAKE) pd_linux_clean)
@@ -105,7 +110,10 @@ clean:
 	            config.status \
 	            autom4te.cache \
 	            Makefile.config)
-		    
+#  Clean cyclone
+#
+	(cd miXed/cyclone; make clean)
+	-rm miXed/bin/cyclist
 
 	dh_clean
 
@@ -118,30 +126,40 @@ install: build
 	# Add here commands to install the package into debian/pd-externals.
 	(cd build/linux; $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp)
 	(rm -r `find $(CURDIR)/debian/tmp/ -name CVS`)
-	
+
 	(cd zexy/src; $(MAKE) -f makefile.linux install DESTDIR=$(CURDIR)/debian/tmp \
 	                              INSTALL_PREFIX=/usr/ \
 				      PDLIBDIR=lib/pd )
 	(cd grill/flext; $(MAKE) -f makefile.pd-linux install INSTDIR=$(CURDIR)/debian/tmp/usr/lib/pd/flext)
 
-	(cd footils; make FLEXTPATH=../../grill/flext/pd-linux \
+# Install footils ... this is quite messy still, have to find a better solution
+
+	-(cd footils; make -k  FLEXTPATH=../../grill/flext/pd-linux \
 	        FLEXTINC=../../grill/flext/source \
 		DESTDIR=$(CURDIR)/debian/tmp INSTPATH=$(CURDIR)/debian/tmp/usr/lib/pd/extra install)
 	install -m 644 footils/fluid/pd/fluid.pd $(CURDIR)/debian/tmp/usr/lib/pd/doc/5.reference/help-fluid.pd
 	install -m 644 footils/shabby/shaffy~-help.pd $(CURDIR)/debian/tmp/usr/lib/pd/doc/5.reference/help-shaffy~.pd
 	install -m 644 footils/shabby/shabby~.pd_linux $(CURDIR)/debian/tmp/usr/lib/pd/doc/5.reference/help-shabby~.pd
+	-rm $(CURDIR)/debian/tmp/usr/lib/pd/extra/fiiwu*
+
 
-		
 	# Install OSC
 
 	install OSCx/OSC/OSC.pd_linux $(CURDIR)/debian/tmp/usr/lib/pd/extra
 	install -m 644 OSCx/doc/*.pd $(CURDIR)/debian/tmp/usr/lib/pd/doc/5.reference
 
 	# install pdp (needs /usr/lib/extern)
-	
+
 	mkdir $(CURDIR)/debian/tmp/usr/lib/pd/externs
 	(cd pdp;make prefix=$(CURDIR)/debian/tmp/usr/ install)
 
+	# Install cyclone
+
+	mkdir $(CURDIR)/debian/tmp/usr/lib/pd/externs/cyclone
+	install $(CURDIR)/miXed/bin/*.pd_linux $(CURDIR)/debian/tmp/usr/lib/pd/externs/cyclone/
+	mkdir $(CURDIR)/debian/tmp/usr/lib/pd/doc/cyclone
+	install -m 644  $(CURDIR)/miXed/test/cyclone/*.pd $(CURDIR)/debian/tmp/usr/lib/pd/doc/cyclone
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.