# HG changeset patch
# User Chris Cannam
# Date 1407315258 -3600
# Node ID a19319b701ccdb68c28a091c7c82bce4620ed0a5
# Parent  34768d6642aa7c14f4b3dcc195adde68d00291d0# Parent  f0bc70ecf43def64c900ffe0c2b97d992dbc8772
Merge

diff -r f0bc70ecf43d -r a19319b701cc .hgsubstate
--- a/.hgsubstate	Tue Aug 05 17:23:27 2014 +0100
+++ b/.hgsubstate	Wed Aug 06 09:54:18 2014 +0100
@@ -1,3 +1,3 @@
-a2621605a8c2119bb063c59e83f4fe792a58e4ac bqvec
+a7ded7b1ce692125e70071a01ee20097e79addc6 bqvec
 870077df3318592492aaa178d20d7d581a7c8f8f constant-q-cpp
 d25a2e91e9d84aaff25e5d746398232d182d127d flattendynamics
diff -r f0bc70ecf43d -r a19319b701cc Makefile.inc
--- a/Makefile.inc	Tue Aug 05 17:23:27 2014 +0100
+++ b/Makefile.inc	Wed Aug 06 09:54:18 2014 +0100
@@ -38,11 +38,16 @@
 
 all: constant-q-cpp $(PLUGIN)
 
+.PHONY: constant-q-cpp
+constant-q-cpp: 
+	$(MAKE) -C $@ -f Makefile$(MAKEFILE_EXT) libcq.a
+
 $(PLUGIN):	$(OBJECTS) $(LIBS)
 	$(CXX) -o $@ $^ $(LIBS) $(PLUGIN_LDFLAGS)
 
 clean:		
 	rm -f $(OBJECTS)
+	$(MAKE) -C constant-q-cpp -f Makefile$(MAKEFILE_EXT) clean
 
 distclean:	clean
 	rm -f $(PLUGIN)
diff -r f0bc70ecf43d -r a19319b701cc Makefile.linux
--- a/Makefile.linux	Tue Aug 05 17:23:27 2014 +0100
+++ b/Makefile.linux	Wed Aug 06 09:54:18 2014 +0100
@@ -10,9 +10,8 @@
 
 PLUGIN_EXT := .so
 
+MAKEFILE_EXT  := .linux
+
 include Makefile.inc
 
-.PHONY: constant-q-cpp
-constant-q-cpp: 
-	$(MAKE) -C $@ -f Makefile.linux libcq.a