Here's a small patch to clean up the `make help' output. I
know, it may soon be obsolete, but it was bothering me, and
it may yet help people who start compiling in the meantime.
I mentioned this idea a little while ago, but hadn't done
anything till now:
http://lists.gnu.org/archive/html/lilypond-devel/2009-12/msg00519.html
Also, I removed the "-e" on the lines that have:
@echo -e "foo...
because the "-e" is printed in the terminal output, like:
-e foo
This made me think the "-e" doesn't do what someone thought
it would do. But I don't know. Was it okay to remove them?
I won't push the patch unless someone approves it.
Thanks.
- Mark
From f5dbfdb2033d61f72f5b1cd7874a374dc955924a Mon Sep 17 00:00:00 2001
From: Mark Polesky <[email protected]>
Date: Mon, 18 Jan 2010 16:03:22 -0800
Subject: [PATCH] Clean up `make help' output.
---
stepmake/stepmake/generic-targets.make | 41 ++++++++++++++++--------------
stepmake/stepmake/toplevel-targets.make | 27 ++++++++++----------
2 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index eddf25a..41ad639 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -47,32 +47,35 @@ config:
generic-help:
- @echo -e "\
+ @echo "\
Makefile for $(PACKAGE_NAME) $(TOPLEVEL_VERSION)\n\
Usage: make ["VARIABLE=value"]... [TARGET]\n\
\n\
Targets specific to current directory:\n"
help: generic-help local-help
- @echo -e "Generic targets:\n\
- all * update everything except documentation with images\n\
- clean * remove all generated stuff in $(outdir)\n\
- bin-clean * same as clean, except that mf/out is preserved\n\
- default same as the empty target\n\
- doc * update documentation with images in directory \`out-www'\n\
- doc-stage-1 * update only PDF and Info documentation in directory \`out-www'\n\
- doc-clean * clean \`out-www' directory\n\
- exe update all executables\n\
- help this help\n\
- install * install programs and data (prefix=$(prefix))\n\
- lib update all libraries\n\
- uninstall* uninstall programs and data\n\
- TAGS generate tagfiles\n\
+ @echo "\
+Generic targets that recurse into subdirectories*:\n\
+ all update everything except documentation with images\n\
+ clean remove all generated stuff in $(outdir)\n\
+ bin-clean same as clean, except that mf/out is preserved\n\
+ doc update documentation with images in directory \`out-www'\n\
+ doc-stage-1 update only PDF and Info documentation in directory \`out-www'\n\
+ doc-clean clean \`out-www' directory\n\
+ install install programs and data (prefix=$(prefix))\n\
+ uninstall uninstall programs and data\n\
\n\
-\`make' may be invoked from any subdirectory.\n\
-Note that all commands marked with a star (*) recurse into subdirectories;\n\
-prepend \`local-' to restrict operation to the current directory.\n\
-Example: \`local-clean'."
+ *Note: Prepend \`local-' (eg. \`local-clean') to restrict\n\
+ any of the above commands to the current directory.\n\
+\n\
+Other generic targets:\n\
+ default same as the empty target\n\
+ exe update all executables\n\
+ help this help\n\
+ lib update all libraries\n\
+ TAGS generate tagfiles\n\
+\n\
+\`make' may be invoked from any subdirectory."
local-help:
diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 1c590b0..f2ee5d3 100644
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -56,21 +56,22 @@ dist:
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\
- cvs-clean also remove out directories and generated files\n\
+ @echo "\
+ config rerun configure\n\
+ dist roll tarball: $(depth)/$(outdir)/$(distname).tar.gz\n\
+ distclean also remove configure output\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\
+ 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\
\n\
- install-doc install website documentation in (webdir=$(webdir))\n\
- and Info documentation with images\n\
- uninstall-doc remove installed documentation with images\n\
- info build Info documentation with images\n\
- install-info install Info documentation with images\n\
+ install-doc install website documentation in\n\
+ (webdir=$(webdir))\n\
+ and Info documentation with images\n\
+ uninstall-doc remove installed documentation with images\n\
+ info build Info documentation with images\n\
+ install-info install Info documentation with images\n\
\n\
Some more targets are available for testing changes:\n\
test-baseline check test-redo test-clean\n\
--
1.6.3.3
_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel
