From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 15 Nov 2019 23:32:15 +0000 (+0000)
Subject: build system, tests: Marginally speed some things up with -f
X-Git-Tag: v0.6.0~258
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=b2e781615d5638cd9fb8a3edf6ea5b883bff265a

build system, tests: Marginally speed some things up with -f

This avoids an additional redirection through the stub Makefiles.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Subdir.sd.mk b/Subdir.sd.mk
index ead5f51..1b79c43 100644
--- a/Subdir.sd.mk
+++ b/Subdir.sd.mk
@@ -103,7 +103,7 @@ conffile.tab.c:	conffile.y
 conffile.yy.o: ALL_CFLAGS += -Wno-sign-compare
 
 secnet:	$(OBJECTS)
-	$(MAKE) version.o # *.o $(filter-out %.o, $^)
+	$(MAKE) -f main.mk version.o # *.o $(filter-out %.o, $^)
 	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) version.o $(LDLIBS)
 # We (always) regenerate the version, but only if we regenerate the
 # binary.  (This is necessary as the version string is can depend on
@@ -127,7 +127,7 @@ TESTDIRS=stest mtest
 recheck:
 	rm -f $(&TARGETS_check)
 	rm -rf $(addsuffix /d-*, $(TESTDIRS))
-	$(MAKE) check
+	$(MAKE) -f main.mk check
 
 .PHONY: FORCE
 version.c: FORCE
@@ -187,7 +187,7 @@ install: installdirs
 
 install-force:
 	rm -f $(STALE_PYTHON_FILES)
-	$(MAKE) install
+	$(MAKE) -f main.mk install
 
 clean::
 	$(RM) -f *.o *.yy.[ch] *.tab.[ch] $(TARGETS) core version.c
diff --git a/stest/Subdir.sd.mk b/stest/Subdir.sd.mk
index c3b5cc9..4c2d1a1 100644
--- a/stest/Subdir.sd.mk
+++ b/stest/Subdir.sd.mk
@@ -33,6 +33,6 @@ MAKE_NOTSPECIAL:=$(MAKE)
 
 &check:: $(&DEPS)
 	env -u MAKEFLAGS -u MFLAGS \
-	$(MAKE_NOTSPECIAL) -j$(shell nproc || 1)0 &check-real
+	$(MAKE_NOTSPECIAL) -f main.mk -j$(shell nproc || 1)0 &check-real
 
 &:include subdirmk/cdeps.sd.mk