# HG changeset patch
# User Chris Cannam
# Date 1478804205 0
# Node ID 7729c76320710e7aa174e73d29fba93254a2be67
# Parent  289b4332378dd77f136be28b972badd6d0d2adc7
INCPATH -> INCLUDES (is not a simple path, contains the -I flags already)

diff -r 289b4332378d -r 7729c7632071 Makefile.inc
--- a/Makefile.inc	Thu Nov 10 18:54:11 2016 +0000
+++ b/Makefile.inc	Thu Nov 10 18:56:45 2016 +0000
@@ -70,18 +70,18 @@
 
 DEFINES		:= $(DEFINES)
 
-INCPATH		:= -I$(SRC_DIR) -I$(SDK_DIR) -I$(PIPERCPP_DIR) $(INCPATH)
+INCLUDES		:= -I$(SRC_DIR) -I$(SDK_DIR) -I$(PIPERCPP_DIR) $(INCLUDES)
 
 em:	$(EM_MODULE)
 em:	CXX		:= em++
 em:	CC		:= emcc
-em:	CXXFLAGS	:= -std=c++11 -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(EMFLAGS) $(INCPATH)
-em:	CFLAGS		:= -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(EMFLAGS) $(INCPATH)
+em:	CXXFLAGS	:= -std=c++11 -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(EMFLAGS) $(INCLUDES)
+em:	CFLAGS		:= -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(EMFLAGS) $(INCLUDES)
 em:	LDFLAGS		:= $(EMFLAGS)
 
 linux:	$(SO_MODULE)
-linux:	CXXFLAGS	:= -std=c++11 -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(INCPATH)
-linux:	CFLAGS		:= -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(INCPATH)
+linux:	CXXFLAGS	:= -std=c++11 -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(INCLUDES)
+linux:	CFLAGS		:= -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(INCLUDES)
 linux:	LDFLAGS		:= -shared -Wl,-Bsymbolic -Wl,-soname=$(SO_MODULE) -Wl,-z,defs -Wl,--version-script=$(SRC_DIR)/piper.map -ldl
 
 OBJDIR          := o
@@ -93,11 +93,11 @@
 
 o/%.o:            %.cpp
 		mkdir -p $(dir $@)
-		$(CXX) -c $(INCPATH) $(CXXFLAGS) -o $@ $<
+		$(CXX) -c $(INCLUDES) $(CXXFLAGS) -o $@ $<
 
 o/%.o:            %.c
 		mkdir -p $(dir $@)
-		$(CC) -c $(INCPATH) $(CFLAGS) -o $@ $<
+		$(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $<
 
 $(EM_MODULE):	$(OBJECTS)
 		$(CXX) $(OPTFLAGS) -o $@ $^ $(LDFLAGS) && \
diff -r 289b4332378d -r 7729c7632071 examples/Makefile.vamp-test-plugin
--- a/examples/Makefile.vamp-test-plugin	Thu Nov 10 18:54:11 2016 +0000
+++ b/examples/Makefile.vamp-test-plugin	Thu Nov 10 18:56:45 2016 +0000
@@ -3,7 +3,7 @@
 
 TESTPLUGIN_DIR	:= ../../vamp-test-plugin
 
-INCPATH		:= -I$(TESTPLUGIN_DIR)
+INCLUDES	:= -I$(TESTPLUGIN_DIR)
 
 PLUGIN_SOURCES	:= \
 		$(TESTPLUGIN_DIR)/VampTestPlugin.cpp