Add 'subdirmk/' from commit 'f1789a0ae66174a95c8d629738eae98d40c084ac'

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7de29181822257d07e942aa81264a2a8d85de949..0423cf44ebf5a87a13b618664c544f4e2bafa291 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,16 +20,12 @@
 .PHONY:        all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION=0.4.5
+VERSION=0.5.0
 
-@SET_MAKE@
-
-srcdir:=@srcdir@
 VPATH:=@srcdir@
+srcdir:=@srcdir@
+include common.make
 
-SHELL:=/bin/sh
-RM:=@RM@
-CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 INSTALL_SCRIPT:=@INSTALL_SCRIPT@
@@ -43,14 +39,6 @@ datarootdir:=@datarootdir@
 transform:=@program_transform_name@
 mandir:=@mandir@
 
-CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
-       -W -Wno-unused -Wno-unused-parameter \
-       -Wno-pointer-sign -Wstrict-prototypes -Wmissing-prototypes \
-       -Wmissing-declarations -Wnested-externs -Wredundant-decls \
-       -Wpointer-arith -Wformat=2 -Winit-self \
-       -Wswitch-enum -Wunused-variable -Wunused-function -Wbad-function-cast \
-       -Wno-strict-aliasing -fno-strict-aliasing \
-       -MMD
 ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
 CPPFLAGS:=@CPPFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' $(EXTRA_CPPFLAGS)
 LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
@@ -67,6 +55,8 @@ OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
        hackypar.o
 # version.o is handled specially below and in the link rule for secnet.
 
+PYMODULES := ipaddrset.py argparseactionnoyes.py
+
 TEST_OBJECTS:=eax-aes-test.o eax-serpent-test.o eax-serpentbe-test.o \
                eax-test.o aes.o
 
@@ -99,13 +89,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
@@ -143,8 +133,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 \
-       eax-serpentbe-test.confirm check-ipaddrset
+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
+
+check: $(CHECKS)
+
+recheck:
+       rm -f $(FAST_CHECKS)
+       rm -rf $(addsuffix /d-*, $(TESTDIRS))
+       $(MAKE) check
 
 version.c: Makefile
        echo "#include \"secnet.h\"" >$@.new
@@ -164,10 +167,26 @@ eax-%-test.confirm: eax-%-test eax-%-test.vectors
        ./$< <$(srcdir)/eax-$*-test.vectors >$@.new
        mv -f $@.new $@
 
+msgcode-test: msgcode-test.o
+       $(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $^
+
+msgcode-test.confirm: msgcode-test
+       ./msgcode-test
+       touch $@
+
 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
+
+test-example/sites.conf:
+       $(MAKE) -C test-example
+
 .PRECIOUS: eax-%-test
 
 installdirs:
@@ -186,7 +205,9 @@ install: installdirs
        $$ok
        $(INSTALL_PROGRAM) secnet $(sbindir)/`echo secnet|sed '$(transform)'`
        $(INSTALL_PROGRAM) ${srcdir}/make-secnet-sites $(sbindir)/`echo make-secnet-sites|sed '$(transform)'`
-       $(INSTALL_DATA) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py
+       set -e; for m in $(PYMODULES); do \
+               $(INSTALL_DATA) ${srcdir}/$$m $(prefix)/share/secnet/$$m; \
+               done
        $(INSTALL_SCRIPT) ${srcdir}/polypath-interface-monitor-linux \
                $(datarootdir)/secnet/.
        $(INSTALL_DATA) ${srcdir}/secnet.8 $(mandir)/man8/secnet.8
@@ -195,14 +216,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
 
@@ -220,7 +246,7 @@ distclean:  realclean
 #     finalise debian/changelog (removing ~ from version) and commit.
 #
 #  4. Build source and binaries:
-#       dgit -wgf sbuild -A -c stretch
+#       dgit -wgf sbuild -A -c stretch -j8
 #
 #  5. dpkg -i on zealot just to check
 #       dpkg -i ~ian/things/Fvpn/bpd/secnet_${VERSION}_amd64.deb