changelog: finalise 0.5.0

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 45b4866904206ead6dbe38c967b95cc5e0e250b7..9409b507d1685b47a8c6effe562d31bd1709c29b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,10 +20,10 @@
 .PHONY:        all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION=0.4.5
+VERSION=0.5.0
 
 VPATH:=@srcdir@
-
+srcdir:=@srcdir@
 include common.make
 
 INSTALL:=@INSTALL@
@@ -87,13 +87,13 @@ ${srcdir}/configure: configure.in
        cd ${srcdir} && autoconf
 
 # autoheader might not change config.h.in, so touch a stamp file.
-${srcdir}/config.h.in: stamp-h.in
-${srcdir}/stamp-h.in: configure.in
+${srcdir}/config.h.in: config.stamp.in
+${srcdir}/config.stamp.in: configure.in
        cd ${srcdir} && autoheader
-       echo timestamp > ${srcdir}/stamp-h.in
+       echo timestamp > ${srcdir}/config.stamp.in
 
-config.h: stamp-h
-stamp-h: config.h.in config.status
+config.h: config.stamp
+config.stamp: config.h.in config.status
        ./config.status
 
 Makefile: Makefile.in config.status
@@ -131,9 +131,21 @@ secnet: Makefile .git/HEAD $(shell sed -n 's#^ref: #.git/#p' .git/HEAD)
 secnet: $(wildcard .git/packed-refs)
 endif
 
-check: eax-aes-test.confirm eax-serpent-test.confirm \
+TESTDIRS=stest mtest
+
+FAST_CHECKS= eax-aes-test.confirm eax-serpent-test.confirm \
        eax-serpentbe-test.confirm check-ipaddrset \
-       msgcode-test.confirm check-test
+       $(addprefix check-,$(TESTDIRS))
+
+CHECKS += $(FAST_CHECKS)
+CHECKS += msgcode-test.confirm
+
+check: $(CHECKS)
+
+recheck:
+       rm -f $(FAST_CHECKS)
+       rm -rf $(addsuffix /d-*, $(TESTDIRS))
+       $(MAKE) check
 
 version.c: Makefile
        echo "#include \"secnet.h\"" >$@.new
@@ -164,8 +176,11 @@ 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-test: secnet test-example/sites.conf
-       $(MAKE) -C test check
+check-stest: secnet test-example/sites.conf
+       $(MAKE) -C stest check
+
+check-mtest: make-secnet-sites ipaddrset.py
+       $(MAKE) -C mtest check
 
 test-example/sites.conf:
        $(MAKE) -C test-example
@@ -197,15 +212,19 @@ install-force:
        rm -f $(STALE_PYTHON_FILES)
        $(MAKE) install
 
-clean:
+clean: $(addprefix clean-,$(TESTDIRS))
        $(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 \
-       stamp-h Makefile.bak
+       config.stamp Makefile.bak
 
 distclean:     realclean