X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile.in;h=e5ea84b013e9146131f97303963c1911f4ef5ac8;hb=b1a0f651d803e1c1ff50f559b50de5c2dd6236d4;hp=dd94837cd3b1eaa212c19e48e1e43bc25631c73c;hpb=18ca0b4428846396356378dfb5949bbc3839a3be;p=secnet.git

diff --git a/Makefile.in b/Makefile.in
index dd94837..e5ea84b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,15 +31,13 @@ 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
+	-Wswitch-enum -Wunused-variable -Wbad-function-cast \
+	-Wno-strict-aliasing -fno-strict-aliasing
 ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS)
 CPPFLAGS:=@CPPFLAGS@
 LDFLAGS:=@LDFLAGS@
@@ -85,7 +83,7 @@ DISTSUBDIRS:=debian/copyright debian/changelog debian/control \
 %.c:	%.y
 
 %.yy.c:	%.fl
-	flex -o$@ $<
+	flex --header=$*.yy.h -o$@ $<
 
 %.tab.c %.tab.h:	%.y
 	bison -d -o $@ $<
@@ -129,6 +127,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
 
@@ -136,7 +135,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)