From: David Bremner <bremner@debian.org>
Date: Thu, 2 Aug 2012 12:27:26 +0000 (-0300)
Subject: build system: remove directories created by tests in "make clean"
X-Git-Tag: 0.14~38
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8a745d310f966194e82f12f6453f05cc877379d6;p=notmuch.git

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 296995d3..6d6896a3 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -265,7 +265,7 @@ quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))
 
 .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.
diff --git a/test/Makefile.local b/test/Makefile.local
index 4a6a4b12..c7f14355 100644
--- 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 \
-	 $(dir)/arg-test $(dir)/arg-test.o
+	 $(dir)/arg-test $(dir)/arg-test.o \
+	 $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.*