X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/blobdiff_plain/f0e54a9987423f0f5939b961fa10ab4ca7a2c406..c62ccbd5747bc841fd181e53b896647b73108c9e:/ipif/Makefile

diff --git a/ipif/Makefile b/ipif/Makefile
index f1e63a4..ab3db07 100644
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -20,20 +20,29 @@
 
 OPTIMISE=	-O2
 CFLAGS=		-Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith \
-		-Wwrite-strings -g $(OPTIMISE) -D_GNU_SOURCE
+		-Wwrite-strings -g $(OPTIMISE) -D_GNU_SOURCE \
+		$(XCFLAGS)
 
 etcdir=		/etc
 prefix=		/usr/local
 bindir=		$(prefix)/bin
+vardir=		/var
 
 libdir=		$(prefix)/lib
+sharedir=	$(prefix)/share
 libuserv=	$(libdir)/userv
+shareuserv=	$(sharedir)/userv
+varlib=		$(vardir)/lib
+varlibuserv=	$(varlib)/userv
+varlibvpn=	$(varlibuserv)/vpn
 
 etcuserv=	$(etcdir)/userv
+etcvpn=		$(etcdir)/userv/vpn
 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 +53,28 @@ OBJS_BFTEST=	blowfishtest.o blowfish.o hex.o
 all:		$(TARGETS)
 
 install:	all
-		mkdir -p $(libuserv) $(services)
+		mkdir -p $(libuserv) $(services) $(etcvpn) \
+			$(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 *.example $(etcvpn)/.
+		cp udptunnel-vpn-config.m4 udptunnel-vpn-defaults \
+			$(shareuserv)/.
+
+udptunnel-reconf:	udptunnel-reconf.pl Makefile
+		perl -pe '	\
+	print "\
+\$$shareuserv= \"$(shareuserv)\";\n\
+\$$etcvpn= \"$(etcvpn)\";\n\
+\$$varlibvpn= \"$(varlibvpn)\";\n" if m#^\# \@\@\@\-#;	\
+	$$_="" if m/^\# \@\@\@\-/ .. m/^\# \-\@\@\@/;	\
+		'	\
+			<$< >$@.new
+		chmod +x $@.new
+		mv -f $@.new $@
+
 
 udptunnel-forwarder:	$(OBJS_FORWARD)
 		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_FORWARD)
@@ -56,9 +82,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