cleanup: Style improvement to python literals in make-secnet-sites

[secnet.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 0158a7c244eca6e02c02320ba257eb41eb79535a..e82baf6ce07fc939ad33493f56469a300f3e0bc4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,10 +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 \
+       -Wno-strict-aliasing -fno-strict-aliasing
 ALL_CFLAGS:=@DEFS@ -I$(srcdir) -I. $(CFLAGS)
 CPPFLAGS:=@CPPFLAGS@
 LDFLAGS:=@LDFLAGS@
@@ -57,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.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 \
@@ -80,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 $@ $<
@@ -124,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
 
@@ -131,16 +135,21 @@ 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
+installdirs:
        $(INSTALL) -d $(prefix)/share/secnet $(sbindir)
+
+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
 
 clean:
        $(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c
+       $(RM) -f *.d *~
 
 realclean:     clean
        $(RM) -f *~ Makefile config.h  *.d \