plugins/Tempo.cpp: add parameters and output descriptions

[vamp-aubio-plugins.git] / Makefile

diff --git a/Makefile b/Makefile
index c50b2eb..5b36a09 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,19 +3,15 @@
 #
 PLUGINDIR      = plugins
 
-# Location of aubio code
-#
-AUBIODIR       = aubio
-
 # Compile flags
 #
-CFLAGS         := -I. -Iaubio/src $(CFLAGS) -fPIC -DDEBUG -O2 -Wall -I.
+CFLAGS         := -fPIC -DDEBUG -O2 -Wall $(CFLAGS)
 CXXFLAGS       := $(CFLAGS)
+LDFLAGS        := -laubio $(LDFLAGS)
 
 # Libraries required for the plugins.
 #
-#PLUGIN_LIBS   = -L../inst/lib -lvamp-sdk -laubio 
-PLUGIN_LIBS    = -Wl,-Bstatic -lvamp-sdk -lfftw3f -Wl,-Bdynamic
+PLUGIN_LIBS    = -Wl,-Bstatic -lvamp-sdk -Wl,-Bdynamic
 
 # Flags required to tell the compiler to make a dynamically loadable object
 #
@@ -33,14 +29,13 @@ PLUGIN_EXT  = .so
 ### 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) $(AUBIO_OBJECTS) $(PLUGIN_HEADERS)
-               $(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(AUBIO_OBJECTS) $(PLUGIN_LIBS)
+$(PLUGIN_TARGET):      $(PLUGIN_OBJECTS) $(PLUGIN_HEADERS)
+               $(CXX) $(LDFLAGS) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(PLUGIN_LIBS)
 
 clean:         
                rm -f $(PLUGIN_OBJECTS)