X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Dir.sd.mk;h=d65cc92e55963d8388ed00244c2e8ab928c1c600;hb=48806d6368c45ec463e11c4dfdb3eaa309554453;hp=7671a38b11f5130b4a10429c877c2ba7ec5fbfd4;hpb=bf60f6943fca67ea86acdcb12db34e74fe43175c;p=secnet.git

diff --git a/Dir.sd.mk b/Dir.sd.mk
index 7671a38..d65cc92 100644
--- a/Dir.sd.mk
+++ b/Dir.sd.mk
@@ -20,7 +20,7 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION=0.6.0
+VERSION=0.6.1
 
 VPATH:=@srcdir@
 srcdir:=@srcdir@
@@ -78,6 +78,12 @@ STALE_PYTHON_FILES=	$(foreach e, py pyc, \
 %.yy.c %.yy.h:	%.fl
 	flex --header=$*.yy.h -o$*.yy.c $<
 
+%.c: %.y
+# make has a builtin rule to run yacc, but we don't want that because
+# our conffile.c is handwritten, and we use conffile.yy.c for the
+# bison output.  There is no need to do likewise for flex because
+# our flex input files are end in .fl, not .l.
+
 %.tab.c %.tab.h:	%.y
 	bison -d -o $@ $<
 
@@ -129,17 +135,6 @@ TESTDIRS=stest mtest
 &TARGETS_fullcheck += msgcode-test.confirm
 
 RECHECK_RM += $(&TARGETS_check)
-RECHECK_RM += $(addsuffix /d-*, $(TESTDIRS));
-# Really the eval below should come very late, so that subdirs can add
-# their stuff to RECHECK_RM, but we do not have a way to do that with
-# subdirmk yet.  So we embed ad-hoc knowledge about TESTDIRS.
-
-# This contrives to delete things before make starts, if the user
-# said "recheck".  The alternative is having recheck be a target
-# which contains the rm's and then runs $(MAKE) again but then
-# we recursively re-enter make in parallel, which is Bad.
-$(eval $(if $(filter recheck,$(MAKECMDGOALS)), \
-	$(shell set -x; rm -rf $(RECHECK_RM) )))
 
 recheck: check