X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/66ee7152813621a0fea6a305c8e3d33aafe2cb8f..b4a26b17a38c3dd1cc6e086a17649b94b0ab8e37:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7472752..d4d3815 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@
 
@@ -38,10 +38,10 @@ CFLAGS:=-Wall @WRITESTRINGS@ @CFLAGS@ -Werror \
 	-Wpointer-arith -Wformat=2 -Winit-self \
 	-Wswitch-enum -Wunused-variable -Wbad-function-cast \
 	-Wno-strict-aliasing -fno-strict-aliasing
-ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS)
-CPPFLAGS:=@CPPFLAGS@
-LDFLAGS:=@LDFLAGS@
-LDLIBS:=@LIBS@
+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@
@@ -54,7 +54,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.o netlink.o rsa.o dh.o \
-	serpent.o md5.o version.o tun.o slip.o sha1.o ipaddr.o log.o \
+	serpentbe.o md5.o version.o tun.o slip.o sha1.o ipaddr.o log.o \
 	process.o @LIBOBJS@ \
 	hackypar.o
 
@@ -163,20 +163,23 @@ dist:
 #
 #  5. git-push origin
 #
-#  6. gpg --detach-sign ../secnet-$(VERSION).tar.gz
+#  6. Run, again,
+#       make dist
+#
+#  7. gpg --detach-sign ../secnet-$(VERSION).tar.gz
 #
-#  7. rsync -v ../secnet-$VERSION.tar.gz* \
+#  8. rsync -v ../secnet-$VERSION.tar.gz* \
 #        chiark:/home/ianmdlvl/public-html/secnet/download/
 #
-#  8. On chiark:
+#  9. On chiark:
 #       tar zxf ~ianmdlvl/public-html/secnet/download/secnet-$(VERSION).tar.gz
 #       cd secnet-$(VERSION)
 #       debian/rules build
 #       fakeroot debian/rules binary
-#       cp ../secnet_0.1.18.1-1_i386.deb ~/public-html/secnet/download/
+#       mv ../secnet_0.1.18.1-1_i386.deb ~/public-html/secnet/download/
 #
-#  9. On chiark as user secnet:
+#  10. On chiark as user secnet:
 #       cd ~secnet/
 #       rsync ~ianmdlvl/public-html/secnet/download/secnet* .
 #
-#  9. write and post a release announcement
+#  11. write and post a release announcement