X-Git-Url: https://git.aubio.org/?p=vamp-aubio-plugins.git;a=blobdiff_plain;f=Makefile.inc;h=d39b55d86ce1cb08920c05fb87b1079b5762b7fa;hp=438a5b79cc6879ef69317fb37bc7e0389509986b;hb=68a0392b2b017eb6bce9fac8c260ac147a1efe5e;hpb=b3ff42e45e6e2630ad3beead970a0a014178a888

diff --git a/Makefile.inc b/Makefile.inc
index 438a5b7..d39b55d 100644
--- 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,6 +32,9 @@ 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)
@@ -42,3 +45,22 @@ clean:
 
 distclean:	clean
 		rm -f $(PLUGIN_TARGET) *~ */*~
+
+WAFCMD=python waf
+WAFURL=https://waf.io/waf-1.9.6
+
+checkwaf:
+	@[ -f waf ] || make getwaf
+
+getwaf:
+	./scripts/get_waf.sh
+
+expandwaf: getwaf
+	[ -d wafilb ] || rm -fr waflib
+	$(WAFCMD) --help > /dev/null
+	mv .waf*/waflib . && rm -fr .waf*
+	sed '/^#==>$$/,$$d' waf > waf2 && mv waf2 waf
+	chmod +x waf && chmod -R go-w waflib
+
+cleanwaf:
+	rm -rf waf waflib .waf*