X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=blobdiff_plain;f=ipif%2FMakefile;h=a34a85ff0d41407b0238b3dc23f3de715ac52415;hp=4637bbc2646514f0f5a6428b6df1f3ea6752e43d;hb=80ebbf9e58e2c8a5980d96fd33ac68fd790ed53d;hpb=1fb3cba0b41ae774f83c11d2a9c23b12b2c87d1a

diff --git a/ipif/Makefile b/ipif/Makefile
index 4637bbc..a34a85f 100644
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -1,4 +1,7 @@
-# Copyright (C) 1999 Ian Jackson
+# Makefile for ipif/udptunnel stuff
+
+# Copyright (C) 1999-2000,2003 Ian Jackson
+# This file is part of ipif, part of userv-utils
 #
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -16,41 +19,68 @@
 #
 # $Id$
 
-OPTIMISE=	-O2
-CFLAGS=		-Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith \
-		-Wwrite-strings -g $(OPTIMISE) -D_GNU_SOURCE
-
-etcdir=		/etc
-prefix=		/usr/local
-bindir=		$(prefix)/bin
-
-libdir=		$(prefix)/lib
-libuserv=	$(libdir)/userv
+include ../settings.make
 
-etcuserv=	$(etcdir)/userv
-services=	$(etcuserv)/services.d
+varlibvpn=	$(varlibuserv)/vpn
+etcvpn=		$(etcdir)/userv/vpn
 
-TARGETS=	service udptunnel-forwarder
+PROGRAM_TARGETS=	udptunnel-forwarder udptunnel-reconf
+TARGETS=		service blowfishtest $(PROGRAM_TARGETS)
+PROGRAMS=		udptunnel $(PROGRAM_TARGETS)
 
 MECHFILES=	null pkcs5 timestamp sequence blowfish
 MECHOBJS=	$(foreach m, $(MECHFILES), mech-$m.o)
 
-OBJS_FORWARD=	forwarder.o $(MECHOBJS) blowfish.o automech.c
+OBJS_FORWARD=	forwarder.o $(MECHOBJS) blowfish.o automech.c utils.c
+OBJS_BFTEST=	blowfishtest.o blowfish.o hex.o
 
 all:		$(TARGETS)
 
 install:	all
-		mkdir -p $(libuserv) $(services)
+		mkdir -p $(bindir) $(libuserv) $(services) \
+			$(varlibvpn) $(shareuserv)
 		cp -b service $(libuserv)/ipif
+		cp -b $(PROGRAMS) $(bindir)/.
 		cp ipif $(services)/ipif:new
-		cp -b udptunnel $(bindir)/.
 		set -e; cd $(services); test -f ipif || mv ipif:new ipif
+		cp udptunnel-vpn-config.m4 udptunnel-vpn-defaults \
+			$(shareuserv)/.
+
+install-docs:
+
+install-examples:
+		mkdir -p $(etcvpn)
+		cp *.example $(etcvpn)/.
+
+udptunnel-reconf:	udptunnel-reconf.pl Makefile
+		perl -p 						  \
+	-e '	print "							' \
+	-e '\$$shareuserv= \"$(shareuserv)\";\n				' \
+	-e '\$$etcvpn= \"$(etcvpn)\";\n					' \
+	-e '\$$varlibvpn= \"$(varlibvpn)\";\n" if m#^\# \@\@\@\-#;	' \
+	-e '	$$_="" if m/^\# \@\@\@\-/ .. m/^\# \-\@\@\@/;		' \
+			<$< >$@.new
+		chmod +x $@.new
+		mv -f $@.new $@
+
 
 udptunnel-forwarder:	$(OBJS_FORWARD)
 		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_FORWARD)
 
-automech.c automech.h:		automechgen.sh Makefile
+blowfishtest:		$(OBJS_BFTEST)
+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_BFTEST)
+
+automech.h:		automechgen.sh Makefile
 		./$< $(MECHFILES)
 
-forwarder.o $(MECHOBJS) automech.o:	mech.h automech.h
-blowfish.o mech-blowfish.o:		blowfish.h
+automech.c:		automech.h
+
+clean:
+		rm -f *.o core automech.[ch] *~ ./#*#
+
+realclean distclean:	clean
+		rm -f $(TARGETS)
+
+forwarder.o $(MECHOBJS) automech.o utils.o:	forwarder.h automech.h
+blowfish.o mech-blowfish.o blowfishtest.o:	blowfish.h
+blowfishtest.o hex.o:				hex.h