From 9d8b0a6829a654a414244ca77923faf40cf1e74f Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 1 Jun 2008 21:12:00 +0000
Subject: [PATCH] Rework a little bit the steps and samples help entries.

 /trunk/docs/overview.txt  |    2     1     1     0 +-
 /trunk/steps.mk           |    7     5     2     0 +++++--
 /trunk/samples/samples.mk |    8     5     3     0 +++++---
 /trunk/ct-ng.in           |    5     3     2     0 +++--
 4 files changed, 14 insertions(+), 8 deletions(-)
---
 ct-ng.in           | 5 +++--
 docs/overview.txt  | 2 +-
 samples/samples.mk | 8 +++++---
 steps.mk           | 7 +++++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ct-ng.in b/ct-ng.in
index ce6e6cfd..901736af 100644
--- a/ct-ng.in
+++ b/ct-ng.in
@@ -27,6 +27,7 @@ export CT_VERSION:=@@CT_VERSION@@
 export CT_STOP:=$(STOP)
 export CT_RESTART:=$(RESTART)
 
+.FORCE:
 .PHONY: $(PHONY)
 PHONY += all
 all: help
@@ -36,8 +37,8 @@ HOST_CC := gcc -funsigned-char
 # Help system
 help:: help-head help-config help-samples help-build help-clean help-distrib help-env help-tail
 
-help-head::
-	@echo  'Available actions:'
+help-head:: version
+	@echo  'See below for a list of available actions, listed by category:'
 
 help-config::
 	@echo
diff --git a/docs/overview.txt b/docs/overview.txt
index a8f7f097..8515a110 100644
--- a/docs/overview.txt
+++ b/docs/overview.txt
@@ -280,7 +280,7 @@ are equivalent to:
   ct-ng STOP=libc_headers    and:    ct-ng RESTART=libc_headers
 
 To obtain the list of acceptable steps, please call:
-  ct-ng liststeps
+  ct-ng list-steps
 
 Note that in order to restart a build, you'll have to say 'Y' to the config
 option CT_DEBUG_CT_SAVE_STEPS, and that the previous build effectively went
diff --git a/samples/samples.mk b/samples/samples.mk
index 000ec3bc..6ae74aee 100644
--- a/samples/samples.mk
+++ b/samples/samples.mk
@@ -10,8 +10,9 @@ help-config::
 	@echo  '  saveconfig         - Save current config as a preconfigured target'
 
 help-samples::
-	@echo  '  samples            - prints the list of all samples (for scripting)'
-	@echo  '  show-<sample>      - show a brief overview of <sample>'
+	@echo  '  list-samples       - prints the list of all samples (for scripting)'
+	@echo  '  show-<sample>      - show a brief overview of <sample> (list below)'
+	@echo  '  <sample>           - preconfigure crosstool-NG with <sample> (list below)'
 	@$(CT_LIB_DIR)/scripts/showSamples.sh $(CT_SAMPLES)
 
 help-build::
@@ -22,7 +23,8 @@ help-build::
 $(patsubst %,show-%,$(CT_SAMPLES)):
 	@$(CT_LIB_DIR)/scripts/showSamples.sh -v $(patsubst show-%,%,$(@))
 
-samples:
+PHONY += list-samples
+list-samples: .FORCE
 	@echo $(CT_SAMPLES) |sed -r -e 's/ /\n/g;' |sort
 
 # How we do build one sample
diff --git a/steps.mk b/steps.mk
index e6261c67..347afa93 100644
--- a/steps.mk
+++ b/steps.mk
@@ -30,10 +30,13 @@ $(patsubst %,%+,$(CT_STEPS)):
 	@$(CT_NG) RESTART=$(patsubst %+,%,$@) build
 
 help-build::
-	@echo  '  liststeps          - List all build steps'
+	@echo  '  list-steps         - List all build steps'
 
-liststeps:
+list-steps:
 	@echo  'Available build steps, in order:'
 	@for step in $(CT_STEPS); do    \
 	     echo "  - $${step}";       \
 	 done
+	@echo  'Use "$(CT_NG) <step>" to execute only that step.'
+	@echo  'Use "$(CT_NG) +<step>" to execute up to that step.'
+	@echo  'Use "$(CT_NG) <step>+" to execute from that step onward.'