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=f1e63a4b9eaeacee5d4817c7ea941dcc77ebe562;hb=0ae8e6867facf7eb8055533a642026d7c9e9cf38;hpb=f0e54a9987423f0f5939b961fa10ab4ca7a2c406

diff --git a/ipif/Makefile b/ipif/Makefile
index f1e63a4..a34a85f 100644
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -1,6 +1,7 @@
 # Makefile for ipif/udptunnel stuff
 
-# Copyright (C) 1999-2000 Ian Jackson
+# 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
@@ -18,22 +19,14 @@
 #
 # $Id$
 
-OPTIMISE=	-O2
-CFLAGS=		-Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith \
-		-Wwrite-strings -g $(OPTIMISE) -D_GNU_SOURCE
+include ../settings.make
 
-etcdir=		/etc
-prefix=		/usr/local
-bindir=		$(prefix)/bin
+varlibvpn=	$(varlibuserv)/vpn
+etcvpn=		$(etcdir)/userv/vpn
 
-libdir=		$(prefix)/lib
-libuserv=	$(libdir)/userv
-
-etcuserv=	$(etcdir)/userv
-services=	$(etcuserv)/services.d
-
-PROGRAMS=	udptunnel udptunnel-forwarder
-TARGETS=	service blowfishtest $(PROGRAMS)
+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)
@@ -44,11 +37,32 @@ 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 ipif $(services)/ipif:new
 		cp -b $(PROGRAMS) $(bindir)/.
+		cp ipif $(services)/ipif:new
 		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)
@@ -56,9 +70,17 @@ udptunnel-forwarder:	$(OBJS_FORWARD)
 blowfishtest:		$(OBJS_BFTEST)
 		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_BFTEST)
 
-automech.c automech.h:		automechgen.sh Makefile
+automech.h:		automechgen.sh Makefile
 		./$< $(MECHFILES)
 
+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