X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/blobdiff_plain/8bb9d875e22b456711478e9d9972d458e8eb0d48..0fe65164e3f6f9ae58e4912dcc19f7e0ab3c41a6:/ipif/Makefile

diff --git a/ipif/Makefile b/ipif/Makefile
index 3f3a006..820ad9a 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
@@ -14,11 +16,12 @@
 # along with userv-utils; if not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: Makefile,v 1.12 2000/05/31 00:58:53 ian Exp $
+# $Id: Makefile,v 1.14 2000/06/07 00:59:31 ian Exp $
 
 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,7 +33,9 @@ libuserv=	$(libdir)/userv
 etcuserv=	$(etcdir)/userv
 services=	$(etcuserv)/services.d
 
-TARGETS=	service udptunnel-forwarder blowfishtest
+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)
@@ -44,7 +49,7 @@ 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)
@@ -53,9 +58,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:		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