X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=blobdiff_plain;f=Makefile;h=eecb31a61cca318a08c7276ebe6cc3133fd5bdfa;hp=2f0b156798826d52cc57618ac9264469b0f737e9;hb=0a60770be3cbdc7ac5537e4dba555ba809f113f7;hpb=4268f152508c2cbfd0fa4b3165317a3c31ad7df1

diff --git a/Makefile b/Makefile
index 2f0b156..eecb31a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1999 Ian Jackson
+# Copyright (C) 2000,2003 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
@@ -16,23 +16,28 @@
 #
 # $Id$
 
-VERSION=0.1
+VERSION=0.2.99.0.1
 
 all:
-	echo >&2 'See README.  This is not a unified package.'
+	@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 \
-		-print0 | xargs -0r rm --
+	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*' \)
 dist:			distclean
 	rm -rf dist_tmp*
 	mkdir dist_tmp $(dist_tmp)
-	find . -name dist_tmp -prune -o -type d -print | \
+	find . $(dist_prune) -prune -o -type d -print | \
 		sed -e 's#.*#mkdir -p $(dist_tmp)/&#' | sh
-	find . -name dist_tmp -prune -o -type f -print | \
+	find . $(dist_prune) -prune -o -type f -print | \
 		sed -e 's#.*#ln & $(dist_tmp)/&#' | sh
 	cd dist_tmp && tar cf ../$(dist_tmp).tar `basename $(dist_tmp)`
 	gzip -9 $(dist_tmp).tar