Mercurial > hg > silvet

changeset 277:3148edeb5336

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Mon, 04 Aug 2014 15:16:00 +0100
parents 537205426492 (diff) 4e19c60241cb (current diff)
children 34768d6642aa
files
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.inc	Mon Aug 04 09:22:05 2014 +0100
+++ b/Makefile.inc	Mon Aug 04 15:16:00 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)
--- a/Makefile.linux	Mon Aug 04 09:22:05 2014 +0100
+++ b/Makefile.linux	Mon Aug 04 15:16:00 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