X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.in;h=37e0ec6634fd42bf537e41b8a0dc96eec8cb1a73;hb=3e69b1eec376fdd75e9923b35d21dad0c37644a9;hp=60e63cd936458c3c6328c171a1a704fb80b22f60;hpb=3b83c93292fbf6c4e859ce513bdf54ad90733f96;p=secnet.git

diff --git a/Makefile.in b/Makefile.in
index 60e63cd..37e0ec6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.1.16
+VERSION:=0.1.18.1
 
 @SET_MAKE@
 
@@ -36,6 +36,7 @@ INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 #CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -DHACKY_PARALLEL
 CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@
 ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS)
+CPPFLAGS:=@CPPFLAGS@
 LDFLAGS:=@LDFLAGS@
 LDLIBS:=@LIBS@
 
@@ -58,8 +59,8 @@ DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
 	NEWS NOTES README TODO \
 	ac_prog_cc_no_writeable_strings.m4 \
 	conffile.c conffile.fl conffile.h conffile.y \
-	conffile_internal.h config.h.bot \
-	config.h.in config.h.top configure \
+	conffile_internal.h \
+	config.h.in configure \
 	configure.in depend.sh dh.c \
 	example.conf \
 	getopt.c getopt1.c getopt.h \
@@ -73,15 +74,15 @@ DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
 	sha1.c site.c slip.c stamp-h.in transform.c tun.c udp.c \
 	unaligned.h util.c util.h \
 	hackypar.c hackypar.h
-DISTSUBDIRS:=debian/conffiles debian/copyright debian/changelog \
-	debian/control debian/init debian/rules
+DISTSUBDIRS:=debian/copyright debian/changelog debian/control \
+	debian/init debian/rules debian/compat debian/default
 
 %.c:	%.y
 
 %.yy.c:	%.fl
 	flex -o$@ $<
 
-%.tab.c:	%.y
+%.tab.c %.tab.h:	%.y
 	bison -d -o $@ $<
 
 %.o: %.c
@@ -95,7 +96,7 @@ ${srcdir}/configure: configure.in
 
 # 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 config.h.top config.h.bot
+${srcdir}/stamp-h.in: configure.in
 	cd ${srcdir} && autoheader
 	echo timestamp > ${srcdir}/stamp-h.in
 
@@ -117,7 +118,7 @@ DEPENDS:=$(OBJECTS:.o=.d)
 $(DEPENDS): ${srcdir}/depend.sh
 
 %.d: %.c
-	${srcdir}/depend.sh $(srcdir) $(ALL_CFLAGS) $< > $@
+	${srcdir}/depend.sh $(srcdir) $(CPPFLAGS) $(ALL_CFLAGS) $< > $@
 
 -include $(DEPENDS)
 
@@ -155,6 +156,31 @@ dist:
 	for i in $(DISTDIRS) ; do mkdir $(pfname)/$$i ; done
 	for i in $(DISTFILES) ; do ln -s ../$(srcdir)/$$i $(pfname)/ ; done
 	for i in $(DISTSUBDIRS) ; do ln -s ../../$(srcdir)/$$i $(pfname)/$$i ; done
-	tar hcf ../$(pfname).tar --exclude=CVS --exclude=.cvsignore $(pfname)
+	tar hcf ../$(pfname).tar --exclude=.git --exclude=.cvsignore $(pfname)
 	gzip -9f ../$(pfname).tar
 	$(RM) -rf $(pfname)
+
+# Release checklist:
+#  1. Check that the tree has what you want
+#
+#  2. Update VERSION above but DO NOT COMMIT
+#
+#  3. Run
+#       autoconf
+#       ./configure
+#       make dist
+#     and check that the resulting tarball looks OK.
+#     Eg, untar it and build it, or have it reviewed.
+#
+#  3. Commit the update to VERSION
+#
+#  4. git-tag -s
+#
+#  5. git-push origin
+#
+#  6. gpg --detach-sign ../secnet-$(VERSION).tar.gz
+#
+#  7. rsync -v ../secnet-$VERSION.tar.gz* \
+#        chiark:/home/ianmdlvl/public-html/secnet/download/
+#
+#  8. write and post a release announcement