changeset 55:cd512c3ea1a4

Makefile: remove local aubio copy
author Paul Brossier <piem@piem.org>
date Mon, 30 Dec 2013 23:01:15 -0400
parents 118abde48600
children d41cc89498c2
files Makefile
diffstat 1 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Dec 30 22:58:11 2013 -0400
+++ b/Makefile	Mon Dec 30 23:01:15 2013 -0400
@@ -3,10 +3,6 @@
 #
 PLUGINDIR	= plugins
 
-# Location of aubio code
-#
-AUBIODIR	= aubio
-
 # Compile flags
 #
 CFLAGS		:= -fPIC -DDEBUG -O2 -Wall $(CFLAGS)
@@ -33,17 +29,16 @@
 ### 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) $(AUBIO_OBJECTS)
+		rm -f $(PLUGIN_OBJECTS)
 
 distclean:	clean
 		rm -f $(PLUGIN_TARGET) *~ */*~