# HG changeset patch
# User cannam
# Date 1254750880 0
# Node ID 2fbb37d50be56e547b21a1485f2c26b6761b7466
# Parent  09e326f8114dbc57d919b4ca8545377b66215452
* Makefile updates

diff -r 09e326f8114d -r 2fbb37d50be5 Makefile.cc-linux
--- a/Makefile.cc-linux	Mon Oct 05 13:15:21 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-
-CXXFLAGS	:= -DHAVE_NUMPY -O2 -Wall -I/usr/include/python2.6 -I/usr/lib/python2.6/dist-packages/numpy/core/include/numpy -fPIC
-LDFLAGS		:= -shared -Wl,-Bstatic -lvamp-sdk -Wl,-Bdynamic -lpython2.6 -lpthread -Wl,--version-script=vamp-plugin.map
-
-default: vampy.so 
-all: vampy.so vampymod.so
-
-PyExtensionModule.a: PyExtensionModule.o PyRealTime.o PyFeature.o PyParameterDescriptor.o PyOutputDescriptor.o PyFeatureSet.o 
-	ar cr $@ $^
-
-# 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++ $^ -o $@ $(LDFLAGS) 
-
-vampy.so: PyPlugin.o PyPlugScanner.o vampy-main.o Mutex.o PyTypeInterface.o PyExtensionModule.a 
-	g++ $^ -o $@ $(LDFLAGS) 
-
-# Install plugin
-#
-INSTALL_DIR			:=$(DESTDIR)/usr/local/lib/vamp
-PYEXAMPLE_DIR			:='Example VamPy Plugins'
-PLUGIN_NAME			:=vampy
-PLUGIN_EXT			:=.so
-
-install:
-	mkdir -p $(INSTALL_DIR)
-	rm -f $(INSTALL_DIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)
-	cp $(PLUGIN_NAME)$(PLUGIN_EXT) $(INSTALL_DIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)
-
-installplug : install
-cleanplug : clean
-
-clean:	
-	rm *.o
-	rm *.a
-	rm *$(PLUGIN_EXT)
-
diff -r 09e326f8114d -r 2fbb37d50be5 Makefile.cc-mingw32
--- a/Makefile.cc-mingw32	Mon Oct 05 13:15:21 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-
-CXX	:= i586-mingw32msvc-g++
-CXXFLAGS	:= -I../include -O2 -Wall -I../../Python26/include
-
-vampy.dll:	PyPlugin.o PyPlugScanner.o pyvamp-main.o Mutex.o
-	i586-mingw32msvc-g++ -shared $^ -o $@ -L../lib -L../../Python26/libs -Wl,-Bstatic -lvamp-sdk -Wl,-Bdynamic -lpython26 -Wl,--version-script=vamp-plugin.map
-
-clean:	
-	rm *.o
-
diff -r 09e326f8114d -r 2fbb37d50be5 Makefile.cc-osol
--- a/Makefile.cc-osol	Mon Oct 05 13:15:21 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-
-CXX		:= CC
-CXXFLAGS	:= -I/usr/local/include -G -DHAVE_NUMPY -O2 +w -I/usr/include/python2.6 -I/usr/lib/python2.6/site-packages/numpy/core/include/numpy -KPIC
-LDFLAGS		:= -L/usr/local/lib -G -Bstatic -lvamp-sdk -Bdynamic -lpython2.6 -lpthread -Qoption ld -Mvamp-plugin.map
-
-default: vampy.so 
-all: vampy.so vampymod.so
-
-PyExtensionModule.a: PyExtensionModule.o PyRealTime.o PyFeature.o PyParameterDescriptor.o PyOutputDescriptor.o PyFeatureSet.o 
-	ar cr $@ $^
-
-# The standard python extension is .so (even on the Mac)
-vampymod.so: PyExtensionModule.o PyRealTime.o PyFeature.o PyParameterDescriptor.o PyOutputDescriptor.o PyFeatureSet.o 
-	$(CXX) $^ -o $@ $(LDFLAGS) 
-
-vampy.so: PyPlugin.o PyPlugScanner.o vampy-main.o Mutex.o PyTypeInterface.o PyExtensionModule.a 
-	$(CXX) $^ -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			:=.so
-
-install:
-	mkdir -p $(INSTALL_DIR)
-	rm -f $(INSTALL_DIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)
-	cp $(PLUGIN_NAME)$(PLUGIN_EXT) $(INSTALL_DIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)
-
-installplug : install
-cleanplug : clean
-
-clean:	
-	rm -f *.o
-	rm -f *.a
-	rm -f *$(PLUGIN_EXT)
-
diff -r 09e326f8114d -r 2fbb37d50be5 Makefile.linux
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.linux	Mon Oct 05 13:54:40 2009 +0000
@@ -0,0 +1,37 @@
+
+CXXFLAGS	:= -DHAVE_NUMPY -O2 -Wall -I/usr/include/python2.6 -I/usr/lib/python2.6/dist-packages/numpy/core/include/numpy -fPIC
+LDFLAGS		:= -shared -Wl,-Bstatic -lvamp-sdk -Wl,-Bdynamic -lpython2.6 -lpthread -Wl,--version-script=vamp-plugin.map
+
+default: vampy.so 
+all: vampy.so vampymod.so
+
+PyExtensionModule.a: PyExtensionModule.o PyRealTime.o PyFeature.o PyParameterDescriptor.o PyOutputDescriptor.o PyFeatureSet.o 
+	ar cr $@ $^
+
+# 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++ $^ -o $@ $(LDFLAGS) 
+
+vampy.so: PyPlugin.o PyPlugScanner.o vampy-main.o Mutex.o PyTypeInterface.o PyExtensionModule.a  PyExtensionManager.o
+	g++ $^ -o $@ $(LDFLAGS) 
+
+# Install plugin
+#
+INSTALL_DIR			:=$(DESTDIR)/usr/local/lib/vamp
+PYEXAMPLE_DIR			:='Example VamPy Plugins'
+PLUGIN_NAME			:=vampy
+PLUGIN_EXT			:=.so
+
+install:
+	mkdir -p $(INSTALL_DIR)
+	rm -f $(INSTALL_DIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)
+	cp $(PLUGIN_NAME)$(PLUGIN_EXT) $(INSTALL_DIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)
+
+installplug : install
+cleanplug : clean
+
+clean:	
+	rm *.o
+	rm *.a
+	rm *$(PLUGIN_EXT)
+
diff -r 09e326f8114d -r 2fbb37d50be5 Makefile.mingw32
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.mingw32	Mon Oct 05 13:54:40 2009 +0000
@@ -0,0 +1,10 @@
+
+CXX	:= i586-mingw32msvc-g++
+CXXFLAGS	:= -I../include -O2 -Wall -I../../Python26/include
+
+vampy.dll:	PyPlugin.o PyPlugScanner.o vampy-main.o Mutex.o PyTypeInterface.o PyExtensionModule.o PyRealTime.o PyFeature.o PyParameterDescriptor.o PyOutputDescriptor.o PyFeatureSet.o  PyExtensionManager.o
+	i586-mingw32msvc-g++ -shared $^ -o $@ -L../lib -L../../Python26/libs -Wl,-Bstatic -lvamp-sdk -Wl,-Bdynamic -lpython26 -Wl,--version-script=vamp-plugin.map
+
+clean:	
+	rm *.o
+
diff -r 09e326f8114d -r 2fbb37d50be5 Makefile.osol
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.osol	Mon Oct 05 13:54:40 2009 +0000
@@ -0,0 +1,38 @@
+
+CXX		:= CC
+CXXFLAGS	:= -I/usr/local/include -G -DHAVE_NUMPY -O2 +w -I/usr/include/python2.6 -I/usr/lib/python2.6/site-packages/numpy/core/include/numpy -KPIC
+LDFLAGS		:= -L/usr/local/lib -G -Bstatic -lvamp-sdk -Bdynamic -lpython2.6 -lpthread -Qoption ld -Mvamp-plugin.map
+
+default: vampy.so 
+all: vampy.so vampymod.so
+
+PyExtensionModule.a: PyExtensionModule.o PyRealTime.o PyFeature.o PyParameterDescriptor.o PyOutputDescriptor.o PyFeatureSet.o 
+	ar cr $@ $^
+
+# The standard python extension is .so (even on the Mac)
+vampymod.so: PyExtensionModule.o PyRealTime.o PyFeature.o PyParameterDescriptor.o PyOutputDescriptor.o PyFeatureSet.o 
+	$(CXX) $^ -o $@ $(LDFLAGS) 
+
+vampy.so: PyPlugin.o PyPlugScanner.o vampy-main.o Mutex.o PyTypeInterface.o PyExtensionModule.a  PyExtensionManager.o
+	$(CXX) $^ -o $@ $(LDFLAGS) 
+
+# Install plugin
+#
+INSTALL_DIR			:=/usr/local/lib/vamp
+PYEXAMPLE_DIR		:='Example VamPy Plugins'
+PLUGIN_NAME			:=vampy
+PLUGIN_EXT			:=.so
+
+install:
+	mkdir -p $(INSTALL_DIR)
+	rm -f $(INSTALL_DIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)
+	cp $(PLUGIN_NAME)$(PLUGIN_EXT) $(INSTALL_DIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)
+
+installplug : install
+cleanplug : clean
+
+clean:	
+	rm -f *.o
+	rm -f *.a
+	rm -f *$(PLUGIN_EXT)
+