generic build fix: makefile multi-line incompatibility fix

[userv-utils.git] / ipif / Makefile

diff --git a/ipif/Makefile b/ipif/Makefile
index d7bf43fdb2ad6722cebf0ed18aa3b66a9b515721..a34a85ff0d41407b0238b3dc23f3de715ac52415 100644 (file)
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -1,4 +1,7 @@
-# Copyright (C) 1999 Ian Jackson
+# Makefile for ipif/udptunnel stuff
+
+# Copyright (C) 1999-2000,2003 Ian Jackson
+# This file is part of ipif, part of userv-utils
 #
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -16,27 +19,68 @@
 #
 # $Id$
 
-OPTIMISE=      -O2
-CFLAGS=                -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith \
-               -Wwrite-strings -g $(OPTIMISE) -D_GNU_SOURCE
+include ../settings.make
 
-etcdir=                /etc
-prefix=                /usr/local
-bindir=                $(prefix)/bin
+varlibvpn=     $(varlibuserv)/vpn
+etcvpn=                $(etcdir)/userv/vpn
 
-libdir=                $(prefix)/lib
-libuserv=      $(libdir)/userv
+PROGRAM_TARGETS=       udptunnel-forwarder udptunnel-reconf
+TARGETS=               service blowfishtest $(PROGRAM_TARGETS)
+PROGRAMS=              udptunnel $(PROGRAM_TARGETS)
 
-etcuserv=      $(etcdir)/userv
-services=      $(etcuserv)/services.d
+MECHFILES=     null pkcs5 timestamp sequence blowfish
+MECHOBJS=      $(foreach m, $(MECHFILES), mech-$m.o)
 
-TARGETS=       service
+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 $(libuserv) $(services)
+               mkdir -p $(bindir) $(libuserv) $(services) \
+                       $(varlibvpn) $(shareuserv)
                cp -b service $(libuserv)/ipif
+               cp -b $(PROGRAMS) $(bindir)/.
                cp ipif $(services)/ipif:new
-               cp -b udptunnel $(bindir)/.
                set -e; cd $(services); test -f ipif || mv ipif:new ipif
+               cp udptunnel-vpn-config.m4 udptunnel-vpn-defaults \
+                       $(shareuserv)/.
+
+install-docs:
+
+install-examples:
+               mkdir -p $(etcvpn)
+               cp *.example $(etcvpn)/.
+
+udptunnel-reconf:      udptunnel-reconf.pl Makefile
+               perl -p                                                   \
+       -e '    print "                                                 ' \
+       -e '\$$shareuserv= \"$(shareuserv)\";\n                         ' \
+       -e '\$$etcvpn= \"$(etcvpn)\";\n                                 ' \
+       -e '\$$varlibvpn= \"$(varlibvpn)\";\n" if m#^\# \@\@\@\-#;      ' \
+       -e '    $$_="" if m/^\# \@\@\@\-/ .. m/^\# \-\@\@\@/;           ' \
+                       <$< >$@.new
+               chmod +x $@.new
+               mv -f $@.new $@
+
+
+udptunnel-forwarder:   $(OBJS_FORWARD)
+               $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_FORWARD)
+
+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 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