X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/5d8fc5c038cb1e4a213e5d0283ebfc5c853ac04f..53f4e66603bcc2d21c70ad7a69db5fda6da5d645:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index feda4e8..97acf48 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,7 +37,8 @@ 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)
 LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
@@ -54,6 +55,7 @@ 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 \
 	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 +70,12 @@ OBJECTS:=version.o
 TEST_OBJECTS:=
 endif
 
+STALE_PYTHON_FILES=	$(foreach e, py pyc, \
+			$(foreach p, /usr /usr/local, \
+			$(foreach l, ipaddr, \
+			$p/share/secnet/$l.$e \
+			)))
+
 %.c:	%.y
 
 %.yy.c:	%.fl
@@ -106,12 +114,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 +137,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,6 +157,10 @@ 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:
@@ -161,11 +168,23 @@ installdirs:
 	$(INSTALL) -d $(mandir)/man8
 
 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) ${srcdir}/ipaddrset.py $(prefix)/share/secnet/ipaddrset.py
 	$(INSTALL) 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