X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=Makefile.in;h=e956695d003e4415a8f248bcc00186f4b313fff2;hp=7440b303cccaae4918c1b59c9bfa45da88e78dca;hb=e4cfe5379b48e36de6de4deb0832837be6d60ca3;hpb=b24a72ef9d47c9e51f6efe79b51073d690584aa5

diff --git a/Makefile.in b/Makefile.in
index 7440b30..e956695 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.3.1~beta2
+VERSION:=0.3.1
 
 @SET_MAKE@
 
@@ -36,7 +36,7 @@ CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
 	-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 \
+	-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)
@@ -55,13 +55,19 @@ 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 \
 	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
+
 %.c:	%.y
 
 %.yy.c:	%.fl
@@ -114,14 +120,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
 
 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
@@ -177,7 +200,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