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

diff --git a/Makefile.in b/Makefile.in
index f53957e..f8b37af 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,10 +15,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-.PHONY:	all clean realclean dist install
+.PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.1.4
+VERSION:=0.1.13
 
 @SET_MAKE@
 
@@ -45,18 +45,25 @@ 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
+	serpent.o md5.o version.o tun.o slip.o sha1.o ipaddr.o log.o \
+	process.o @LIBOBJS@
 
-DISTFILES:=COPYING CREDITS INSTALL Makefile.in NOTES README TODO \
+DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
+	NEWS NOTES README TODO \
+	alloca.c \
 	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.py linux md5.c md5.h \
-	modules.c modules.h netlink.c netlink.h \
+	configure.in debian 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 \
+	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 \
+	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
 
@@ -92,18 +99,20 @@ config.status: configure
 	./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
-site.c util.c: unaligned.h
+# C and header file dependency rules
+SOURCES:=$(OBJECTS:.o=.c)
+DEPENDS:=$(OBJECTS:.o=.d)
+
+$(DEPENDS): ${srcdir}/depend.sh
+
+%.d: %.c
+	${srcdir}/depend.sh $(srcdir) $(CFLAGS) $< > $@
+
+-include $(DEPENDS)
+
+# Manual dependencies section
 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)
@@ -112,16 +121,21 @@ version.c: Makefile
 	echo "char version[]=\"secnet-$(VERSION)\";" >version.c
 
 install: all
-	$(INSTALL_PROGRAM) -D secnet $(sbindir)/`echo secnet|sed '$(transform)'`
+	$(INSTALL) -d $(prefix)/share/secnet $(sbindir)
+	$(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
 
 realclean:	clean
-	$(RM) -f *~ Makefile config.h \
+	$(RM) -f *~ Makefile config.h  *.d \
 	config.log config.status config.cache \
 	stamp-h Makefile.bak
 
+distclean:	realclean
+
 pfname:=$(PACKAGE)-$(VERSION)
 dist:
 	$(RM) -rf $(pfname)