X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile.in;h=30ce8f6c53ec5faa6967a54f9881041d9fd22460;hb=bb9d056157e37451ec14800d5914733a625f1901;hp=43df9ebe433c2fdfc07fde0ef7cfaf474bbca697;hpb=1dadd8bef541cc52645ccae6b1528a7eb709e7a8;p=secnet.git

diff --git a/Makefile.in b/Makefile.in
index 43df9eb..30ce8f6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.1.17
+VERSION:=0.1.18
 
 @SET_MAKE@
 
@@ -34,7 +34,12 @@ 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@ \
+	-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@
@@ -74,13 +79,13 @@ 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$@ $<
+	flex --header=$*.yy.h -o$@ $<
 
 %.tab.c %.tab.h:	%.y
 	bison -d -o $@ $<
@@ -124,6 +129,7 @@ $(DEPENDS): ${srcdir}/depend.sh
 
 # Manual dependencies section
 conffile.yy.c:	conffile.fl conffile.tab.c
+conffile.yy.h:	conffile.yy.c
 conffile.tab.c:	conffile.y
 # End of manual dependencies section
 
@@ -131,7 +137,9 @@ secnet:	$(OBJECTS)
 	$(CC) $(LDFLAGS) $(ALL_CFLAGS) -o $@ $(OBJECTS) $(LDLIBS)
 
 version.c: Makefile
-	echo "char version[]=\"secnet $(VERSION)\";" >version.c
+	echo "#include \"secnet.h\"" >$@.new
+	echo "char version[]=\"secnet $(VERSION)\";" >>$@.new
+	mv -f $@.new $@
 
 install: all
 	$(INSTALL) -d $(prefix)/share/secnet $(sbindir)
@@ -141,6 +149,7 @@ install: all
 
 clean:
 	$(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c
+	$(RM) -f *.d *~
 
 realclean:	clean
 	$(RM) -f *~ Makefile config.h  *.d \