X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Ftoplevel-targets.make;h=d2748a97a3280e2e16ea575485ba9b2c40b2fe11;hb=4fec19bb131b237b533018c863b89bcca5ab0eb4;hp=a9f8909fa6a53ad48856873c980d2584e98dae24;hpb=38d7d319eabc906e82fb42002678c6d42a23b6f7;p=lilypond.git

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index a9f8909fa6..d2748a97a3 100644
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -1,6 +1,6 @@
-.PHONY: web-install
-web-install:
-web-uninstall:
+.PHONY: install-doc uninstall-doc
+install-doc:
+uninstall-doc:
 
 local-dist: configure
 
@@ -9,9 +9,9 @@ local-distclean:
 		config.cache config.status config.log index.html \
 		stepmake/stepmake/stepmake stepmake/stepmake/bin
 	rm -rf autom4te.cache
+	rm -rf $(outdir)
 
 local-maintainerclean:
-	rm -f configure
 
 GNUmakefile: GNUmakefile.in
 	$(MAKE) INFILE=$< OUTFILE=$@ -f $(stepdir)/automatically-generated.sub.make
@@ -27,14 +27,14 @@ endif
 
 
 $(package-icon):
-	$(MAKE) -C Documentation/pictures icon
+	$(MAKE) -C Documentation/logo icon
 
 
-do-top-doc:
-	-$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(TOPDOC_FILES)" make-txt-files
+top-doc:
+	$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(TOPDOC_FILES)" txt-files
 
 
-$(README_TXT_FILES): do-top-doc
+$(README_TXT_FILES): top-doc
 
 local-clean:
 
@@ -44,7 +44,7 @@ ifeq ($(strip $(SRCMAKE)),)
 	$(MAKE) final-install
 endif
 
-local-dist: do-top-doc
+local-dist: top-doc
 
 dist:
 	rm -rf $(distdir)
@@ -52,25 +52,32 @@ dist:
 	chmod -R a+r $(distdir)
 	chmod  a+x `find $(distdir) -type d -print`
 	(cd ./$(depth)/$(outdir); $(TAR) -cf -  --owner=0 --group=0 $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
-	rm -rf $(distdir)/
+	rm -rf $(distdir)
 
 local-help:
-	@echo -e "\
-  config      rerun configure\n\
-  dist        roll tarball: $(depth)/$(outdir)/$(distname).tar.gz\n\
-  distclean   also remove configure output\n\
-  doc         update all documentation (without images)\n\
-  cvs-clean   also remove out directories and generated files\n\
-  maintainerclean also remove distributed generated files\n\
-  po          make new translation Portable Object database\n\
-  po-replace  do po-update and replace catalogs with msgmerged versions\n\
-  po-update   update translation Portable Object database\n\
-  web-install * install website documentation in (webdir=$(webdir))\n\
-              and Info documentation with images\n\
-  web-uninstall *  remove installed documentation with images\n\
-\n\
-Some more targets are available for testing changes:\n\
-  test-baseline  check  test-redo  test-clean\n\
-For more information on these targets, see Testing LilyPond\n\
-in Application Usage documentation.\n"
+	@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 "  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"
+	@echo
+	@echo "  install-doc     install website documentation in"
+	@echo "                    (webdir=$(webdir))"
+	@echo "                    and Info documentation with images"
+	@echo "  uninstall-doc   remove installed documentation with images"
+	@echo "  info            build Info documentation with images"
+	@echo "  install-info    install Info documentation with images"
+	@echo
+	@echo "Some more targets are available for testing changes:"
+	@echo "  test-baseline"
+	@echo "  check"
+	@echo "  test-redo"
+	@echo "  test-clean"
+	@echo
+	@echo "  For more information on these targets, see"
+	@echo "    \`Testing LilyPond' in the Contributor's Guide."
+	@echo