diff Makefile @ 6:e1b508f2f914

Added support to memory buffers to be used with NumPy (and some rationalisation of code)

--- a/Makefile	Fri Mar 14 12:09:34 2008 +0000
+++ b/Makefile	Wed Mar 19 16:02:29 2008 +0000
@@ -1,289 +1,26 @@
 
-# Makefile for the Vamp plugin SDK.  This builds the SDK objects,
-# libraries, example plugins, and the test host.  Please adjust to
-# suit your operating system requirements.
+CXXFLAGS	:= -I../vamp-plugin-sdk -O2 -Wall -I/usr/include/python2.5
 
-APIDIR		= sdk/vamp
-SDKDIR		= sdk/vamp-sdk
-HOSTEXTDIR	= sdk/vamp-sdk/hostext
-#EXAMPLEDIR	= sdk/examples
-HOSTDIR		= sdk/host
-EXAMPLEDIR	= .
+vampy.dylib:	PyPlugin.o PyPlugScanner.o pyvamp-main.o Mutex.o
+	g++ -shared $^ -o $@ -L../vamp-plugin-sdk/vamp-sdk -lvamp-sdk -dynamiclib -lpython2.5 -lpthread
 
-###
-### Start of user-serviceable parts
-###
+clean:	
+	rm *.o
 
-# Default build target (or use "make <target>" to select one).
-# Targets are:
-#   all       -- build everything
-#   sdk       -- build all the Vamp SDK libraries for plugins and hosts
-#   sdkstatic -- build only the static versions of the SDK libraries
-#   plugins   -- build the example plugins (and the SDK if required)
-#   host      -- build the simple Vamp plugin host (and the SDK if required)
-#   test      -- build the host and example plugins, and run a quick test
-#   _clean    -- remove binary targets
-#   distclean -- remove all targets
-#	cleanplug -- remove compiled plugin files
 
-default:	plugins
-
-# Compile flags
+# Install plugin
 #
-CXXFLAGS	:= $(CXXFLAGS) -O2 -Wall -I. -fPIC 
-
-# ar, ranlib
-#
-AR			:= ar
-RANLIB		:= ranlib
-
-# Libraries required for the plugins.
-# (Note that it is desirable to statically link libstdc++ if possible,
-# because our plugin exposes only a C API so there are no boundary
-# compatibility problems.)
-#
-PLUGIN_LIBS	= $(SDKDIR)/libvamp-sdk.a
-#PLUGIN_LIBS	= $(SDKDIR)/libvamp-sdk.a $(shell g++ -print-file-name=libstdc++.a)
-
-# File extension for a dynamically loadable object
-#
-#PLUGIN_EXT	= .so
-#PLUGIN_EXT	= .dll
-PLUGIN_EXT	= .dylib
-
-# Libraries required for the host.
-#
-HOST_LIBS	= $(SDKDIR)/libvamp-hostsdk.a -lsndfile -ldl
-
-# Locations for "make install".  This will need quite a bit of 
-# editing for non-Linux platforms.  Of course you don't necessarily
-# have to use "make install".
-#
-INSTALL_PREFIX	  		:= /usr/local
-INSTALL_API_HEADERS	  	:= $(INSTALL_PREFIX)/include/vamp
-INSTALL_SDK_HEADERS	  	:= $(INSTALL_PREFIX)/include/vamp-sdk
-INSTALL_HOSTEXT_HEADERS	:= $(INSTALL_PREFIX)/include/vamp-sdk/hostext
-INSTALL_SDK_LIBS		:= $(INSTALL_PREFIX)/lib
-
-INSTALL_SDK_LIBNAME			:= libvamp-sdk.dylib.1.1.0
-INSTALL_SDK_LINK_ABI	  	:= libvamp-sdk.dylib.1
-INSTALL_SDK_LINK_DEV	  	:= libvamp-sdk.dylib
-INSTALL_SDK_STATIC        	:= libvamp-sdk.o
-INSTALL_SDK_LA            	:= libvamp-sdk.la
-
-INSTALL_HOSTSDK_LIBNAME   	:= libvamp-hostsdk.dylib.2.0.0
-INSTALL_HOSTSDK_LINK_ABI  	:= libvamp-hostsdk.dylib.2
-INSTALL_HOSTSDK_LINK_DEV  	:= libvamp-hostsdk.dylib
-INSTALL_HOSTSDK_STATIC    	:= libvamp-hostsdk.a
-INSTALL_HOSTSDK_LA        	:= libvamp-hostsdk.la
-
-INSTALL_PKGCONFIG		  	:= $(INSTALL_PREFIX)/lib/pkgconfig
-
-# Install plugins to this location
-#
-LIBRARY_PREFIX				:=/Library
-INSTALL_PLUGIN				:=$(LIBRARY_PREFIX)/Audio/Plug-Ins/Vamp
-
-# Flags required to tell the compiler to create a dynamically loadable object
-#
-#DYNAMIC_LDFLAGS		= --static-libgcc -shared -Wl,-Bsymbolic
-DYNAMIC_LDFLAGS		= -dynamiclib 
-PLUGIN_LDFLAGS		= $(DYNAMIC_LDFLAGS)
-SDK_DYNAMIC_LDFLAGS	= $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_SDK_LINK_ABI)
-HOSTSDK_DYNAMIC_LDFLAGS	= $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_HOSTSDK_LINK_ABI)
-
-## For OS/X with g++:
-#DYNAMIC_LDFLAGS			= -dynamiclib
-PLUGIN_LDFLAGS				= $(DYNAMIC_LDFLAGS) 
-SDK_DYNAMIC_LDFLAGS			= $(DYNAMIC_LDFLAGS)
-HOSTSDK_DYNAMIC_LDFLAGS		= $(DYNAMIC_LDFLAGS)
-
-
-### End of user-serviceable parts
-
-# Plugin headers, compiler objects and targets
-
-PLUGIN_HEADERS	= \
-		$(EXAMPLEDIR)/PyPlugScanner.h \
-		$(EXAMPLEDIR)/PyPlugin.h
-
-PLUGIN_OBJECTS	= \
-		$(EXAMPLEDIR)/PyPlugScanner.o \
-		$(EXAMPLEDIR)/PyPlugin.o \
-		$(EXAMPLEDIR)/pyvamp-main.o
-
-PLUGIN_NAME = vamp-pyvamp-plugin
-
-PLUGIN_TARGET	= \
-		$(EXAMPLEDIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)
-
-PLUGIN_DESCRIPTORS	= \
-		$(EXAMPLEDIR)/exampleplugin.n3 
-
-# We need to link with python
-# Links the actual python executable. forces to export symbol _PyMac_Error
-PYTHON_LINK_AS_SHARED := \
-		-u _PyMac_Error /Library/Frameworks/Python.framework/Versions/2.5/Python
-
-API_HEADERS	= \
-		$(APIDIR)/vamp.h
-
-SDK_HEADERS	= \
-		$(SDKDIR)/Plugin.h \
-		$(SDKDIR)/PluginAdapter.h \
-		$(SDKDIR)/PluginBase.h \
-		$(SDKDIR)/RealTime.h
-
-HOSTSDK_HEADERS	= \
-		$(SDKDIR)/Plugin.h \
-		$(SDKDIR)/PluginBase.h \
-		$(SDKDIR)/PluginHostAdapter.h \
-		$(SDKDIR)/RealTime.h
-
-HOSTEXT_HEADERS = \
-		$(HOSTEXTDIR)/PluginBufferingAdapter.h \
-		$(HOSTEXTDIR)/PluginChannelAdapter.h \
-		$(HOSTEXTDIR)/PluginInputDomainAdapter.h \
-		$(HOSTEXTDIR)/PluginLoader.h \
-		$(HOSTEXTDIR)/PluginWrapper.h
-
-SDK_OBJECTS	= \
-		$(SDKDIR)/PluginAdapter.o \
-		$(SDKDIR)/RealTime.o
-
-HOSTSDK_OBJECTS	= \
-		$(SDKDIR)/PluginHostAdapter.o \
-		$(HOSTEXTDIR)/PluginBufferingAdapter.o \
-		$(HOSTEXTDIR)/PluginChannelAdapter.o \
-		$(HOSTEXTDIR)/PluginInputDomainAdapter.o \
-		$(HOSTEXTDIR)/PluginLoader.o \
-		$(HOSTEXTDIR)/PluginWrapper.o \
-		$(SDKDIR)/RealTime.o
-
-SDK_STATIC	= \
-		$(SDKDIR)/libvamp-sdk.a
-
-HOSTSDK_STATIC	= \
-		$(SDKDIR)/libvamp-hostsdk.a
-
-SDK_DYNAMIC	= \
-		$(SDKDIR)/libvamp-sdk$(PLUGIN_EXT)
-
-HOSTSDK_DYNAMIC	= \
-		$(SDKDIR)/libvamp-hostsdk$(PLUGIN_EXT)
-
-SDK_LA		= \
-		$(SDKDIR)/libvamp-sdk.la
-
-HOSTSDK_LA	= \
-		$(SDKDIR)/libvamp-hostsdk.la
-
-HOST_HEADERS	= \
-		$(HOSTDIR)/system.h
-
-HOST_OBJECTS	= \
-		$(HOSTDIR)/vamp-simple-host.o
-
-HOST_TARGET	= \
-		$(HOSTDIR)/vamp-simple-host
-
-#Primary Make rules
-#
-
-sdk:	sdkstatic $(SDK_DYNAMIC) $(HOSTSDK_DYNAMIC)
-
-sdkstatic:	
-		$(SDK_STATIC) $(HOSTSDK_STATIC)
-		$(RANLIB) $(SDK_STATIC)
-		$(RANLIB) $(HOSTSDK_STATIC)
-
-plugins:	$(PLUGIN_TARGET)
-
-host:		$(HOST_TARGET)
-
-all:		sdk plugins host test
-
-#This is where all the stuff gets built
-#
-
-$(SDK_STATIC):	$(SDK_OBJECTS) $(API_HEADERS) $(SDK_HEADERS)
-		$(AR) r $@ $(SDK_OBJECTS)
-
-$(HOSTSDK_STATIC):	$(HOSTSDK_OBJECTS) $(API_HEADERS) $(HOSTSDK_HEADERS) $(HOSTEXT_HEADERS)
-		$(AR) r $@ $(HOSTSDK_OBJECTS)
-
-$(SDK_DYNAMIC):	$(SDK_OBJECTS) $(API_HEADERS) $(SDK_HEADERS)
-		$(CXX) $(LDFLAGS) $(SDK_DYNAMIC_LDFLAGS) -o $@ $(SDK_OBJECTS)
-
-$(HOSTSDK_DYNAMIC):	$(HOSTSDK_OBJECTS) $(API_HEADERS) $(HOSTSDK_HEADERS) $(HOSTEXT_HEADERS)
-		$(CXX) $(LDFLAGS) $(HOSTSDK_DYNAMIC_LDFLAGS) -o $@ $(HOSTSDK_OBJECTS)
-
-$(PLUGIN_TARGET):	$(PLUGIN_OBJECTS) $(SDK_STATIC) $(PLUGIN_HEADERS)
-		$(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(PLUGIN_LIBS) $(PYTHON_LINK_AS_SHARED)
-
-$(HOST_TARGET):	$(HOST_OBJECTS) $(HOSTSDK_STATIC) $(HOST_HEADERS)
-		$(CXX) $(LDFLAGS) $(HOST_LDFLAGS) -o $@ $(HOST_OBJECTS) $(HOST_LIBS)
-
-test:		plugins host
-		VAMP_PATH=$(EXAMPLEDIR) $(HOST_TARGET) -l
-
-_clean:		
-		rm -f $(SDK_OBJECTS) $(HOSTSDK_OBJECTS) $(PLUGIN_OBJECTS) $(HOST_OBJECTS)
-
-cleanplug : 	
-		rm -f $(PLUGIN_OBJECTS) 
-		rm -f $(EXAMPLEDIR)/$(PLUGIN_NAME)$(PLUGIN_EXT)
-#		rm -f $(LIBRARY_PREFIX)/$(INSTALL_PLUGIN)/$(PLUGIN_NAME)$(PLUGIN_EXT)
-
-
-distclean:	clean
-		rm -f $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) *~ */*~
-
-_install:	$(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET)
-		mkdir -p $(DESTDIR)$(INSTALL_API_HEADERS)
-		mkdir -p $(DESTDIR)$(INSTALL_SDK_HEADERS)
-		mkdir -p $(DESTDIR)$(INSTALL_HOSTEXT_HEADERS)
-		mkdir -p $(DESTDIR)$(INSTALL_SDK_LIBS)
-		mkdir -p $(DESTDIR)$(INSTALL_PKGCONFIG)
-		cp $(API_HEADERS) $(DESTDIR)$(INSTALL_API_HEADERS)
-		cp $(SDK_HEADERS) $(DESTDIR)$(INSTALL_SDK_HEADERS)
-		cp $(HOSTSDK_HEADERS) $(DESTDIR)$(INSTALL_SDK_HEADERS)
-		cp $(HOSTEXT_HEADERS) $(DESTDIR)$(INSTALL_HOSTEXT_HEADERS)
-		cp $(SDK_STATIC) $(DESTDIR)$(INSTALL_SDK_LIBS)
-		cp $(HOSTSDK_STATIC) $(DESTDIR)$(INSTALL_SDK_LIBS)
-		cp $(SDK_DYNAMIC) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LIBNAME)
-		cp $(HOSTSDK_DYNAMIC) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LIBNAME)
-		rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_ABI)
-		ln -s $(INSTALL_SDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_ABI)
-		rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_ABI)
-		ln -s $(INSTALL_HOSTSDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_ABI)
-		rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV)
-		ln -s $(INSTALL_SDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LINK_DEV)
-		rm -f $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
-		ln -s $(INSTALL_HOSTSDK_LIBNAME) $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LINK_DEV)
-		sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(APIDIR)/vamp.pc.in \
-		> $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp.pc
-		sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(SDKDIR)/vamp-sdk.pc.in \
-		> $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp-sdk.pc
-		sed "s,%PREFIX%,$(INSTALL_PREFIX)," $(SDKDIR)/vamp-hostsdk.pc.in \
-		> $(DESTDIR)$(INSTALL_PKGCONFIG)/vamp-hostsdk.pc
-		sed -e "s,%LIBNAME%,$(INSTALL_SDK_LIBNAME),g" \
-		    -e "s,%LINK_ABI%,$(INSTALL_SDK_LINK_ABI),g" \
-		    -e "s,%LINK_DEV%,$(INSTALL_SDK_LINK_DEV),g" \
-		    -e "s,%STATIC%,$(INSTALL_SDK_STATIC),g" \
-		    -e "s,%LIBS%,$(INSTALL_SDK_LIBS),g" $(SDK_LA).in \
-		> $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_SDK_LA)
-		sed -e "s,%LIBNAME%,$(INSTALL_HOSTSDK_LIBNAME),g" \
-		    -e "s,%LINK_ABI%,$(INSTALL_HOSTSDK_LINK_ABI),g" \
-		    -e "s,%LINK_DEV%,$(INSTALL_HOSTSDK_LINK_DEV),g" \
-		    -e "s,%STATIC%,$(INSTALL_HOSTSDK_STATIC),g" \
-		    -e "s,%LIBS%,$(INSTALL_SDK_LIBS),g" $(HOSTSDK_LA).in \
-		> $(DESTDIR)$(INSTALL_SDK_LIBS)/$(INSTALL_HOSTSDK_LA)
-
-installplug:
-			mkdir -p $(INSTALL_PLUGIN)
-			rm -f $(INSTALL_PLUGIN)/$(PLUGIN_NAME)$(PLUGIN_EXT)
-			cp $(PLUGIN_NAME)$(PLUGIN_EXT) $(INSTALL_PLUGIN)/$(PLUGIN_NAME)$(PLUGIN_EXT)
-#			cp $(PLUGIN_DESCRIPTORS) $(INSTALL_PLUGIN)
-
-installplugin: installplug
+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