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 ead5f5117888ea0dd257f83e22f940f46e58c342..1b79c438172420117a76e040253960b5e65eaf72 100644 (file)
--- 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 c3b5cc9c36c6c9e10d98eae05f3b033c25c22ad5..4c2d1a138105af02a35e59cb444e7be41274ee26 100644 (file)
--- 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