subdirmk: Change stub force target to `run-main.mk'

[secnet.git] / Subdir.sd.mk

diff --git a/Subdir.sd.mk b/Subdir.sd.mk
index dfa03b6164be03fc6b75c279a56fbd65c1a2fd2e..4d7d35fcddd204ae5445257cd7bb766ab8fa54f1 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@
@@ -61,10 +61,13 @@ TEST_OBJECTS:=eax-aes-test.o eax-serpent-test.o eax-serpentbe-test.o \
                eax-test.o aes.o
 
 ifeq (version.o,$(MAKECMDGOALS))
-OBJECTS:=version.o
+OBJECTS:=
 TEST_OBJECTS:=
 endif
 
+&OBJECTS += $(OBJECTS) $(TEST_OBJECTS)
+&:include subdirmk/cdeps.sd.mk
+
 STALE_PYTHON_FILES=    $(foreach e, py pyc, \
                        $(foreach p, /usr /usr/local, \
                        $(foreach l, ipaddr, \
@@ -80,9 +83,9 @@ STALE_PYTHON_FILES=   $(foreach e, py pyc, \
        bison -d -o $@ $<
 
 %.o: %.c conffile.yy.h
-       $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
+       $(CC) $(CPPFLAGS) $(ALL_CFLAGS) $(CDEPS_CFLAGS) -c $< -o $@
 
-all::  $(TARGETS) check
+all::  $(TARGETS)
 
 ${srcdir}/config.h.in: configure.ac
        cd ${srcdir} && autoheader
@@ -91,12 +94,6 @@ ${srcdir}/config.h.in: configure.ac
 MAKEFILE_TEMPLATES += config.h.in
 CONFIG_STATUS_OUTPUTS += config.h
 
-# C and header file dependency rules
-SOURCES:=$(OBJECTS:.o=.c) $(TEST_OBJECTS:.o=.c)
-DEPENDS:=$(OBJECTS:.o=.d) $(TEST_OBJECTS:.o=.d)
-
--include *.d
-
 # Manual dependencies section
 conffile.yy.c: conffile.fl conffile.tab.c
 conffile.yy.h: conffile.yy.c
@@ -121,21 +118,19 @@ endif
 
 TESTDIRS=stest mtest
 
-FAST_CHECKS= eax-aes-test.confirm eax-serpent-test.confirm \
-       eax-serpentbe-test.confirm check-ipaddrset \
-       $(addprefix check-,$(TESTDIRS))
-
-CHECKS += $(FAST_CHECKS)
-CHECKS += msgcode-test.confirm
+&TARGETS_check = eax-aes-test.confirm eax-serpent-test.confirm \
+       eax-serpentbe-test.confirm ipaddrset.confirm
 
-check: $(CHECKS)
+&TARGETS_fullcheck += $(&TARGETS_check)
+&TARGETS_fullcheck += msgcode-test.confirm
 
 recheck:
-       rm -f $(FAST_CHECKS)
+       rm -f $(&TARGETS_check)
        rm -rf $(addsuffix /d-*, $(TESTDIRS))
        $(MAKE) check
 
-version.c: Makefile
+.PHONY: FORCE
+version.c: FORCE
        echo "#include \"secnet.h\"" >$@.new
        @set -ex; if test -e .git && type -p git >/dev/null; then \
                v=$$(git describe --match 'v*'); v=$${v#v}; \
@@ -160,15 +155,10 @@ msgcode-test.confirm: msgcode-test
        ./msgcode-test
        touch $@
 
-check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
+ipaddrset.confirm: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
        $(srcdir)/ipaddrset-test.py >ipaddrset-test.new
        diff -u $(srcdir)/ipaddrset-test.expected ipaddrset-test.new
-
-check-stest: secnet test-example/sites.conf
-       $(MAKE) -C stest check
-
-check-mtest: make-secnet-sites $(PYMODULES)
-       $(MAKE) -C mtest check
+       touch $@
 
 .PRECIOUS: eax-%-test
 
@@ -199,17 +189,15 @@ install-force:
        rm -f $(STALE_PYTHON_FILES)
        $(MAKE) install
 
-clean:: $(addprefix clean-,$(TESTDIRS))
+clean::
        $(RM) -f *.o *.yy.[ch] *.tab.[ch] $(TARGETS) core version.c
-       $(RM) -f *.d *.pyc *~ eax-*-test.confirm eax-*-test
+       $(RM) -f *.pyc *~ eax-*-test.confirm eax-*-test
+       $(RM) $(&CLEAN)
        $(RM) -rf __pycache__
        $(RM) -f msgcode-test.confirm msgcode-test
 
-$(addprefix clean-,$(TESTDIRS)): clean-%:
-       $(MAKE) -C $* clean
-
 realclean::    clean
-       $(RM) -f *~ Makefile config.h  *.d \
+       $(RM) -f *~ Makefile config.h \
        config.log config.status config.cache \
        config.stamp Makefile.bak
 
@@ -219,7 +207,7 @@ include subdirmk/regen.mk
 
 # Release checklist:
 #
-#  0. Use this checklist from Makefile.in
+#  0. Use this checklist from Subdir.sd.mk
 #
 #  1. Check that the tree has what you want
 #