Make targets: improve *clean, remove bin, cvs-clean and maintainerclean

* distclean was usable from any directory in theory, make it
toplevel-only and call clean, doc-clean, test-clean and log-clean
(previous behaviour can now be obtained with make clean && make
local-distclean),

* remove maintainerclean, which was a broken distclean-like, and
cvs-clean that can be substituted by some "git clean" incantation,

* remove bin, which does not work in a clean tree, and that can be
replaced by  make bin-clean && make all in an already built tree,

* update help target.

2 files changed, 11 insertions, 30 deletions

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 1fc60ba8c4..395fdd202f 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -5,9 +5,6 @@
 all:	 default
 	$(LOOP)
 
-bin:
-	$(MAKE) PACKAGE=$(PACKAGE) package=$(package) -C lily
-
 man:
 	$(LOOP)
 
@@ -33,20 +30,6 @@ dist:
 	$(MAKE) -C $(depth) dist
 endif
 
-distclean: clean
-	$(MAKE) local-distclean
-
-cvs-clean:
-	$(MAKE) local-distclean
-	rm -rf out
-	rm -rf out-www
-	rm -f configure
-
-maintainerclean:
-	$(LOOP)
-	$(MAKE)	local-maintainerclean
-	$(MAKE) local-distclean
-
 generic-help:
 	@echo "Makefile for $(PACKAGE_NAME) $(TOPLEVEL_VERSION)"
 	@echo "Usage: make ["VARIABLE=value"]... [TARGET]"
@@ -63,16 +46,17 @@ help: generic-help local-help
 	@echo "  doc-clean    clean \`out-www' directory"
 	@echo "  install      install programs and data (prefix=$(prefix))"
 	@echo "  uninstall    uninstall programs and data"
+	@echo "  test         build regression tests for the program and scripts"
 	@echo
 	@echo "  *Note: Prepend \`local-' (eg. \`local-clean') to restrict"
 	@echo "         any of the above commands to the current directory."
 	@echo
 	@echo "Other generic targets:"
 	@echo "  default      same as the empty target"
-	@echo "  bin          check the lily directory and rebuild lilypond.exe if needed"
 	@echo "  exe          update all executables"
 	@echo "  help         this help"
 	@echo "  lib          update all libraries"
+	@echo "  log-clean    remove .log files"
 	@echo "  TAGS         generate tagfiles"
 	@echo
 	@echo "\`make' may be invoked from any subdirectory that contains a GNUmakefile."
@@ -119,8 +103,6 @@ local-clean:
 
 local-distclean:
 
-local-maintainerclean:
-
 install-strip:
 	$(MAKE) INSTALLPY="$(INSTALLPY) -s" install
 
diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index bdabb19477..f26070db82 100644
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -1,16 +1,16 @@
-.PHONY: install-doc uninstall-doc
+.PHONY: install-doc uninstall-doc distclean top-doc
 install-doc:
 uninstall-doc:
 
+distclean: clean doc-clean test-clean log-clean
+	$(MAKE) local-distclean
+
 local-distclean:
-	rm -f config.hh config.make Makefile GNUmakefile \
-		config.cache config.status config.log index.html \
-		stepmake/stepmake/stepmake stepmake/stepmake/bin
+	rm -f config.hh config.make GNUmakefile \
+		config.cache config.status config.log
 	rm -rf autom4te.cache
 	rm -rf $(outdir)
 
-local-maintainerclean:
-
 GNUmakefile: GNUmakefile.in
 	$(MAKE) INFILE=$< OUTFILE=$@ -f $(stepdir)/automatically-generated.sub.make
 
@@ -35,9 +35,8 @@ endif
 local-help:
 	@echo "  config          rerun configure"
 	@echo "  dist            roll tarball: $(depth)/$(outdir)/$(distname).tar.gz"
-	@echo "  distclean       also remove configure output"
-	@echo "  cvs-clean       also remove out directories and generated files"
-	@echo "  maintainerclean also remove distributed generated files"
+	@echo "  distclean       make clean, doc-clean, test-clean, log-clean and"
+	@echo "                   also remove configure output"
 	@echo "  po              make new translation Portable Object database"
 	@echo "  po-replace      do po-update and replace catalogs with msgmerged versions"
 	@echo "  po-update       update translation Portable Object database"
@@ -56,6 +55,6 @@ local-help:
 	@echo "  test-clean"
 	@echo
 	@echo "  For more information on these targets, see"
-	@echo "    \`Testing LilyPond' in the Contributor's Guide."
+	@echo "    \`Verify regression tests' in the Contributor's Guide."
 	@echo