# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1407165923 -3600
# Node ID 9cc1f0be41dc2e9f57d8550e801a0b19deb7671e
# Parent  6462f09819220487f24c5cd7a6c2fddb49eb7dad
Add qm-dsp as subrepo

diff -r 6462f0981922 -r 9cc1f0be41dc .hgsub
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgsub	Mon Aug 04 16:25:23 2014 +0100
@@ -0,0 +1,1 @@
+qm-dsp = https://code.soundsoftware.ac.uk/hg/qm-dsp
diff -r 6462f0981922 -r 9cc1f0be41dc .hgsubstate
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgsubstate	Mon Aug 04 16:25:23 2014 +0100
@@ -0,0 +1,1 @@
+4ad149e3637fcb17bd868e07b397d9c91cd0299d qm-dsp
diff -r 6462f0981922 -r 9cc1f0be41dc build/general/Makefile.inc
--- a/build/general/Makefile.inc	Mon Aug 04 16:02:26 2014 +0100
+++ b/build/general/Makefile.inc	Mon Aug 04 16:25:23 2014 +0100
@@ -4,9 +4,9 @@
 CXX	?= g++
 CC	?= gcc
 
-CFLAGS	:= $(CFLAGS) -I. -I../qm-dsp
-CXXFLAGS	:= $(CXXFLAGS) -I. -I../qm-dsp
-LDFLAGS		:= -L../qm-dsp $(LDFLAGS)
+CFLAGS	:= $(CFLAGS) -I. -Iqm-dsp
+CXXFLAGS	:= $(CXXFLAGS) -I. -Iqm-dsp
+LDFLAGS		:= -Lqm-dsp $(LDFLAGS)
 
 HEADERS := plugins/AdaptiveSpectrogram.h \
            plugins/BarBeatTrack.h \
@@ -41,11 +41,20 @@
 OBJECTS := $(SOURCES:.cpp=.o)
 OBJECTS := $(OBJECTS:.c=.o)
 
+all: qm-dsp $(PLUGIN)
+
+MF   := $(wildcard build/*/Makefile$(MAKEFILE_EXT))
+
+.PHONY: qm-dsp
+qm-dsp: 
+		$(MAKE) -C $@ -f $(MF)
+
 $(PLUGIN):	$(OBJECTS)
 		$(CXX) -o $@ $^ $(LDFLAGS)
 
 clean:		
-		rm $(OBJECTS)
+		$(MAKE) -C qm-dsp -f $(MF) clean
+		rm -f $(OBJECTS)
 
 distclean:	clean
 		rm $(PLUGIN)
diff -r 6462f0981922 -r 9cc1f0be41dc build/linux/Makefile.linux32
--- a/build/linux/Makefile.linux32	Mon Aug 04 16:02:26 2014 +0100
+++ b/build/linux/Makefile.linux32	Mon Aug 04 16:25:23 2014 +0100
@@ -8,5 +8,7 @@
 
 PLUGIN_EXT   := .so
 
+MAKEFILE_EXT := .linux32
+
 include build/general/Makefile.inc
 
diff -r 6462f0981922 -r 9cc1f0be41dc build/linux/Makefile.linux64
--- a/build/linux/Makefile.linux64	Mon Aug 04 16:02:26 2014 +0100
+++ b/build/linux/Makefile.linux64	Mon Aug 04 16:25:23 2014 +0100
@@ -7,5 +7,7 @@
 
 PLUGIN_EXT   := .so
 
+MAKEFILE_EXT := .linux64
+
 include build/general/Makefile.inc
 
diff -r 6462f0981922 -r 9cc1f0be41dc build/osx/Makefile.osx
--- a/build/osx/Makefile.osx	Mon Aug 04 16:02:26 2014 +0100
+++ b/build/osx/Makefile.osx	Mon Aug 04 16:25:23 2014 +0100
@@ -7,5 +7,7 @@
 
 PLUGIN_EXT   := .dylib
 
+MAKEFILE_EXT := .osx
+
 include build/general/Makefile.inc