INSTALL.{linux,osx}: update

[vamp-aubio-plugins.git] / Makefile.inc

diff --git a/Makefile.inc b/Makefile.inc
index 8dbc8b8..fb0ef35 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -12,18 +12,18 @@
 #
 #   $ make -f Makefile.mingw
 
-CFLAGS         := $(ARCHFLAGS) $(CFLAGS)
-CXXFLAGS       := $(CFLAGS) -I. -I$(VAMPSDK_DIR) $(CXXFLAGS)
-
-LDFLAGS                := $(ARCHFLAGS) -L$(VAMPSDK_DIR) -laubio $(LDFLAGS)
-PLUGIN_LDFLAGS := $(LDFLAGS) $(PLUGIN_LDFLAGS)
-
 # Defaults, overridden from the platform-specific Makefile
-VAMPSDK_DIR    ?= ../vamp-plugin-sdk
+VAMPSDK_DIR    ?= ./contrib/vamp-plugin-sdk-2.6
 PLUGIN_EXT     ?= .so
 CXX            ?= g++
 CC             ?= gcc
 
+CFLAGS         := $(ARCHFLAGS) $(CFLAGS)
+CXXFLAGS       := $(CFLAGS) -I$(VAMPSDK_DIR) $(CXXFLAGS)
+
+LDFLAGS                := $(ARCHFLAGS) -L$(VAMPSDK_DIR) $(LDFLAGS)
+PLUGIN_LDFLAGS := $(LDFLAGS) $(PLUGIN_LDFLAGS)
+
 # Location of our plugins
 #
 PLUGINDIR      = plugins
@@ -32,13 +32,17 @@ PLUGIN_OBJECTS      = libmain.o $(patsubst %.cpp,%.o,$(wildcard $(PLUGINDIR)/*.cpp))
 PLUGIN_HEADERS = $(patsubst %.cpp,%.h,$(wildcard $(PLUGINDIR)/*.cpp))
 PLUGIN_TARGET  = vamp-aubio$(PLUGIN_EXT)
 
+# use local aubio, can be build with ./scripts/get_aubio.sh
+CXXFLAGS := $(CXXFLAGS) -I./contrib/aubio-dist/include
+
 all:           $(PLUGIN_TARGET)
 
 $(PLUGIN_TARGET):      $(PLUGIN_OBJECTS) $(PLUGIN_HEADERS)
-               $(CXX) $(PLUGIN_LDFLAGS) -o $@ $(PLUGIN_OBJECTS) $(PLUGIN_LIBS)
+               $(CXX) -o $@ $(PLUGIN_OBJECTS) $(PLUGIN_LDFLAGS) $(PLUGIN_LIBS)
 
 clean:
                rm -f $(PLUGIN_OBJECTS)
 
 distclean:     clean
                rm -f $(PLUGIN_TARGET) *~ */*~
+