@@ -1,10 +1,10 @@

[userv-utils.git] / ipif / Makefile

diff --git a/ipif/Makefile b/ipif/Makefile
index c2e3a7f0d727ff7eb46ac31d1484477c9530cc85..e3dac053712024bae9bba810cfbd50a7289b1ee7 100644 (file)
--- 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,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