X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=Makefile.in;h=182204b4b791dfcd92453430052567b9cb203ae9;hp=30ce8f6c53ec5faa6967a54f9881041d9fd22460;hb=46008a7c3e56df88d06087d26cb9ddc197933589;hpb=27f5042b0435d26ae98b22f8e42115e44afe53bc

diff --git a/Makefile.in b/Makefile.in
index 30ce8f6..182204b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.1.18
+VERSION:=0.2.1
 
 @SET_MAKE@
 
@@ -31,25 +31,24 @@ CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 
-# Use -DHACKY_PARALLEL if you are compiling secnet for an extremely
-# slow machine
-#CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -DHACKY_PARALLEL
-CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ \
+CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
 	-W -Wno-unused \
 	-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
-ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS)
-CPPFLAGS:=@CPPFLAGS@
-LDFLAGS:=@LDFLAGS@
-LDLIBS:=@LIBS@
+	-Wswitch-enum -Wunused-variable -Wbad-function-cast \
+	-Wno-strict-aliasing -fno-strict-aliasing
+ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS) $(EXTRA_CFLAGS)
+CPPFLAGS:=@CPPFLAGS@ $(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
 
@@ -59,29 +58,6 @@ OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
 	process.o @LIBOBJS@ \
 	hackypar.o
 
-DISTDIRS:=debian
-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.in configure \
-	configure.in depend.sh dh.c \
-	example.conf \
-	getopt.c getopt1.c getopt.h \
-	install-sh ipaddr.c ipaddr.h ipaddr.py linux log.c \
-	magic.h md5.c md5.h \
-	make-secnet-sites \
-	modules.c netlink.c netlink.h process.c process.h \
-	random.c resolver.c rsa.c \
-	secnet.c secnet.h serpent.c serpent.h serpentsboxes.h \
-	snprintf.c snprintf.h \
-	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/copyright debian/changelog debian/control \
-	debian/init debian/rules debian/compat debian/default
-
 %.c:	%.y
 
 %.yy.c:	%.fl
@@ -141,11 +117,15 @@ version.c: Makefile
 	echo "char version[]=\"secnet $(VERSION)\";" >>$@.new
 	mv -f $@.new $@
 
-install: all
+installdirs:
 	$(INSTALL) -d $(prefix)/share/secnet $(sbindir)
+	$(INSTALL) -d $(mandir)/man8
+
+install: installdirs
 	$(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
 
 clean:
 	$(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c
@@ -159,12 +139,47 @@ realclean:	clean
 distclean:	realclean
 
 pfname:=$(PACKAGE)-$(VERSION)
+tarfname:=../$(pfname).tar
 dist:
-	$(RM) -rf $(pfname)
-	mkdir $(pfname)
-	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)
-	gzip -9f ../$(pfname).tar
-	$(RM) -rf $(pfname)
+	$(RM) -rf $(tarfname) $(tarfname).gz
+	git archive --format=tar --prefix=$(pfname)/ HEAD -o $(tarfname)
+	gzip -9f $(tarfname)
+
+# Release checklist:
+#  1. Check that the tree has what you want
+#
+#  2. Update VERSION (above) and debian/changelog
+#     but DO NOT COMMIT
+#
+#  3. Run
+#       ./configure
+#       make dist
+#     and check that the resulting tarball looks OK.
+#     Eg, untar it and build it, or have it reviewed.
+#
+#  3. Commit the updates to VERSION (above) and debian/changelog
+#
+#  4. git-tag -s v$(VERSION)
+#
+#  5. git-push origin
+#
+#  6. Run, again,
+#       make dist
+#
+#  7. gpg --detach-sign ../secnet-$(VERSION).tar.gz
+#
+#  8. rsync -v ../secnet-$VERSION.tar.gz* \
+#        chiark:/home/ianmdlvl/public-html/secnet/download/
+#
+#  9. On chiark:
+#       tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$(VERSION).tar.gz
+#       cd secnet-$(VERSION)
+#       debian/rules build
+#       fakeroot debian/rules binary
+#       mv ../secnet_0.1.18.1-1_i386.deb ~/public-html/secnet/download/
+#
+#  10. On chiark as user secnet:
+#       cd ~secnet/
+#       rsync ~ianmdlvl/public-html/secnet/download/secnet* .
+#
+#  11. write and post a release announcement