X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile.in;h=6560746926d314eff26534fb6ff67d12724d54db;hb=a879e1b9baf4c21f91c16b7a522d732352c3c8d7;hp=406efdef4ba2fc11d87a99ae118580576c001427;hpb=1fc8a4acb3ef658696038c9c4bd3c155fbc27ac3;p=secnet.git

diff --git a/Makefile.in b/Makefile.in
index 406efde..6560746 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,7 +5,7 @@
 #
 # secnet is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version d of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # secnet is distributed in the hope that it will be useful, but
@@ -20,16 +20,12 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.4.0
+VERSION=0.4.5
 
-@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)
@@ -99,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
@@ -143,12 +131,15 @@ secnet: Makefile .git/HEAD $(shell sed -n 's#^ref: #.git/#p' .git/HEAD)
 secnet: $(wildcard .git/packed-refs)
 endif
 
+TESTDIRS=stest mtest
+
 check: eax-aes-test.confirm eax-serpent-test.confirm \
-	eax-serpentbe-test.confirm check-ipaddrset
+	eax-serpentbe-test.confirm check-ipaddrset \
+	msgcode-test.confirm $(addprefix check-,$(TESTDIRS))
 
 version.c: Makefile
 	echo "#include \"secnet.h\"" >$@.new
-	@set -ex; if test -e .git; then \
+	@set -ex; if test -e .git && type -p git >/dev/null; then \
 		v=$$(git describe --match 'v*'); v=$${v#v}; \
 		if ! git diff --quiet HEAD; then v="$$v+"; fi; \
 	else \
@@ -164,10 +155,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 ipaddrset.py
+	$(MAKE) -C mtest check
+
+test-example/sites.conf:
+	$(MAKE) -C test-example
+
 .PRECIOUS: eax-%-test
 
 installdirs:
@@ -189,78 +196,69 @@ install: installdirs
 	$(INSTALL_DATA) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py
 	$(INSTALL_SCRIPT) ${srcdir}/polypath-interface-monitor-linux \
 		$(datarootdir)/secnet/.
-	$(INSTALL_DATA) secnet.8 $(mandir)/man8/secnet.8
+	$(INSTALL_DATA) ${srcdir}/secnet.8 $(mandir)/man8/secnet.8
 
 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) -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
 
-pfname:=$(PACKAGE)-$(VERSION)
-tarfname:=../$(pfname).tar
-dist:
-	$(RM) -rf $(tarfname) $(tarfname).gz
-	git archive --format=tar --prefix=$(pfname)/ HEAD -o $(tarfname)
-	gzip -9f $(tarfname)
-
 # Release checklist:
-#  1. Check that the tree has what you want
-#
-#  2. Update VERSION (above) and debian/changelog
-#     but DO NOT COMMIT
 #
-#  3. Run
-#       ./configure
-#       make dist
-#     and check that the resulting tarball looks OK.
-#     Eg, untar it and build it, or have it reviewed.
+#  0. Use this checklist from Makefile.in
 #
-#  3. Commit the updates to VERSION (above) and debian/changelog
+#  1. Check that the tree has what you want
 #
-#  4. git-tag -m "secnet $VERSION" -s v${VERSION//\~/_}
+#  2. Update changelog:
+#         gbp dch --since=<PREVIOUS VERSION>
+#     and then edit debian/changelog.
 #
-#  5. git-push origin v${VERSION//\~/_} v${VERSION//\~/_}~0:master
+#  3. Update VERSION (in this file, above) and
+#     finalise debian/changelog (removing ~ from version) and commit.
 #
-#  6. Run, again,
-#       make dist
+#  4. Build source and binaries:
+#       dgit -wgf sbuild -A -c stretch
 #
-#  7. gpg --detach-sign ../secnet-$VERSION.tar.gz
+#  5. dpkg -i on zealot just to check
+#       dpkg -i ~ian/things/Fvpn/bpd/secnet_${VERSION}_amd64.deb
 #
-#  8. rsync -v ../secnet-$VERSION.tar.gz* \
-#        chiark:/home/ianmdlvl/public-html/secnet/download/
+#  6. run it on chiark
+#     check we can still ping davenant and chiark
 #
-#  9. In zealot's squeeze chroot:
-#       rm -rf ../d; mkdir ../d; cd ../d
-#       tar zxf ../secnet-$VERSION.tar.gz
-#       cd secnet-$VERSION
-#       dpkg-buildpackage -a -uc -us -rfakeroot
-#       rsync -vP ../secnet_${VERSION}_i386.deb ianmdlvl@chiark:public-html/secnet/download/
+#  7. Make git tag and source tarball signature:
+#       git-tag -u general -m "secnet $VERSION" -s v${VERSION//\~/_}
+#       gpg -u general --detach-sign ../bpd/secnet_$VERSION.tar.gz
 #
-#  9a. On chiark as ianmdlvl:
-#       cd ~ianmdlvl/secnet-build/
-#       tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$VERSION.tar.gz
-#       cd secnet-$VERSION
-#       dpkg-buildpackage -a -uc -us -rfakeroot
-#       mv ../secnet_${VERSION}_i386.deb ~ianmdlvl/public-html/secnet/download/backport/
+#  8. Publish the branch and distriubtion files:
+#       git-push origin v${VERSION//\~/_} v${VERSION//\~/_}~0:master
+#       dcmd rsync -v ../bpd/secnet_${VERSION}_multi.changes chiark:/home/ianmdlvl/public-html/secnet/download/
 #
-#  10. On chiark as user secnet:
+#  9. Sort out html.  On chiark as user secnet:
 #       cd ~secnet/public-html/release/
 #       mkdir $VERSION
 #       cd $VERSION
 #       ln -s /home/ianmdlvl/public-html/secnet/download/secnet?$VERSION* .
-#       mkdir polypath-backport
-#       ln -s /home/ianmdlvl/public-html/secnet/download/backport/secnet?$VERSION* polypath-backport/.
-#       ln -s /home/ianmdlvl/public-html/secnet/download/backport/*adns* polypath-backport/.
+#       ln -sfn $VERSION ../current
+#
+# 10. write and post a release announcement
+#       cd ../bpd
+#       dcmd sha256sum secnet_${VERSION}_multi.changes
+#       ...
+#       gpg --clearsign ../release-announcement
+#       rsync -vP ../release-announcement.asc c:mail/d/
 #
-#  11. write and post a release announcement
-#       find -type l | sort | xargs sha256sum
+# 11. bump changelog version in master, to new version with ~