build system: remove directories created by tests in "make clean"

These extra directories cause problems for building on Debian
twice in a row.

In order to remove directories, we need to us "rm -rf" instead of
"rm -f". So now we should be extra careful what we add to the
variable CLEAN.

diff --git a/Makefile.local b/Makefile.local
index 296995d364a4d0979cceb24752247b6b4f1e30d3..6d6896a353c4e2563f8936024608d3935cb7c50d 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -265,7 +265,7 @@ quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))
 
 .PHONY : clean
 clean:
 
 .PHONY : clean
 clean:

-       rm -f $(CLEAN); rm -rf .deps
+       rm -rf $(CLEAN); rm -rf .deps

 
 # We don't (yet) have any distributed files not in the upstream repository.
 # So distclean is currently identical to clean.
 
 # We don't (yet) have any distributed files not in the upstream repository.
 # So distclean is currently identical to clean.

diff --git a/test/Makefile.local b/test/Makefile.local
index 4a6a4b12e862253c3964ec203aa45734825d3f19..c7f14355aa255d3d4a196bec95d285290b166030 100644 (file)
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -31,4 +31,5 @@ check: test
 SRCS := $(SRCS) $(smtp_dummy_srcs)
 CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o \
         $(dir)/symbol-test $(dir)/symbol-test.o \
 SRCS := $(SRCS) $(smtp_dummy_srcs)
 CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o \
         $(dir)/symbol-test $(dir)/symbol-test.o \

-        $(dir)/arg-test $(dir)/arg-test.o
+        $(dir)/arg-test $(dir)/arg-test.o \
+        $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.*