# HG changeset patch # User Paul Brossier # Date 1388458875 14400 # Node ID cd512c3ea1a4daa3caefafb596576c3fa6da31bd # Parent 118abde4860013beaefeeb9f2e0ccbbca1dabc07 Makefile: remove local aubio copy diff -r 118abde48600 -r cd512c3ea1a4 Makefile --- 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) *~ */*~