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

[secnet.git] / Subdir.sd.mk

diff --git a/Subdir.sd.mk b/Subdir.sd.mk
index d5ad1a1a91bc510a79c52bac14704e61bf8fa855..1b79c438172420117a76e040253960b5e65eaf72 100644 (file)
--- a/Subdir.sd.mk
+++ b/Subdir.sd.mk
@@ -20,7 +20,7 @@
 .PHONY:        all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION=0.5.0
+VERSION=0.5.1
 
 VPATH:=@srcdir@
 srcdir:=@srcdir@
@@ -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
@@ -112,7 +112,7 @@ secnet:     $(OBJECTS)
 ifneq (,$(wildcard .git/HEAD))
 # If we have (eg) committed, relink and thus regenerate the version
 # with the new info from git describe.
-secnet: Makefile .git/HEAD $(shell sed -n 's#^ref: #.git/#p' .git/HEAD)
+secnet: Makefile .git/HEAD $(wildcard $(shell sed -n 's#^ref: #.git/#p' .git/HEAD))
 secnet: $(wildcard .git/packed-refs)
 endif
 
@@ -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