CREDITS: Credit Mark properly (!)

[secnet.git] / Subdir.sd.mk

diff --git a/Subdir.sd.mk b/Subdir.sd.mk
index d7af1d35fdc742f4c7ad238d54421a12b6cf5993..bb2476fbc4413aa90dbe2573c4bc4edd1a74757f 100644 (file)
--- a/Subdir.sd.mk
+++ b/Subdir.sd.mk
@@ -65,6 +65,9 @@ OBJECTS:=version.o
 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,25 +83,16 @@ STALE_PYTHON_FILES= $(foreach e, py pyc, \
        bison -d -o $@ $<
 
 %.o: %.c conffile.yy.h
-       $(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
-
-all::  $(TARGETS) check
+       $(CC) $(CPPFLAGS) $(ALL_CFLAGS) $(CDEPS_CFLAGS) -c $< -o $@
 
-include subdirmk/regen.mk
+all::  $(TARGETS)
 
-# autoheader might not change config.h.in, so touch a stamp file.
-${srcdir}/config.h.in: config.stamp.in
-${srcdir}/config.stamp.in: configure.ac
+${srcdir}/config.h.in: configure.ac
        cd ${srcdir} && autoheader
-       echo timestamp > ${srcdir}/config.stamp.in
+       touch $@
 
 MAKEFILE_TEMPLATES += config.h.in
-
-# C and header file dependency rules
-SOURCES:=$(OBJECTS:.o=.c) $(TEST_OBJECTS:.o=.c)
-DEPENDS:=$(OBJECTS:.o=.d) $(TEST_OBJECTS:.o=.d)
-
--include *.d
+CONFIG_STATUS_OUTPUTS += config.h
 
 # Manual dependencies section
 conffile.yy.c: conffile.fl conffile.tab.c
@@ -124,17 +118,15 @@ 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 \
+       $(addsuffix /check,$(TESTDIRS))
 
-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
 
@@ -163,18 +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
-
-test-example/sites.conf:
-       $(MAKE) -C test-example
+       touch $@
 
 .PRECIOUS: eax-%-test
 
@@ -205,22 +189,22 @@ 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
 
 distclean::    realclean
 
+include subdirmk/regen.mk
+
 # Release checklist:
 #
 #  0. Use this checklist from Makefile.in