Adjust includes for subrepo aubio

[vamp-aubio-plugins.git] / Makefile

diff --git a/Makefile b/Makefile
index 486b445..c50b2eb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,48 +1,46 @@
 
-# Location of Vamp SDK
-#
-VAMPDIR                = ../vamp-plugin-sdk
-VAMPLIBDIR     = $(VAMPDIR)/vamp-sdk
-
 # Location of our plugins
 #
 PLUGINDIR      = plugins
 
+# Location of aubio code
+#
+AUBIODIR       = aubio
+
 # Compile flags
 #
-CXXFLAGS       := $(CXXFLAGS) -DNDEBUG -O2 -march=pentium3 -mfpmath=sse -ffast-math -Wall -I$(VAMPDIR) -I.
+CFLAGS         := -I. -Iaubio/src $(CFLAGS) -fPIC -DDEBUG -O2 -Wall -I.
+CXXFLAGS       := $(CFLAGS)
 
-# Libraries required for the plugins.  Note that we can (and actively
-# want to) statically link libstdc++, because our plugin exposes only
-# a C API so there are no boundary compatibility problems.
+# Libraries required for the plugins.
 #
-PLUGIN_LIBS    = -L$(VAMPLIBDIR) -Wl,-Bstatic -lvamp-sdk -laubio -lfftw3f -Wl,-Bdynamic
-#PLUGIN_LIBS   = -L$(VAMPLIBDIR) -lvamp-sdk /usr/lib/libaubio.a /usr/lib/libfftw3f.a
-#PLUGIN_LIBS   = -L$(VAMPLIBDIR) -lvamp-sdk $(shell g++ -print-file-name=libstdc++.a)
+#PLUGIN_LIBS   = -L../inst/lib -lvamp-sdk -laubio 
+PLUGIN_LIBS    = -Wl,-Bstatic -lvamp-sdk -lfftw3f -Wl,-Bdynamic
 
 # Flags required to tell the compiler to make a dynamically loadable object
 #
-PLUGIN_LDFLAGS = -shared -Wl,-Bsymbolic -static-libgcc
+PLUGIN_LDFLAGS = -shared -Wl,-Bsymbolic -Wl,--version-script=vamp-plugin.map
 
 # File extension for a dynamically loadable object
 #
 PLUGIN_EXT     = .so
 
 ## For OS/X with g++:
-#PLUGIN_LDFLAGS        = -dynamiclib
+#PLUGIN_LDFLAGS        = -dynamiclib -exported_symbols_list=vamp-plugin.list
 #PLUGIN_EXT    = .dylib
 
 
 ### End of user-serviceable parts
 
 PLUGIN_OBJECTS = libmain.o $(patsubst %.cpp,%.o,$(wildcard $(PLUGINDIR)/*.cpp))
+AUBIO_OBJECTS  = $(patsubst %.c,%.o,$(wildcard $(AUBIODIR)/src/*.c $(AUBIODIR)/src/*/*.c ))
 PLUGIN_HEADERS = $(patsubst %.cpp,%.h,$(wildcard $(PLUGINDIR)/*.cpp))
 PLUGIN_TARGET  = vamp-aubio$(PLUGIN_EXT)
 
 all:           $(PLUGIN_TARGET)
 
-$(PLUGIN_TARGET):      $(PLUGIN_OBJECTS) $(PLUGIN_HEADERS)
-               $(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(PLUGIN_LIBS)
+$(PLUGIN_TARGET):      $(PLUGIN_OBJECTS) $(AUBIO_OBJECTS) $(PLUGIN_HEADERS)
+               $(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(AUBIO_OBJECTS) $(PLUGIN_LIBS)
 
 clean:         
                rm -f $(PLUGIN_OBJECTS)