From 253edb125ba3d8ffc7bf29f1677c2b6513709b91 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 17 Jun 2007 16:24:23 +0000
Subject: Rework the help system. For now, this is mostly a no-op (it only
 re-organise the help entries), but later, that may come in handy when we want
 ct-ng to be installable).


diff --git a/Makefile b/Makefile
index a1f3289..7a94e92 100644
--- a/Makefile
+++ b/Makefile
@@ -17,32 +17,54 @@ all: build
 
 HOST_CC = gcc -funsigned-char
 
-help::
+# Help system
+help:: help-head help-config help-samples help-build help-distrib help-env help-tail
+
+help-head::
 	@echo  'Available make targets:'
+
+help-config::
 	@echo
+	@echo  'Configuration targets:'
 
-include $(CT_TOP_DIR)/kconfig/Makefile
-include $(CT_TOP_DIR)/samples/Makefile
+help-samples::
+	@echo
+	@echo  'Preconfigured targets:'
 
-help::
+help-build::
+	@echo
 	@echo  'Build targets:'
+
+help-distrib::
+	@echo
+	@echo  'Distribution targets:'
+
+help-env::
+	@echo
+	@echo  'Environement variables (see docs/overview.txt):'
+
+help-tail::
+	@echo
+	@echo  'Execute "make" or "make all" to build all targets marked with [*]'
+
+# End help system
+
+help-build::
 	@echo  '* build          - Build the toolchain'
-	@echo  '  regtest        - Regtest-build all samples'
 	@echo  '  clean          - Remove generated files'
 	@echo  '  distclean      - Remove generated files, configuration and build directories'
 
+include $(CT_TOP_DIR)/kconfig/Makefile
+include $(CT_TOP_DIR)/samples/Makefile
 include $(CT_TOP_DIR)/tools/Makefile
 include $(CT_TOP_DIR)/Makefile.steps
 
-help::
-	@echo  'Distribution targets:'
+help-distrib::
 	@echo  '  tarball        - Build a tarball of the configured toolchain'
-	@echo  ''
-	@echo  'Environement variables (see docs/overview.txt):'
+
+help-env::
 	@echo  '  STOP           - Stop the build just after this step'
 	@echo  '  RESTART        - Restart the build just before this step'
-	@echo  ''
-	@echo  'Execute "make" or "make all" to build all targets marked with [*]'
 
 .config:
 	@echo "You must run either one of \"make config\" or \"make menuconfig\" first"
diff --git a/kconfig/Makefile b/kconfig/Makefile
index a98092c..95446f1 100644
--- a/kconfig/Makefile
+++ b/kconfig/Makefile
@@ -58,14 +58,10 @@ defoldconfig:$(obj)/conf $(GEN_CONFIG_FILES)
 	@yes "" |$< -s $(KCONFIG_TOP) >/dev/null
 
 # Help text used by make help
-help::
-	@echo  'General purpose configuration targets:'
+help-config::
 	@echo  '  config         - Update current config using a line-oriented program'
 	@echo  '  menuconfig     - Update current config using a menu based program'
 	@echo  '  oldconfig      - Update current config using a provided .config as base'
-	@# saveconfig is listed here for homogeneity, but implemented in samples/Makefile
-	@echo  '  saveconfig     - Save current config as a preconfigured target'
-	@echo  ''
 
 # Cheesy build
 
diff --git a/samples/Makefile b/samples/Makefile
index 0bdc1fe..a404a1b 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -3,10 +3,14 @@
 # Build the list of available samples
 CT_SAMPLES = $(patsubst $(CT_TOP_DIR)/samples/%/crosstool.config,%,$(wildcard $(CT_TOP_DIR)/samples/*/crosstool.config))
 
-help::
-	@echo  'Preconfigured targets:'
+help-config::
+	@echo  '  saveconfig     - Save current config as a preconfigured target'
+
+help-samples::
 	@$(CT_TOP_DIR)/scripts/showSamples.sh $(CT_SAMPLES)
-	@echo  ''
+
+help-build::
+	@echo  '  regtest        - Regtest-build all samples'
 
 # How we do build one sample
 .PHONY: $(CT_SAMPLES)
diff --git a/tools/Makefile b/tools/Makefile
index 0886ac4..9985e3a 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,6 +7,5 @@ updatetools:
 	@wget "$(CONFIG_SUB_SRC)" -O "$(CONFIG_SUB_DEST)"
 	@wget "$(CONFIG_GUESS_SRC)" -O "$(CONFIG_GUESS_DEST)"
 
-help::
+help-distrib::
 	@echo  '  updatetools    - Update the config tools'
-	@echo  ''
-- 
cgit v0.10.2-6-g49f6