# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1478884351 0
# Node ID e7e0e634af463253ab9f49c3e4072c8879eaa593
# Parent  6659898d5c3c504c877b838098d00a2e04f23c02
More tidying

diff -r 6659898d5c3c -r e7e0e634af46 match-vamp-plugin/Makefile
--- a/match-vamp-plugin/Makefile	Fri Nov 11 17:06:14 2016 +0000
+++ b/match-vamp-plugin/Makefile	Fri Nov 11 17:12:31 2016 +0000
@@ -1,17 +1,14 @@
 
 PIPER_VAMP_JS_DIR	:= ../../piper-vamp-js
-MATCH_VAMP_DIR		:= ../../match-vamp
+PLUGIN_SRC_DIR		:= ../../match-vamp/src
 
-MODULE_NAME	:= MatchVampPlugin
+MODULE_NAME		:= MatchVampPlugin
+MODULE_SOURCE		:= match-vamp-plugin.cpp
 
-SRC_DIR		:= $(MATCH_VAMP_DIR)/src
+PLUGIN_SOURCES	:= $(wildcard $(PLUGIN_SRC_DIR)/*.cpp)
 
-PLUGIN_SOURCES	:= $(wildcard $(SRC_DIR)/*.cpp)
-
-INCLUDES	:= -I$(SRC_DIR)
+INCLUDES	:= -I$(PLUGIN_SRC_DIR)
 DEFINES		:= -DUSE_COMPACT_TYPES
 EMFLAGS		:= -s TOTAL_MEMORY=100000000
 
-MODULE_SOURCE	:= match-vamp-plugin.cpp
-
 include $(PIPER_VAMP_JS_DIR)/Makefile.inc
diff -r 6659898d5c3c -r e7e0e634af46 nnls-chroma/Makefile
--- a/nnls-chroma/Makefile	Fri Nov 11 17:06:14 2016 +0000
+++ b/nnls-chroma/Makefile	Fri Nov 11 17:12:31 2016 +0000
@@ -2,26 +2,25 @@
 PIPER_VAMP_JS_DIR	:= ../../piper-vamp-js
 PLUGIN_SRC_DIR		:= ../../nnls-chroma
 
-MODULE_NAME	:= NNLSChroma
+MODULE_NAME		:= NNLSChroma
+MODULE_SOURCE		:= nnls-chroma.cpp
 
 SOURCE_FILES	:= \
-	chromamethods.cpp \
-	NNLSBase.cpp \
-	NNLSChroma.cpp \
-	Chordino.cpp \
-	Tuning.cpp \
-	viterbi.cpp
+		chromamethods.cpp \
+		NNLSBase.cpp \
+		NNLSChroma.cpp \
+		Chordino.cpp \
+		Tuning.cpp \
+		viterbi.cpp
 
 C_SOURCE_FILES	:= \
-	nnls.c
+		nnls.c
 
-PLUGIN_SOURCES	:= $(addprefix $(PLUGIN_SRC_DIR)/,$(SOURCE_FILES))
-PLUGIN_C_SOURCES := $(addprefix $(PLUGIN_SRC_DIR)/,$(C_SOURCE_FILES))
+PLUGIN_SOURCES		:= $(addprefix $(PLUGIN_SRC_DIR)/,$(SOURCE_FILES))
+PLUGIN_C_SOURCES 	:= $(addprefix $(PLUGIN_SRC_DIR)/,$(C_SOURCE_FILES))
 
 INCLUDES	:= -I$(PLUGIN_SRC_DIR) -I../../vamp-build-and-test/DEPENDENCIES/generic/include
 
-MODULE_SOURCE	:= nnls-chroma.cpp
-
 EMFLAGS		:= -s TOTAL_MEMORY=100000000 -s NO_FILESYSTEM=0
 
 include $(PIPER_VAMP_JS_DIR)/Makefile.inc