# HG changeset patch # User Chris Cannam # Date 1400590397 -3600 # Node ID 9d44ed673b858a963956903b12e4ff56f8c55f8c # Parent 26d9a8b02adff5ef274cf4056f69d5f1fed88123 Ensure subrepo Makefile is always invoked, not only if the target doesn't exist diff -r 26d9a8b02adf -r 9d44ed673b85 .hgsubstate --- 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 diff -r 26d9a8b02adf -r 9d44ed673b85 Makefile.inc --- 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) diff -r 26d9a8b02adf -r 9d44ed673b85 Makefile.linux --- 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