2 files changed, 6 insertions, 3 deletions

diff --git a/Makefile b/Makefileindex a93710b..d4f3c91 100644--- a/Makefile+++ b/Makefile@@ -152,9 +152,12 @@ $(DOC_PDF): $(BUILDDIR)/%.pdf : %.txt 	@mkdir -p $(BUILDDIR) 	a2x -f pdf -D $(BUILDDIR) $< -# Everything generated lives under build/, so cleaning is a single remove.+# Compiled output lives under build/; the test suite writes into tests/, so+# cleaning removes both. The tests descent is guarded because tests/Makefile+# includes git's config.mak.uname, which needs the submodule present. clean: 	$(RM) -r $(BUILDDIR)+	@if test -e $(GITDIR)/config.mak.uname; then $(MAKE) -C tests clean; fi  cleanall: clean 	@if test -e $(GITDIR)/Makefile; then $(MAKE) -C $(GITDIR) clean; fi
diff --git a/Makefile b/Makefile
index a93710b..d4f3c91 100644
--- a/Makefile
+++ b/Makefile
@@ -152,9 +152,12 @@ $(DOC_PDF): $(BUILDDIR)/%.pdf : %.txt
 	@mkdir -p $(BUILDDIR)
 	a2x -f pdf -D $(BUILDDIR) $<
 
-# Everything generated lives under build/, so cleaning is a single remove.
+# Compiled output lives under build/; the test suite writes into tests/, so
+# cleaning removes both. The tests descent is guarded because tests/Makefile
+# includes git's config.mak.uname, which needs the submodule present.
 clean:
 	$(RM) -r $(BUILDDIR)
+	@if test -e $(GITDIR)/config.mak.uname; then $(MAKE) -C tests clean; fi
 
 cleanall: clean
 	@if test -e $(GITDIR)/Makefile; then $(MAKE) -C $(GITDIR) clean; fi
diff --git a/tests/Makefile b/tests/Makefileindex 38df21d..a11aa74 100644--- a/tests/Makefile+++ b/tests/Makefile@@ -12,6 +12,6 @@ $(T): 	@'$(SHELL_PATH_SQ)' $@ $(CGIT_TEST_OPTS)  clean:-	$(RM) -rf trash+	$(RM) -r 'trash directory'.* test-results -.PHONY: $(T) clean+.PHONY: all $(T) clean
diff --git a/tests/Makefile b/tests/Makefile
index 38df21d..a11aa74 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -12,6 +12,6 @@ $(T):
 	@'$(SHELL_PATH_SQ)' $@ $(CGIT_TEST_OPTS)
 
 clean:
-	$(RM) -rf trash
+	$(RM) -r 'trash directory'.* test-results
 
-.PHONY: $(T) clean
+.PHONY: all $(T) clean