X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=Makefile.in;h=0328c1cc7af320e440991f4fceb9296135858351;hp=c0a6222b99b14a44a1b0eb1ad598bd1f1f5b029b;hb=465a1f65a17e4ad486dfbf8ba397c3879d90e6a6;hpb=3c35339bc4d3db033cc44558baf66c80e87fbd85

diff --git a/Makefile.in b/Makefile.in
index c0a6222..0328c1c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,59 +1,54 @@
 # Makefile for secnet
-# Copyright (C) 1995-2001 Stephen Early <steve@greenend.org.uk>
-
-# This program 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 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
+#
+# This file is part of secnet.
+# See README for full list of copyright holders.
+#
+# 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 3 of the License, or
+# (at your option) any later version.
+# 
+# secnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# version 3 along with secnet; if not, see
+# https://www.gnu.org/licenses/gpl.html.
 
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.3.3
-
-@SET_MAKE@
+VERSION=0.4.5
 
-srcdir:=@srcdir@
 VPATH:=@srcdir@
 
-SHELL:=/bin/sh
-RM:=@RM@
-CC:=@CC@
+include common.make
+
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
+INSTALL_SCRIPT:=@INSTALL_SCRIPT@
+INSTALL_DATA:=@INSTALL_DATA@
 
-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
-ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
-CPPFLAGS:=@CPPFLAGS@ $(EXTRA_CPPFLAGS)
-LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
-LDLIBS:=@LIBS@ $(EXTRA_LDLIBS)
-
-prefix:=@prefix@
+prefix:=$(DESTDIR)@prefix@
 exec_prefix:=@exec_prefix@
 sbindir:=@sbindir@
-sysconfdir:=@sysconfdir@
+sysconfdir:=$(DESTDIR)@sysconfdir@
+datarootdir:=@datarootdir@
 transform:=@program_transform_name@
 mandir:=@mandir@
 
+ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
+CPPFLAGS:=@CPPFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' $(EXTRA_CPPFLAGS)
+LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
+LDLIBS:=@LIBS@ $(EXTRA_LDLIBS)
+
 TARGETS:=secnet
 
 OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
 	resolver.o random.o udp.o site.o transform-cbcmac.o transform-eax.o \
+	comm-common.o polypath.o \
 	netlink.o rsa.o dh.o serpent.o serpentbe.o \
 	md5.o sha512.o tun.o slip.o sha1.o ipaddr.o log.o \
 	process.o @LIBOBJS@ \
@@ -68,6 +63,12 @@ OBJECTS:=version.o
 TEST_OBJECTS:=
 endif
 
+STALE_PYTHON_FILES=	$(foreach e, py pyc, \
+			$(foreach p, /usr /usr/local, \
+			$(foreach l, ipaddr, \
+			$(DESTDIR)$p/share/secnet/$l.$e \
+			)))
+
 %.c:	%.y
 
 %.yy.c:	%.fl
@@ -76,7 +77,7 @@ endif
 %.tab.c %.tab.h:	%.y
 	bison -d -o $@ $<
 
-%.o: %.c
+%.o: %.c conffile.yy.h
 	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
 
 all:	$(TARGETS) check
@@ -86,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
@@ -106,12 +107,7 @@ config.status: configure
 SOURCES:=$(OBJECTS:.o=.c) $(TEST_OBJECTS:.o=.c)
 DEPENDS:=$(OBJECTS:.o=.d) $(TEST_OBJECTS:.o=.d)
 
-$(DEPENDS): ${srcdir}/depend.sh
-
-%.d: %.c
-	${srcdir}/depend.sh $(srcdir) $(CPPFLAGS) $(ALL_CFLAGS) $< > $@
-
--include $(DEPENDS)
+-include *.d
 
 # Manual dependencies section
 conffile.yy.c:	conffile.fl conffile.tab.c
@@ -119,6 +115,8 @@ conffile.yy.h:	conffile.yy.c
 conffile.tab.c:	conffile.y
 # End of manual dependencies section
 
+conffile.yy.o: ALL_CFLAGS += -Wno-sign-compare
+
 secnet:	$(OBJECTS)
 	$(MAKE) version.o # *.o $(filter-out %.o, $^)
 	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) version.o $(LDLIBS)
@@ -134,11 +132,12 @@ secnet: $(wildcard .git/packed-refs)
 endif
 
 check: eax-aes-test.confirm eax-serpent-test.confirm \
-	eax-serpentbe-test.confirm
+	eax-serpentbe-test.confirm check-ipaddrset \
+	msgcode-test.confirm check-test
 
 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 \
@@ -154,73 +153,104 @@ 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-test: secnet test-example/sites.conf
+	$(MAKE) -C test check
+
+test-example/sites.conf:
+	$(MAKE) -C test-example
+
 .PRECIOUS: eax-%-test
 
 installdirs:
 	$(INSTALL) -d $(prefix)/share/secnet $(sbindir)
 	$(INSTALL) -d $(mandir)/man8
+	$(INSTALL) -d $(datarootdir)/secnet
 
 install: installdirs
+	set -e; ok=true; for f in $(STALE_PYTHON_FILES); do \
+		if test -e $$f; then \
+			echo >&2 "ERROR: $$f still exists "\
+				"- try \`make install-force'"; \
+			ok=false; \
+		fi; \
+	done; \
+	$$ok
 	$(INSTALL_PROGRAM) secnet $(sbindir)/`echo secnet|sed '$(transform)'`
 	$(INSTALL_PROGRAM) ${srcdir}/make-secnet-sites $(sbindir)/`echo make-secnet-sites|sed '$(transform)'`
-	$(INSTALL) ${srcdir}/ipaddr.py $(prefix)/share/secnet/ipaddr.py
-	$(INSTALL) secnet.8 $(mandir)/man8/secnet.8
+	$(INSTALL_DATA) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py
+	$(INSTALL_SCRIPT) ${srcdir}/polypath-interface-monitor-linux \
+		$(datarootdir)/secnet/.
+	$(INSTALL_DATA) ${srcdir}/secnet.8 $(mandir)/man8/secnet.8
+
+install-force:
+	rm -f $(STALE_PYTHON_FILES)
+	$(MAKE) install
 
 clean:
-	$(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c
-	$(RM) -f *.d *~ eax-*-test.confirm eax-*-test
+	$(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
 
 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
+#  0. Use this checklist from Makefile.in
 #
-#  3. Run
-#       ./configure
-#       make dist
-#     and check that the resulting tarball looks OK.
-#     Eg, untar it and build it, or have it reviewed.
+#  1. Check that the tree has what you want
 #
-#  3. Commit the updates to VERSION (above) and debian/changelog
+#  2. Update changelog:
+#         gbp dch --since=<PREVIOUS VERSION>
+#     and then edit debian/changelog.
 #
-#  4. git-tag -m "secnet $VERSION" -s v$VERSION
+#  3. Update VERSION (in this file, above) and
+#     finalise debian/changelog (removing ~ from version) and commit.
 #
-#  5. git-push origin v$VERSION v${VERSION}~0:master
+#  4. Build source and binaries:
+#       dgit -wgf sbuild -A -c stretch
 #
-#  6. Run, again,
-#       make dist
+#  5. dpkg -i on zealot just to check
+#       dpkg -i ~ian/things/Fvpn/bpd/secnet_${VERSION}_amd64.deb
 #
-#  7. gpg --detach-sign ../secnet-$VERSION.tar.gz
+#  6. run it on chiark
+#     check we can still ping davenant and chiark
 #
-#  8. rsync -v ../secnet-$VERSION.tar.gz* \
-#        chiark:/home/ianmdlvl/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
 #
-#  9. On chiark:
-#       tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$VERSION.tar.gz
-#       cd secnet-$VERSION
-#       debian/rules build
-#       fakeroot debian/rules binary
-#       mv ../secnet_${VERSION}_i386.deb ~ianmdlvl/public-html/secnet/download/
+#  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* .
+#       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
+# 11. bump changelog version in master, to new version with ~