diff -r f0f9ba3f98f2 -r c8ac48ba1411 steps.mk
--- a/steps.mk	Wed Oct 15 21:29:56 2008 +0000
+++ b/steps.mk	Mon Oct 27 18:42:26 2008 +0000
@@ -1,6 +1,17 @@
 # Makefile for each steps
 # Copyright 2006 Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
 
+# ----------------------------------------------------------
+# This is the steps help entry
+
+help-build::
+	@echo  '  list-steps         - List all build steps'
+
+# ----------------------------------------------------------
+# The steps list
+
+# Please keep the last line with a '\' and keep the folowing empy line:
+# it helps when diffing and merging.
 CT_STEPS := libc_check_config   \
             kernel_headers      \
             gmp                 \
@@ -19,8 +30,23 @@
             tools               \
             debug               \
 
+# Make the list available to sub-processes (scripts/crosstool.sh needs it)
 export CT_STEPS
 
+# Print the steps list
+PHONY += list-steps
+list-steps:
+	@echo  'Available build steps, in order:'
+	@for step in $(CT_STEPS); do    \
+	     echo "  - $${step}";       \
+	 done
+	@echo  'Use "<step>" as action to execute only that step.'
+	@echo  'Use "+<step>" as action to execute up to that step.'
+	@echo  'Use "<step>+" as action to execute from that step onward.'
+
+# ----------------------------------------------------------
+# This part deals with executing steps
+
 $(CT_STEPS):
 	$(SILENT)$(MAKE) -rf $(CT_NG) RESTART=$@ STOP=$@ build
 
@@ -29,15 +55,3 @@
 
 $(patsubst %,%+,$(CT_STEPS)):
 	$(SILENT)$(MAKE) -rf $(CT_NG) RESTART=$(patsubst %+,%,$@) build
-
-help-build::
-	@echo  '  list-steps         - List all build steps'
-
-list-steps:
-	@echo  'Available build steps, in order:'
-	@for step in $(CT_STEPS); do    \
-	     echo "  - $${step}";       \
-	 done
-	@echo  'Use "<step>" as action to execute only that step.'
-	@echo  'Use "+<step>" as action to execute up to that step.'
-	@echo  'Use "<step>+" as action to execute from that step onward.'