@@ -1,11 +1,12 @@

 userv-utils (0.2.1) unstable; urgency=low

-  * service.c (userv ipif) /32 prefixes work properly now.
-
   * New udptunnel-reconf program for generating invoke scripts, inittab
-    entries, and the like.
+    entries, and the like, for a multi-host VPN.
+
+  * service.c (userv ipif) /32 prefixes work properly now.
+  * `make distclean' works in ipif, www-cgi and top level.

- --
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon, 11 Dec 2000 02:45:58 +0000

 userv-utils (0.2.0) unstable; urgency=low

diff --git a/Makefile b/Makefile
index df3a8b07244b07d44a48b75d89102e9b8cdf397e..f483bc42e896d1426282a050488ca93cd75544db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,14 @@ VERSION=0.2.1
 all:
        @echo >&2 'See README.  This is not a unified package.'
 
+SUBDIRS_DISTCLEAN=     www-cgi ipif
+
 distclean:
        find . \( -name '*~' -o -name '#*#' -o -name '*.o' -o -name core \
                -o -name dist_tmp -o -name userv-utils-\*.tar.gz \
                -o -name '.#*' \) \
                -print0 | xargs -0r rm -rf --
+       for f in $(SUBDIRS_DISTCLEAN); do make -C $$f distclean; done
 
 dist_tmp=dist_tmp/userv-utils-$(VERSION)
 dist_prune=\( -name CVS -o -name 'dist_tmp*' \)

diff --git a/changelog b/changelog
index 3baf0eff761a47d61aabc4cb64739b59c8beb546..5af63142ff229e7d090c4feccb8715a928429aeb 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,11 +1,12 @@
 userv-utils (0.2.1) unstable; urgency=low
 
-  * service.c (userv ipif) /32 prefixes work properly now.
-
   * New udptunnel-reconf program for generating invoke scripts, inittab
-    entries, and the like.
+    entries, and the like, for a multi-host VPN.
+
+  * service.c (userv ipif) /32 prefixes work properly now.
+  * `make distclean' works in ipif, www-cgi and top level.
 
- --
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon, 11 Dec 2000 02:45:58 +0000
 
 userv-utils (0.2.0) unstable; urgency=low
 

diff --git a/debian/changelog b/debian/changelog
index 3baf0eff761a47d61aabc4cb64739b59c8beb546..5af63142ff229e7d090c4feccb8715a928429aeb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
 userv-utils (0.2.1) unstable; urgency=low
 
-  * service.c (userv ipif) /32 prefixes work properly now.
-
   * New udptunnel-reconf program for generating invoke scripts, inittab
-    entries, and the like.
+    entries, and the like, for a multi-host VPN.
+
+  * service.c (userv ipif) /32 prefixes work properly now.
+  * `make distclean' works in ipif, www-cgi and top level.
 
- --
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon, 11 Dec 2000 02:45:58 +0000
 
 userv-utils (0.2.0) unstable; urgency=low
 

diff --git a/ipif/Makefile b/ipif/Makefile
index 6c4e7c0e59fb9abf378a96624cbd849d700b8be4..ab3db07347fcc7a56441408b84ea5de6a4a5f30e 100644 (file)
--- a/ipif/Makefile
+++ b/ipif/Makefile
@@ -90,7 +90,7 @@ automech.c:           automech.h
 clean:
                rm -f *.o core automech.[ch] *~ ./#*#
 
-realclean:             clean
+realclean distclean:   clean
                rm -f $(TARGETS)
 
 forwarder.o $(MECHOBJS) automech.o utils.o:    forwarder.h automech.h

diff --git a/ipif/Makefile-udptunnelconf b/ipif/Makefile-udptunnelconf
deleted file mode 100644 (file)
index fbaa6a9..0000000
--- a/ipif/Makefile-udptunnelconf
+++ /dev/null
@@ -1,68 +0,0 @@
-# Makefile for udptunnelconf
-
-# Copyright (C) 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
-# 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$
-
-etcdir=                /etc
-prefix=                /usr/local
-bindir=                $(prefix)/bin
-
-sharedir=      $(prefix)/share/udptunnelconf
-
-etcuserv=      $(etcdir)/userv
-services=      $(etcuserv)/services.d
-
-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)
-
-install:       all
-               mkdir -p $(libuserv) $(services)
-               cp -b service $(libuserv)/ipif
-               cp ipif $(services)/ipif:new
-               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)
-
-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 blowfishtest.o:     blowfish.h
-blowfishtest.o hex.o:                          hex.h

diff --git a/www-cgi/Makefile b/www-cgi/Makefile
index 202021ea4b92a173f4e75eef2f33bcaf804487de..1626d0d02a758aae6c85f01e03c533ed881096a2 100644 (file)
--- a/www-cgi/Makefile
+++ b/www-cgi/Makefile
@@ -30,3 +30,6 @@ ucgi:         ucgi.o ucgicommon.o
 ucgitarget:    ucgitarget.o ucgicommon.o
 
 $(OBJS):       ucgi.h
+
+clean distclean realclean:
+               rm -f $(TARGETS)