X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=inline;f=ipif%2FMakefile;h=c2e3a7f0d727ff7eb46ac31d1484477c9530cc85;hb=ed509ebded419ce594b9c6a6942cf41033a7a16b;hp=c8f66734e384f19e05d955de86e16bd756107a10;hpb=6d90651a47ba02af64dcef776eab88a5db24e979;p=userv-utils.git

diff --git a/ipif/Makefile b/ipif/Makefile
index c8f6673..c2e3a7f 100644
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -1,18 +1,61 @@
+# Copyright (C) 1999 Ian Jackson
 #
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with userv-utils; if not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# $Id$
 
+OPTIMISE=	-O2
 CFLAGS=		-Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith \
-		-Wwrite-strings -g -D_GNU_SOURCE
+		-Wwrite-strings -g $(OPTIMISE) -D_GNU_SOURCE
 
-etc=		/etc
+etcdir=		/etc
 prefix=		/usr/local
-libipif=	$(prefix)/lib/userv-ipif
-etcipif=	$(etc)/userv/ipif
+bindir=		$(prefix)/bin
+
+libdir=		$(prefix)/lib
+libuserv=	$(libdir)/userv
+
+etcuserv=	$(etcdir)/userv
+services=	$(etcuserv)/services.d
+
+TARGETS=	service udptunnel-forwarder blowfishtest
 
-TARGETS=	service
+MECHFILES=	null pkcs5 timestamp sequence blowfish
+MECHOBJS=	$(foreach m, $(MECHFILES), mech-$m.o)
+
+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 $(libipif) $(etcipif)
-		cp service alloc.pl $(libdir)/.
-		touch $(etcipif)/networks
+		mkdir -p $(libuserv) $(services)
+		cp -b service $(libuserv)/ipif
+		cp ipif $(services)/ipif:new
+		cp -b udptunnel $(bindir)/.
+		set -e; cd $(services); test -f ipif || mv ipif:new ipif
+
+udptunnel-forwarder:	$(OBJS_FORWARD)
+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_FORWARD)
+
+blowfishtest:		$(OBJS_BFTEST)
+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_BFTEST)
+
+automech.c automech.h:		automechgen.sh Makefile
+		./$< $(MECHFILES)
+
+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