python: Provide feature for argparse --[no-]foo options

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 394ffda473fb23a1db27ead96fd7a414ec0db2d1..0423cf44ebf5a87a13b618664c544f4e2bafa291 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,7 @@
 .PHONY:        all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION=0.4.5
+VERSION=0.5.0
 
 VPATH:=@srcdir@
 srcdir:=@srcdir@
@@ -55,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
 
@@ -179,7 +181,7 @@ check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
 check-stest: secnet test-example/sites.conf
        $(MAKE) -C stest check
 
-check-mtest: make-secnet-sites ipaddrset.py
+check-mtest: make-secnet-sites $(PYMODULES)
        $(MAKE) -C mtest check
 
 test-example/sites.conf:
@@ -203,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
@@ -215,6 +219,7 @@ install-force:
 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-%:
@@ -241,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