X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=Makefile.in;h=85a770b34ed9f4bf9ec71ec85f06621b75b26a06;hp=a7d9df8175c06a8bf9059ca314b3a8666730dba7;hb=refs%2Ftags%2Fv0.1.6;hpb=5963521296680c2aeb40baeb72459dffc14cd996

diff --git a/Makefile.in b/Makefile.in
index a7d9df8..85a770b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:	all clean realclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.07
+VERSION:=0.1.6
 
 @SET_MAKE@
 
@@ -31,7 +31,7 @@ CC:=@CC@
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@
 
-CFLAGS:=@CFLAGS@ @DEFS@ -Wall -I.
+CFLAGS:=@CFLAGS@ @DEFS@ -Wall -I$(srcdir) -I.
 LDFLAGS:=@LDFLAGS@
 LDLIBS:=@LIBS@
 
@@ -45,15 +45,21 @@ 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
-
-DISTFILES:=COPYING INSTALL Makefile.in NOTES README TODO conffile.c \
-	conffile.fl conffile.h conffile.y conffile_internal.h config.h.bot \
-	config.h.in config.h.top configure configure.in dh.c \
-	example-sites-file example.conf install.sh linux md5.c md5.h \
-	modules.c modules.h netlink.c random.c resolver.c rsa.c \
+	serpent.o md5.o version.o tun.o slip.o sha1.o ipaddr.o log.o \
+	process.o
+
+DISTFILES:=COPYING CREDITS INSTALL Makefile.in NOTES README TODO \
+	conffile.c conffile.fl conffile.h conffile.y \
+	conffile_internal.h config.h.bot \
+	config.h.in config.h.top configure \
+	configure.in debian dh.c \
+	example-sites-file example.conf make-secnet-sites.py \
+	install.sh ipaddr.c ipaddr.h ipaddr.py linux log.c md5.c md5.h \
+	modules.c netlink.c netlink.h process.c process.h \
+	random.c resolver.c rsa.c \
 	secnet.c secnet.h serpent.c serpent.h serpentsboxes.h \
-	site.c transform.c udp.c unaligned.h util.c util.h
+	sha1.c site.c slip.c stamp-h.in transform.c tun.c udp.c \
+	unaligned.h util.c util.h
 
 %.c:	%.y
 
@@ -61,28 +67,45 @@ DISTFILES:=COPYING INSTALL Makefile.in NOTES README TODO conffile.c \
 	flex -o$@ $<
 
 %.tab.c:	%.y
-	bison -d $<
+	bison -d -o $@ $<
 
 
 all:	$(TARGETS)
 
+# Automatic remaking of configuration files, from autoconf documentation
+${srcdir}/configure: configure.in
+	cd ${srcdir} && autoconf
+
+# 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
+	cd ${srcdir} && autoheader
+	echo timestamp > ${srcdir}/stamp-h.in
+
+config.h: stamp-h
+stamp-h: config.h.in config.status
+	./config.status
+
 Makefile: Makefile.in config.status
-	$(SHELL) config.status
+	./config.status
 
 config.status: configure
-	$(srcdir)/configure --no-create
-
-config.h: config.h.in config.status
-	$(SHELL) config.status
+	./config.status --recheck
+# End of config file remaking rules
 
+# Manual dependencies section - XXX use autodep eventually
 $(OBJECTS): config.h secnet.h util.h
 conffile.o conffile.tab.o conffile.yy.o: conffile.h conffile_internal.h
 secnet.c: conffile.h
 md5.o: md5.h
 serpent.o transform.o: serpent.h
 serpent.o: serpentsboxes.h
-conffile.o: modules.h
+conffile.o: ipaddr.h
 site.c util.c: unaligned.h
+conffile.yy.c:	conffile.fl conffile.tab.c
+conffile.tab.c:	conffile.y
+netlink.o tun.o slip.o: netlink.h
+# End of manual dependencies section
 
 secnet:	$(OBJECTS)
 
@@ -90,25 +113,21 @@ version.c: Makefile
 	echo "char version[]=\"secnet-$(VERSION)\";" >version.c
 
 install: all
-	$(INSTALL_PROGRAM) secnet $(sbindir)/`echo secnet|sed '$(transform)'`
+	$(INSTALL_PROGRAM) -D secnet $(sbindir)/`echo secnet|sed '$(transform)'`
 
 clean:
-	$(RM) -f $(srcdir)/*.o $(srcdir)/*~ $(srcdir)/*.yy.c \
-		$(srcdir)/*.tab.[ch]
+	$(RM) -f *.o *.yy.c *.tab.[ch] $(TARGETS) core version.c
 
 realclean:	clean
-	$(RM) -f $(TARGETS) $(srcdir)/Makefile $(srcdir)/config.h \
-	$(srcdir)/config.log $(srcdir)/config.status $(srcdir)/config.cache \
-	$(srcdir)/Makefile.bak core
+	$(RM) -f *~ Makefile config.h \
+	config.log config.status config.cache \
+	stamp-h Makefile.bak
 
 pfname:=$(PACKAGE)-$(VERSION)
 dist:
 	$(RM) -rf $(pfname)
 	mkdir $(pfname)
-	for i in $(DISTFILES) ; do ln -s ../$$i $(pfname)/ ; done
+	for i in $(DISTFILES) ; do ln -s ../$(srcdir)/$$i $(pfname)/ ; done
 	tar hcf ../$(pfname).tar $(pfname)
 	gzip -9f ../$(pfname).tar
 	$(RM) -rf $(pfname)
-
-conffile.yy.c:	conffile.fl conffile.tab.c
-conffile.tab.c:	conffile.y