From df805c547ef02b6fc13c6bc1be562ad20d7f9d42 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 14 Dec 2006 16:25:48 +0100
Subject: [PATCH] rigorous cleaning: do rm -rf "$(outdir)".

This fixes problems with too large outdirs, and obviates
complex rm -rF outdir/subdir hacks.

Conflicts:

	Documentation/user/GNUmakefile
---
 Documentation/user/GNUmakefile         | 19 ++-----------------
 GNUmakefile.in                         | 10 ----------
 input/regression/GNUmakefile           |  6 ------
 stepmake/stepmake/generic-targets.make |  7 +++----
 4 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index bab2506309..3377634f8f 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -192,13 +192,13 @@ $(outdir)/lilypond-internals/lilypond-internals.xml: $(outdir)/lilypond-internal
 $(outdir)/lilypond.pdf: $(OUT_PDF_IMAGES) $(OUT_PNG_IMAGES)
 
 $(outdir)/%.png: %.png
-	convert -geometry 50x50% $< $@
+	convert -depth 8 -geometry 50x50% $< $@
 
 $(outdir)/%.png: %.eps
 	gs -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=$@ -sDEVICE=png16m -dEPSCrop -dNOPAUSE -f $< -c quit
 
 $(outdir)/%.pdf: %.png
-	convert $< $@
+	convert -depth 8 $< $@
 
 $(outdir)/%.pdf: %.eps
 	gs -dAutoRotatePages=/None -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -sOutputFile=$@ -dEPSCrop -c .setpdfwrite -f $<
@@ -227,11 +227,6 @@ $(outdir)/music-glossary/source:
 local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\
  $(datafiles) $(PDF_FILES) $(source-links) info info-dir
 
-local-WWW-clean: deep-WWW-clean
-
-deep-WWW-clean:
-	rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
-
 info-dir:
 	$(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals music-glossary
 
@@ -239,9 +234,6 @@ info-dir:
 $(outdir)/%.bib: %.bib
 	ln -f $< $@
 
-local-clean:
-	rm -f fonts.aux fonts.log feta*.tfm feta*.*pk
-	rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals $(outdir)/music-glossary
 
 # lilypond.texi deps
 $(top-build-dir)/mf/$(outconfbase)/feta16list.ly:
@@ -268,10 +260,3 @@ $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(LILYPOND_
 ## unused
 $(outdir)/interfaces.itexi: dummy
 	cd $(outdir) && lilypond $(top-src-dir)/ly/generate-interface-doc
-
-
-local-clean: local-delete
-
-local-delete:
-	find $(outdir)/ -name 'lily-[0-9]*' | xargs rm -f
-	-rm -f $(outdir)/*
diff --git a/GNUmakefile.in b/GNUmakefile.in
index e836894609..7f3dee575f 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -209,16 +209,6 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
 TAGS.make: dummy
 	etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make')
 
-local-clean: build-dir-setup-clean local-web-clean
-
-local-web-clean:
-	rm -rf $(outdir)/web-root/
-
-
-
-build-dir-setup-clean:
-	cd $(top-build-dir) && rm -rf share
-
 $(config_h): config.hh.in
 #
 # this is to prevent people from getting
diff --git a/input/regression/GNUmakefile b/input/regression/GNUmakefile
index 15b634bccf..df3a19a13b 100644
--- a/input/regression/GNUmakefile
+++ b/input/regression/GNUmakefile
@@ -6,9 +6,3 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
 include $(depth)/make/stepmake.make
 TITLE=LilyPond Regression Tests
 
-local-clean: local-delete
-
-# use `find` together with `xargs` to avoid too long argument-lists.
-local-delete:
-	$(FIND) $(outdir)/ -empty -name '*' | xargs rm -f
-
diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 26874ad5b5..7546bbd2b5 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -7,9 +7,8 @@ all:	 default
 man:
 	$(LOOP)
 
-# be careful about deletion.
 clean: local-clean
-	-rm -f $(outdir)/*
+	-rm -rf "./$(outdir)"
 	$(LOOP)
 
 ifneq ($(strip $(depth)),.)
@@ -23,8 +22,8 @@ distclean: clean
 
 cvs-clean:
 	$(MAKE) local-distclean
-	find . -type d -name out | xargs rm -rf
-	find . -type d -name out-www | xargs rm -rf
+	rm -rf out
+	rm -rf out-www
 	rm -f aclocal.m4 configure
 
 maintainerclean:
-- 
2.39.5