build system: Reorganise check targets

[secnet.git] / Subdir.sd.mk

diff --git a/Subdir.sd.mk b/Subdir.sd.mk
index dfa03b6164be03fc6b75c279a56fbd65c1a2fd2e..97b54830d1ae4115ecadd248f243a25db8a877a0 100644 (file)
--- a/Subdir.sd.mk
+++ b/Subdir.sd.mk
@@ -82,7 +82,7 @@ STALE_PYTHON_FILES=   $(foreach e, py pyc, \
 %.o: %.c conffile.yy.h
        $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
 
-all::  $(TARGETS) check
+all::  $(TARGETS)
 
 ${srcdir}/config.h.in: configure.ac
        cd ${srcdir} && autoheader
@@ -121,17 +121,15 @@ endif
 
 TESTDIRS=stest mtest
 
-FAST_CHECKS= eax-aes-test.confirm eax-serpent-test.confirm \
+&TARGETS_check = eax-aes-test.confirm eax-serpent-test.confirm \
        eax-serpentbe-test.confirm check-ipaddrset \
-       $(addprefix check-,$(TESTDIRS))
+       $(addsuffix /check,$(TESTDIRS))
 
-CHECKS += $(FAST_CHECKS)
-CHECKS += msgcode-test.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
 
@@ -164,12 +162,6 @@ check-ipaddrset: 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
-
 .PRECIOUS: eax-%-test
 
 installdirs:
@@ -199,15 +191,12 @@ 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) -rf __pycache__
        $(RM) -f msgcode-test.confirm msgcode-test
 
-$(addprefix clean-,$(TESTDIRS)): clean-%:
-       $(MAKE) -C $* clean
-
 realclean::    clean
        $(RM) -f *~ Makefile config.h  *.d \
        config.log config.status config.cache \