Mercurial > hg > silvet

changeset 159:9d44ed673b85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ensure subrepo Makefile is always invoked, not only if the target doesn't exist
author Chris Cannam
date Tue, 20 May 2014 13:53:17 +0100
parents 26d9a8b02adf
children 58547262e735
files .hgsubstate Makefile.inc Makefile.linux
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Mon May 19 17:47:34 2014 +0100
+++ b/.hgsubstate	Tue May 20 13:53:17 2014 +0100
@@ -1,2 +1,2 @@
 a2621605a8c2119bb063c59e83f4fe792a58e4ac bqvec
-3f20b57ee15f18db05c8c911a1c90baaf131292f constant-q-cpp
+c7d17fcd215cd2ab66b66c5b89651932cd22d355 constant-q-cpp
--- a/Makefile.inc	Mon May 19 17:47:34 2014 +0100
+++ b/Makefile.inc	Tue May 20 13:53:17 2014 +0100
@@ -32,7 +32,7 @@
 
 LIBS	:= $(CQ_DIR)/libcq.a $(VAMPSDK_DIR)/libvamp-sdk.a
 
-all: $(PLUGIN)
+all: constant-q-cpp $(PLUGIN)
 
 $(PLUGIN):	$(OBJECTS) $(LIBS)
 	$(CXX) -o $@ $^ $(LIBS) $(PLUGIN_LDFLAGS)
--- a/Makefile.linux	Mon May 19 17:47:34 2014 +0100
+++ b/Makefile.linux	Tue May 20 13:53:17 2014 +0100
@@ -12,5 +12,6 @@
 
 include Makefile.inc
 
-constant-q-cpp/libcq.a:
-	$(MAKE) -C constant-q-cpp -f Makefile.linux libcq.a
+.PHONY: constant-q-cpp
+constant-q-cpp: 
+	$(MAKE) -C $@ -f Makefile.linux libcq.a