X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=Makefile.in;h=e82baf6ce07fc939ad33493f56469a300f3e0bc4;hp=f8b37af2e9a125d994bd0de4489b02dbe184f933;hb=263cda0978685f36a149deac8a32c3d382101dd3;hpb=ff05a229397c75142725f45cad191ce4a00625ce

diff --git a/Makefile.in b/Makefile.in
index f8b37af..e82baf6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.1.13
+VERSION:=0.1.18
 
 @SET_MAKE@
 
@@ -31,7 +31,15 @@ CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 
-CFLAGS:=@CFLAGS@ @DEFS@ -Wall -I$(srcdir) -I.
+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@
 
@@ -46,17 +54,19 @@ 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 \
-	process.o @LIBOBJS@
+	process.o @LIBOBJS@ \
+	hackypar.o
 
+DISTDIRS:=debian
 DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
 	NEWS NOTES README TODO \
-	alloca.c \
+	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 \
-	configure.in debian depend.sh dh.c \
+	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 \
@@ -65,16 +75,21 @@ DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
 	secnet.c secnet.h serpent.c serpent.h serpentsboxes.h \
 	snprintf.c snprintf.h \
 	sha1.c site.c slip.c stamp-h.in transform.c tun.c udp.c \
-	unaligned.h util.c util.h
+	unaligned.h util.c util.h \
+	hackypar.c hackypar.h
+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
+	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
 
 all:	$(TARGETS)
 
@@ -84,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
 
@@ -106,28 +121,35 @@ DEPENDS:=$(OBJECTS:.o=.d)
 $(DEPENDS): ${srcdir}/depend.sh
 
 %.d: %.c
-	${srcdir}/depend.sh $(srcdir) $(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
 
 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 \
@@ -140,7 +162,9 @@ pfname:=$(PACKAGE)-$(VERSION)
 dist:
 	$(RM) -rf $(pfname)
 	mkdir $(pfname)
+	for i in $(DISTDIRS) ; do mkdir $(pfname)/$$i ; done
 	for i in $(DISTFILES) ; do ln -s ../$(srcdir)/$$i $(pfname)/ ; done
-	tar hcf ../$(pfname).tar $(pfname)
+	for i in $(DISTSUBDIRS) ; do ln -s ../../$(srcdir)/$$i $(pfname)/$$i ; done
+	tar hcf ../$(pfname).tar --exclude=CVS --exclude=.cvsignore $(pfname)
 	gzip -9f ../$(pfname).tar
 	$(RM) -rf $(pfname)