X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=Makefile.in;h=ba5c0da7db72e56d067697cc9627457d748c3b32;hp=60fe8cc8add5e020cd8afd1639e2cc9f78fa2746;hb=11653375c39594d5d4822498941bc6288d0136ed;hpb=cad616874fcc3bd565c2105eabff45c7bfc574c1

diff --git a/Makefile.in b/Makefile.in
index 60fe8cc..ba5c0da 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,24 +1,26 @@
 # 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 d 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~beta1
+VERSION:=0.4.0
 
 @SET_MAKE@
 
@@ -30,6 +32,16 @@ RM:=@RM@
 CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
+INSTALL_SCRIPT:=@INSTALL_SCRIPT@
+INSTALL_DATA:=@INSTALL_DATA@
+
+prefix:=$(DESTDIR)@prefix@
+exec_prefix:=@exec_prefix@
+sbindir:=@sbindir@
+sysconfdir:=$(DESTDIR)@sysconfdir@
+datarootdir:=@datarootdir@
+transform:=@program_transform_name@
+mandir:=@mandir@
 
 CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
 	-W -Wno-unused -Wno-unused-parameter \
@@ -37,23 +49,18 @@ CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
 	-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
+	-Wno-strict-aliasing -fno-strict-aliasing \
+	-MMD
 ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
-CPPFLAGS:=@CPPFLAGS@ $(EXTRA_CPPFLAGS)
+CPPFLAGS:=@CPPFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' $(EXTRA_CPPFLAGS)
 LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
 LDLIBS:=@LIBS@ $(EXTRA_LDLIBS)
 
-prefix:=@prefix@
-exec_prefix:=@exec_prefix@
-sbindir:=@sbindir@
-sysconfdir:=@sysconfdir@
-transform:=@program_transform_name@
-mandir:=@mandir@
-
 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 +75,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 +89,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
@@ -106,12 +119,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
@@ -134,7 +142,7 @@ 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
 
 version.c: Makefile
 	echo "#include \"secnet.h\"" >$@.new
@@ -154,21 +162,40 @@ eax-%-test.confirm: eax-%-test eax-%-test.vectors
 	./$< <$(srcdir)/eax-$*-test.vectors >$@.new
 	mv -f $@.new $@
 
+check-ipaddrset: ipaddrset-test.py ipaddrset.py ipaddrset-test.expected
+	$(srcdir)/ipaddrset-test.py >ipaddrset-test.new
+	diff -u ipaddrset-test.expected ipaddrset-test.new
+
 .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) 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
 
 realclean:	clean
 	$(RM) -f *~ Makefile config.h  *.d \
@@ -198,9 +225,9 @@ dist:
 #
 #  3. Commit the updates to VERSION (above) and debian/changelog
 #
-#  4. git-tag -m "secnet $VERSION" -s v$VERSION
+#  4. git-tag -m "secnet $VERSION" -s v${VERSION//\~/_}
 #
-#  5. git-push origin v$VERSION v${VERSION}~0:master
+#  5. git-push origin v${VERSION//\~/_} v${VERSION//\~/_}~0:master
 #
 #  6. Run, again,
 #       make dist
@@ -210,17 +237,28 @@ dist:
 #  8. rsync -v ../secnet-$VERSION.tar.gz* \
 #        chiark:/home/ianmdlvl/public-html/secnet/download/
 #
-#  9. On 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/
+#
+#  9a. On chiark as ianmdlvl:
+#       cd ~ianmdlvl/secnet-build/
 #       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/
+#       dpkg-buildpackage -a -uc -us -rfakeroot
+#       mv ../secnet_${VERSION}_i386.deb ~ianmdlvl/public-html/secnet/download/backport/
 #
 #  10. 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/.
 #
 #  11. write and post a release announcement
+#       find -type l | sort | xargs sha256sum