# HG changeset patch
# User cannam
# Date 1254748521 0
# Node ID 09e326f8114dbc57d919b4ca8545377b66215452
# Parent  06bbfa2aa51aca2d30d8ad2934b6c8c3c9290631
* Makefile bits

diff -r 06bbfa2aa51a -r 09e326f8114d Makefile
--- a/Makefile	Mon Oct 05 12:52:46 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-
-#CXXFLAGS	:= -D_DEBUG_VALUES -D_DEBUG -DHAVE_NUMPY -I../vamp-plugin-sdk -O2 -Wall -I/usr/include/python2.5 -I/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/numpy/core/include/numpy/ 
-CXXFLAGS	:= -D_DEBUG -DHAVE_NUMPY -I../vamp-plugin-sdk -O2 -Wall -I/usr/include/python2.5 -I/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/numpy/core/include/
-#CXXFLAGS	:= -DHAVE_NUMPY -I../vamp-plugin-sdk -O2 -Wall -I/usr/include/python2.5 -I/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/numpy/core/include/numpy/ 
-
-#without numpy headers available:
-#CXXFLAGS	:= -I../vamp-plugin-sdk -O2 -Wall -I/usr/include/python2.5  #-I../host/pyRealTime.h 
-LDFLAGS		:= -L../vamp-plugin-sdk/vamp-sdk -lvamp-sdk -dynamiclib -lpython2.5 -lpthread
-
-default: vampy.dylib 
-all: vampy.dylib vampymod.so
-
-PyExtensionModule.a: PyExtensionModule.o PyRealTime.o PyFeature.o PyParameterDescriptor.o PyOutputDescriptor.o PyFeatureSet.o 
-	libtool -static $^ -o $@ 
-
-# The standard python extension is .so (even on the Mac)
-vampymod.so: PyExtensionModule.o PyRealTime.o PyFeature.o PyParameterDescriptor.o PyOutputDescriptor.o PyFeatureSet.o 
-	g++ -shared $^ -o $@ $(LDFLAGS) 
-
-vampy.dylib: PyPlugin.o PyPlugScanner.o vampy-main.o Mutex.o PyTypeInterface.o PyExtensionModule.a PyExtensionManager.o
-	g++ -shared $^ -o $@ $(LDFLAGS) 
-
-# Install plugin
-#
-LIBRARY_PREFIX		:=/Library
-INSTALL_DIR			:=$(LIBRARY_PREFIX)/Audio/Plug-Ins/Vamp
-PYEXAMPLE_DIR		:='Example VamPy Plugins'
-PLUGIN_NAME			:=vampy
-PLUGIN_EXT			:=.dylib
-	
-install:
-	mkdir -p $(INSTALL_DIR)
-	rm -f $(INSTALL_DIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)
-	cp $(PLUGIN_NAME)$(PLUGIN_EXT) $(INSTALL_DIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)	
-	#cp $(PYEXAMPLE_DIR)/*.py $(INSTALL_DIR)
-	
-installplug : install
-cleanplug : clean
-
-clean:	
-	rm *.o
-	rm *.a
-	rm *$(PLUGIN_EXT)
-	
diff -r 06bbfa2aa51a -r 09e326f8114d Makefile.cc-linux
--- a/Makefile.cc-linux	Mon Oct 05 12:52:46 2009 +0000
+++ b/Makefile.cc-linux	Mon Oct 05 13:15:21 2009 +0000
@@ -17,11 +17,10 @@
 
 # Install plugin
 #
-LIBRARY_PREFIX		:=/Library
-INSTALL_DIR			:=$(LIBRARY_PREFIX)/Audio/Plug-Ins/Vamp
-PYEXAMPLE_DIR		:='Example VamPy Plugins'
+INSTALL_DIR			:=$(DESTDIR)/usr/local/lib/vamp
+PYEXAMPLE_DIR			:='Example VamPy Plugins'
 PLUGIN_NAME			:=vampy
-PLUGIN_EXT			:=.dylib
+PLUGIN_EXT			:=.so
 
 install:
 	mkdir -p $(INSTALL_DIR)
diff -r 06bbfa2aa51a -r 09e326f8114d Makefile.osx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.osx	Mon Oct 05 13:15:21 2009 +0000
@@ -0,0 +1,40 @@
+
+CXXFLAGS	:= -D_DEBUG -DHAVE_NUMPY -I../vamp-plugin-sdk -O2 -Wall -I/usr/include/python2.5 -I/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/numpy/core/include/
+
+LDFLAGS		:= -install_name vampy.dylib -exported_symbols_list vamp-plugin.list ../vamp-plugin-sdk/libvamp-sdk.a -dynamiclib -lpython2.5 -lpthread
+
+default: vampy.dylib 
+all: vampy.dylib vampymod.so
+
+PyExtensionModule.a: PyExtensionModule.o PyRealTime.o PyFeature.o PyParameterDescriptor.o PyOutputDescriptor.o PyFeatureSet.o 
+	libtool -static $^ -o $@ 
+
+# The standard python extension is .so (even on the Mac)
+vampymod.so: PyExtensionModule.o PyRealTime.o PyFeature.o PyParameterDescriptor.o PyOutputDescriptor.o PyFeatureSet.o 
+	g++ -shared $^ -o $@ $(LDFLAGS) 
+
+vampy.dylib: PyPlugin.o PyPlugScanner.o vampy-main.o Mutex.o PyTypeInterface.o PyExtensionModule.a PyExtensionManager.o
+	g++ -shared $^ -o $@ $(LDFLAGS) 
+
+# Install plugin
+#
+LIBRARY_PREFIX		:=/Library
+INSTALL_DIR			:=$(LIBRARY_PREFIX)/Audio/Plug-Ins/Vamp
+PYEXAMPLE_DIR		:='Example VamPy Plugins'
+PLUGIN_NAME			:=vampy
+PLUGIN_EXT			:=.dylib
+	
+install:
+	mkdir -p $(INSTALL_DIR)
+	rm -f $(INSTALL_DIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)
+	cp $(PLUGIN_NAME)$(PLUGIN_EXT) $(INSTALL_DIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)	
+	#cp $(PYEXAMPLE_DIR)/*.py $(INSTALL_DIR)
+	
+installplug : install
+cleanplug : clean
+
+clean:	
+	rm *.o
+	rm *.a
+	rm *$(PLUGIN_EXT)
+	
diff -r 06bbfa2aa51a -r 09e326f8114d vamp-plugin.list
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vamp-plugin.list	Mon Oct 05 13:15:21 2009 +0000
@@ -0,0 +1,1 @@
+_vampGetPluginDescriptor