X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=Makefile.in;h=97acf48d5c1e83ce6fbb42c6b261602c4fa658a9;hp=96a018040096706459ab374cc7c3b82711ee862f;hb=6b30affc1ec14bf38a73994e8fdd39f26b5bccb3;hpb=1ca0593dc696189e61c5e2bac6cf1315d5cf5840

diff --git a/Makefile.in b/Makefile.in
index 96a0180..97acf48 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.3.0
+VERSION:=0.3.4
 
 @SET_MAKE@
 
@@ -32,12 +32,13 @@ INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 
 CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
-	-W -Wno-unused \
+	-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 -Wbad-function-cast \
-	-Wno-strict-aliasing -fno-strict-aliasing
+	-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@ $(EXTRA_CPPFLAGS)
 LDFLAGS:=@LDFLAGS@ $(EXTRA_LDFLAGS)
@@ -54,14 +55,27 @@ 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 version.o tun.o slip.o sha1.o ipaddr.o log.o \
+	md5.o sha512.o tun.o slip.o sha1.o ipaddr.o log.o \
 	process.o @LIBOBJS@ \
 	hackypar.o
+# version.o is handled specially below and in the link rule for secnet.
 
 TEST_OBJECTS:=eax-aes-test.o eax-serpent-test.o eax-serpentbe-test.o \
 		eax-test.o aes.o
 
+ifeq (version.o,$(MAKECMDGOALS))
+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
@@ -100,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
@@ -114,14 +123,31 @@ conffile.tab.c:	conffile.y
 # End of manual dependencies section
 
 secnet:	$(OBJECTS)
-	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) $(LDLIBS)
+	$(MAKE) version.o # *.o $(filter-out %.o, $^)
+	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) version.o $(LDLIBS)
+# We (always) regenerate the version, but only if we regenerate the
+# binary.  (This is necessary as the version string is can depend on
+# any of the source files, eg to see whether "+" is needed.)
+
+ifneq (,$(wildcard .git/HEAD))
+# If we have (eg) committed, relink and thus regenerate the version
+# with the new info from git describe.
+secnet: Makefile .git/HEAD $(shell sed -n 's#^ref: #.git/#p' .git/HEAD)
+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
-	echo "char version[]=\"secnet $(VERSION)\";" >>$@.new
+	@set -ex; if test -e .git; then \
+		v=$$(git describe --match 'v*'); v=$${v#v}; \
+		if ! git diff --quiet HEAD; then v="$$v+"; fi; \
+	else \
+		v="$(VERSION)"; \
+	fi; \
+	echo "char version[]=\"secnet $$v\";" >>$@.new
 	mv -f $@.new $@
 
 eax-%-test: eax-%-test.o eax-test.o %.o
@@ -131,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:
@@ -138,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
@@ -177,7 +219,7 @@ dist:
 #
 #  4. git-tag -m "secnet $VERSION" -s v$VERSION
 #
-#  5. git-push origin
+#  5. git-push origin v$VERSION v${VERSION}~0:master
 #
 #  6. Run, again,
 #       make dist
@@ -195,7 +237,9 @@ dist:
 #       mv ../secnet_${VERSION}_i386.deb ~ianmdlvl/public-html/secnet/download/
 #
 #  10. On chiark as user secnet:
-#       cd ~secnet/
-#       rsync ~ianmdlvl/public-html/secnet/download/secnet* .
+#       cd ~secnet/public-html/release/
+#       mkdir $VERSION
+#       cd $VERSION
+#       ln -s /home/ianmdlvl/public-html/secnet/download/secnet?$VERSION* .
 #
 #  11. write and post a release announcement