X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/blobdiff_plain/f9e59051127e72847e1bee84ad52670e875f7d2f..7729298ad653ba4e0b10bacc9f27d210b4eaf4e7:/ipif/Makefile

diff --git a/ipif/Makefile b/ipif/Makefile
index 122a72e..e3dac05 100644
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -1,4 +1,6 @@
-# Copyright (C) 1999 Ian Jackson
+# Makefile for ipif/udptunnel stuff
+
+# Copyright (C) 1999-2000 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
@@ -18,7 +20,8 @@
 
 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
@@ -30,12 +33,15 @@ libuserv=	$(libdir)/userv
 etcuserv=	$(etcdir)/userv
 services=	$(etcuserv)/services.d
 
-TARGETS=	service udptunnel-forwarder
+PROGRAM_TARGETS=	udptunnel-forwarder
+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 utils.c
+OBJS_BFTEST=	blowfishtest.o blowfish.o hex.o
 
 all:		$(TARGETS)
 
@@ -43,14 +49,26 @@ install:	all
 		mkdir -p $(libuserv) $(services)
 		cp -b service $(libuserv)/ipif
 		cp ipif $(services)/ipif:new
-		cp -b udptunnel $(bindir)/.
+		cp -b $(PROGRAMS) $(bindir)/.
 		set -e; cd $(services); test -f ipif || mv ipif:new ipif
 
 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)
 
+automech.c:		automech.h
+
+clean:
+		rm -f *.o core automech.[ch] *~ ./#*#
+
+realclean:		clean
+		rm -f $(TARGETS)
+
 forwarder.o $(MECHOBJS) automech.o utils.o:	forwarder.h automech.h
-blowfish.o mech-blowfish.o:			blowfish.h
+blowfish.o mech-blowfish.o blowfishtest.o:	blowfish.h
+blowfishtest.o hex.o:				hex.h