From 1b422cf874d49b57785b30483232fdf66973df1d Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mattia@mapreri.org>
Date: Wed, 17 Jun 2015 20:32:19 +0000
Subject: do real cleanup, don't hide temporary files under .gitignore, rather
 teach makefiles' clean targets how to deal with them properly

---
 .gitignore                        | 10 ----------
 Documentation/.gitignore          |  6 ------
 Documentation/Makefile            | 17 ++++++++++++++---
 Documentation/debconf7/.gitignore | 11 -----------
 Documentation/debconf7/Makefile   |  2 +-
 Makefile                          |  6 ++++--
 6 files changed, 19 insertions(+), 33 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 Documentation/.gitignore
 delete mode 100644 Documentation/debconf7/.gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 39c175e..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-*~
-/Documentation/pbuilder-doc.html.tmp
-/build-stamp
-/configure-stamp
-/debian/*.debhelper
-/debian/*.debhelper.log
-/debian/*.substvars
-/debian/files
-/debian/pbuilder/
-/debian/pbuilder-uml/
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
deleted file mode 100644
index 2455de1..0000000
--- a/Documentation/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/pbuilder-doc.de.html
-/pbuilder-doc.fr.html
-/pbuilder-doc.html
-/pbuilder-doc.ja.html
-/pbuilder-doc.ja.xml
-/pbuilder-doc.pdf
diff --git a/Documentation/Makefile b/Documentation/Makefile
index ec11398..69812f7 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -39,8 +39,19 @@ preview: pbuilder-doc.html
 release: pbuilder-doc.html pbuilder-doc.xml pbuilder-doc.css pbuilder-doc.xsl pbuilder-doc.pdf
 	scp $^ ${ALIOTH_FILEHOSTING}:/home/groups/pbuilder/htdocs/ 
 
-clean: 
-	rm -f pbuilder-doc.pdf pbuilder-doc.glo pbuilder-doc.idx pbuilder-doc.log pbuilder-doc.out \
-		pbuilder-doc.aux pbuilder-doc.html.tmp
+clean:
+	rm -fv \
+		pbuilder-doc.pdf \
+		pbuilder-doc.glo \
+		pbuilder-doc.idx \
+		pbuilder-doc.log \
+		pbuilder-doc.out \
+		pbuilder-doc.aux \
+		pbuilder-doc.html \
+		pbuilder-doc.de.html \
+		pbuilder-doc.fr.html \
+		pbuilder-doc.ja.html \
+		pbuilder-doc.html.tmp
+	$(MAKE) -C debconf7 $@
 
 .PHONY: preview release-netfort release clean
diff --git a/Documentation/debconf7/.gitignore b/Documentation/debconf7/.gitignore
deleted file mode 100644
index 20fbbc0..0000000
--- a/Documentation/debconf7/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/pbuilder-presentation.aux
-/pbuilder-presentation.dvi
-/pbuilder-presentation.log
-/pbuilder-presentation.nav
-/pbuilder-presentation.out
-/pbuilder-presentation.pdf
-/pbuilder-presentation.snm
-/pbuilder-presentation.toc
-/pbuilder.aux
-/pbuilder.log
-/pbuilder.pdf
diff --git a/Documentation/debconf7/Makefile b/Documentation/debconf7/Makefile
index 702fbf9..a09b6ac 100644
--- a/Documentation/debconf7/Makefile
+++ b/Documentation/debconf7/Makefile
@@ -13,4 +13,4 @@ all: $(PDFFILES)
 	latex $<
 
 clean:
-	-rm *~ *.log *.aux *.snm *.toc *.out *.nav *.dvi
+	rm -fv *~ *.log *.aux *.snm *.toc *.out *.nav *.dvi *.pdf *.pdf
diff --git a/Makefile b/Makefile
index 170f78d..e077af2 100644
--- a/Makefile
+++ b/Makefile
@@ -190,8 +190,10 @@ full-check:
 
 clean:
 	rm -f *.bak *~ TAGS
-	rm -f testsuite/testimage
-	rm -rf testsuite/testbuild testsuite/testbuild2
+	rm -rfv testsuite/testimage \
+		testsuite/testbuild \
+		testsuite/testbuild2 \
+		testsuite/regression/work
 	$(MAKE) -C pbuildd $@
 	$(MAKE) -C Documentation $@
 
-- 
cgit v1.2.3