Mercurial > hg > silvet

changeset 276:537205426492

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make clean apply to cq subdir as well
author Chris Cannam
date Mon, 04 Aug 2014 15:15:34 +0100
parents e5f897b2d5e8
children 3148edeb5336
files Makefile.inc Makefile.linux
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.inc	Mon Jul 28 14:40:44 2014 +0100
+++ b/Makefile.inc	Mon Aug 04 15:15:34 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 Jul 28 14:40:44 2014 +0100
+++ b/Makefile.linux	Mon Aug 04 15:15:34 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