X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=Makefile.in;h=68b7b7b01f3e94a66be186c298de67bcb207c7e2;hp=60e63cd936458c3c6328c171a1a704fb80b22f60;hb=78d458950e6cec7e8fce890362e54e4e9ba5c635;hpb=3b83c93292fbf6c4e859ce513bdf54ad90733f96

diff --git a/Makefile.in b/Makefile.in
index 60e63cd..68b7b7b 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
 
 @SET_MAKE@
 
@@ -31,11 +31,15 @@ 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 \
+	-Wno-strict-aliasing -fno-strict-aliasing
 ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS)
+CPPFLAGS:=@CPPFLAGS@
 LDFLAGS:=@LDFLAGS@
 LDLIBS:=@LIBS@
 
@@ -56,13 +60,13 @@ OBJECTS:=secnet.o util.o conffile.yy.o conffile.tab.o conffile.o modules.o \
 DISTDIRS:=debian
 DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
 	NEWS NOTES README TODO \
+	setup.mac uk.org.greenend.secnet.plist README.mac \
 	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 \
 	install-sh ipaddr.c ipaddr.h ipaddr.py linux log.c \
 	magic.h md5.c md5.h \
 	make-secnet-sites \
@@ -73,15 +77,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$@ $<
+	flex --header=$*.yy.h -o$@ $<
 
-%.tab.c:	%.y
+%.tab.c %.tab.h:	%.y
 	bison -d -o $@ $<
 
 %.o: %.c
@@ -95,7 +99,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,12 +121,13 @@ 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)
 
 # 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
 
@@ -130,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)
@@ -140,6 +147,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 \