Created a ECHO macro and used it in the rules lines.

2009-06-26 20:37:22 +00:00
parent f84e70487f
commit c916b60c1d
7 changed files with 95 additions and 89 deletions
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -123,6 +123,10 @@ CMPLR_PREFIX=
 LIB_PREFIX=
 SHRLIB_PREFIX= $(LIB_PREFIX)

+#-------------------------------------------------------
+# Make $(ECHO) output - suppress $(ECHO)ing if make's '-s' flag is set
+ECHO := $(if $(findstring s,$(MAKEFLAGS)),\#,@echo)
+
 #--------------------------------------------------
 # vpath directories
 POSIX_YES = os/posix
@@ -321,7 +325,7 @@ HDEPENDS_FLAGS =
 HDEPENDS_INCLUDES = $(subst -I,,$(INCLUDES))
 HDEPENDSFLAGS = -m $*$(DEP) $(HDEPENDS_INCLUDES) $@ $<
 HDEPENDS_CMD_YES   = -$(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDSFLAGS)
-HDEPENDS_CMD_NO   = echo ""
+HDEPENDS_CMD_NO   = $(ECHO) ""
 HDEPENDS_CMD  = $(HDEPENDS_CMD_$(HDEPENDS))

 #--------------------------------------------------
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -162,13 +162,13 @@ $(COMMON_DIR)/%.edf: ../%.sch $(DEPSCHS)

 ifdef CREATESUBSTITUTIONS
 $(COMMON_DIR)/%.substitutions:
-	@echo "Create substitutions"
+	$(ECHO) "Create substitutions"
 	@$(RM) $@
 	$(CREATESUBSTITUTIONS) $@
 endif

 $(INSTALL_DB)/%.substitutions: %.substitutions
-	@echo "Installing db file $@"
+	$(ECHO) "Installing db file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 .PRECIOUS: $(COMMON_DIR)/%.substitutions
@@ -182,7 +182,7 @@ $(COMMON_DIR)/%.template: $(COMMON_DIR)/%.edf
 	@$(RM) $@.VAR

 $(INSTALL_DB)/%.template: %.template
-	@echo "Installing db file $@"
+	$(ECHO) "Installing db file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 .PRECIOUS: $(COMMON_DIR)/%.template
@@ -192,28 +192,28 @@ $(INSTALL_DB)/%.template: %.template
 $(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
 	@$(RM) $@$(DEP)
 	@$(DBDDEPENDS_CMD)
-	@echo "$<:../Makefile" >> $@$(DEP)
+	$(ECHO) "$<:../Makefile" >> $@$(DEP)
 	@$(RM) $@
 	$(DBTORECORDTYPEH) $(DBDFLAGS)  $< $@

 $(COMMON_DIR)/%Record.h: %Record.dbd
 	@$(RM) $@$(DEP)
 	@$(DBDDEPENDS_CMD)
-	@echo "$<:../Makefile" >> $@$(DEP)
+	$(ECHO) "$<:../Makefile" >> $@$(DEP)
 	@$(RM) $@
 	$(DBTORECORDTYPEH) $(DBDFLAGS)  $< $@

 $(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd
 	@$(RM) $@$(DEP)
 	@$(DBDDEPENDS_CMD)
-	@echo "$<:../Makefile" >> $@$(DEP)
+	$(ECHO) "$<:../Makefile" >> $@$(DEP)
 	@$(RM) $@
 	$(DBTOMENUH) $< $@

 $(COMMON_DIR)/menu%.h: menu%.dbd
 	@$(RM) $@$(DEP)
 	@$(DBDDEPENDS_CMD)
-	@echo "$<:../Makefile" >> $@$(DEP)
+	$(ECHO) "$<:../Makefile" >> $@$(DEP)
 	@$(RM) $@
 	$(DBTOMENUH) $< $@

@@ -228,15 +228,15 @@ $(COMMON_DIR)/bpt%.dbd: bpt%.data
 $(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd 
 	@$(RM) $@$(DEP)
 	@$(DBDDEPENDS_CMD)
-	@echo "$<:../Makefile" >> $@$(DEP)
-	@echo "Expanding dbd"
+	$(ECHO) "$<:../Makefile" >> $@$(DEP)
+	@$(ECHO) "Expanding dbd"
 	@$(RM) $@
 	$(DBEXPAND) $(DBDFLAGS) -o $@ $<

 $(COMMON_DIR)/%.dbd: %Include.dbd 
 	@$(RM) $@$(DEP)
 	@$(DBDDEPENDS_CMD)
-	@echo "Expanding dbd"
+	@$(ECHO) "Expanding dbd"
 	@$(RM) $@
 	$(DBEXPAND) $(DBDFLAGS) -o $@ $<

@@ -245,16 +245,16 @@ $(COMMON_DIR)/%Include.dbd:
 	$(PERL) $(TOOLS)/makeIncludeDbd.pl $($*_DBD) $@

 $(INSTALL_DBD)/%: $(COMMON_DIR)/%
-	@echo "Installing created dbd file $@"
+	@$(ECHO) "Installing created dbd file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 $(INSTALL_DBD)/%: %
-	@echo "Installing dbd file $@"
+	@$(ECHO) "Installing dbd file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 define  DBD_INSTALLS_template
 $$(INSTALL_DBD)/$$(notdir $(1)) : $(1)
-	@echo "Installing $$@"
+	@$(ECHO) "Installing $$@"
 	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DBD)
 endef
 $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
@@ -271,7 +271,7 @@ $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf
 #$(COMMON_DIR)/%.db$(RAW): %.substitutions %.template
 #	@$(RM) $@$(DEP)
 #	@$(MAKEDBDEPENDS) $@ $^  >> $@$(DEP)
-#	@echo "Inflating database from $^"
+#	@$(ECHO) "Inflating database from $^"
 #	@$(RM) $@
 #	$(MSI) $(DBFLAGS) -S$< $(firstword $(patsubst %.substitutions,,$^)) > msi.tmp
 #	$(MV) msi.tmp $@
@@ -279,8 +279,8 @@ $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf
 $(COMMON_DIR)/%.db$(RAW): %.substitutions
 	@$(RM) $@$(DEP)
 	$(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $@$(DEP)
-	@echo "$@:$(TEMPLATE_FILENAME)" >> $@$(DEP)
-	@echo "Inflating database from $< $(TEMPLATE_FILENAME)"
+	@$(ECHO) "$@:$(TEMPLATE_FILENAME)" >> $@$(DEP)
+	@$(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $@
 	$(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > msi.tmp
 	$(MV) msi.tmp $@
@@ -288,7 +288,7 @@ $(COMMON_DIR)/%.db$(RAW): %.substitutions
 $(COMMON_DIR)/%.db$(RAW): %.template
 	@$(RM) $@$(DEP)
 	@$(MAKEDBDEPENDS) $@ $^  >> $@$(DEP)
-	@echo "Inflating database from $<"
+	@$(ECHO) "Inflating database from $<"
 	@$(RM) $@
 	$(MSI) $(DBFLAGS)  $< > msi.tmp
 	$(MV) msi.tmp $@
@@ -296,7 +296,7 @@ $(COMMON_DIR)/%.db$(RAW): %.template
 $(COMMON_DIR)/%.acf: %.acs
 	@$(RM) $@$(DEP)
 	@$(ACFDEPENDS_CMD)
-	@echo "Creating acf file $@"
+	$(ECHO) "Creating acf file $@"
 	@$(RM) $@
 	$(ACF_CMD)

@@ -310,7 +310,7 @@ $(COMMON_DIR)/%.db$(RAW): ../%.db
 	$(CP) $< $@

 $(COMMON_DIR)/%.db: $(COMMON_DIR)/%.db$(RAW)
-	@echo "Optimizing database $@"
+	$(ECHO) "Optimizing database $@"
 	@$(RM) $@
 	$(DBST) . $< -d > $@

@@ -319,17 +319,17 @@ $(COMMON_DIR)/%.db: $(COMMON_DIR)/%.db$(RAW)
 else

 $(INSTALL_DB)/%: %
-	@echo "Installing db file $@"
+	$(ECHO) "Installing db file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 endif

 $(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
-	@echo "Installing created db file $@"
+	$(ECHO) "Installing created db file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 define  DB_INSTALLS_template
 $$(INSTALL_DB)/$$(notdir $(1)) : $(1)
-	@echo "Installing $$@"
+	$(ECHO) "Installing $$@"
 	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DB)
 endef
 $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -127,7 +127,7 @@ buildInstall : \
 	$(INSTALL_BIN_INSTALLS)

 clean::
-	@echo "Cleaning"
+	$(ECHO) "Cleaning"
 	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) $(LIBNAME) $(SHRLIBNAME) \
 	$(INC) $(TARGETS) $(DLL_LINK_LIBNAME) $(TDS) \
 	*.out MakefileInclude  $(LOADABLE_SHRLIBNAME) *.manifest *.exp \
@@ -207,7 +207,7 @@ $(OBJLIBNAME):%$(OBJ):

 # WIN95/NT source browser
 %.bsc: %.sbr
-	@echo "building source browser archive $@"
+	$(ECHO) "building source browser archive $@"
 	@$(RM) $@
 	$(BAFCMD) $<

@@ -254,7 +254,7 @@ endif
 ifdef BAF

 $(LIB_BAF): $(addsuffix $(BOF),$(basename $(LIBRARY_LD_OBJS)))
-	@echo "Building source browser archive $@"
+	$(ECHO) "Building source browser archive $@"
 	@$(RM) $@
 	$(BAFCMD) $^

@@ -330,14 +330,14 @@ runtests: $(TESTSCRIPTS_$(BUILD_CLASS))
 ## Install rules for BIN_INSTALLS and LIB_INSTALLS
 define  BIN_INSTALLS_template
 $$(INSTALL_BIN)/$$(notdir $(1)) : $(1)
-	@echo "Installing $$(<F)"
+	$(ECHO) "Installing $$(<F)"
 	@$$(INSTALL) -d -m $$(BIN_PERMISSIONS) $$^ $$(INSTALL_BIN)
 endef
 $(foreach file, $(BIN_INSTALLS), $(eval $(call BIN_INSTALLS_template, $(file))))

 define  LIB_INSTALLS_template
 $$(INSTALL_LIB)/$$(notdir $(1)) : $(1)
-	@echo "Installing $$(<F)"
+	$(ECHO) "Installing $$(<F)"
 	@$$(INSTALL) -d -m $$(LIB_PERMISSIONS) $$^ $$(INSTALL_LIB)
 endef
 $(foreach file, $(LIB_INSTALLS), $(eval $(call LIB_INSTALLS_template, $(file))))
@@ -345,30 +345,30 @@ $(foreach file, $(LIB_INSTALLS), $(eval $(call LIB_INSTALLS_template, $(file))))
 #---------------------------------------------------------------

 $(INSTALL_BIN)/%: ../os/$(OS_CLASS)/%
-	@echo "Installing os-specific script $@"
+	$(ECHO) "Installing os-specific script $@"
 	@$(INSTALL_PRODUCT) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_BIN)

 $(INSTALL_BIN)/%: %
-	@echo "Installing created file $@"
+	$(ECHO) "Installing created file $@"
 	@$(INSTALL_PRODUCT) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_BIN)

 $(INSTALL_BIN)/%: ../%
-	@echo "Installing script $@"
+	$(ECHO) "Installing script $@"
 	@$(INSTALL_PRODUCT) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_BIN)

 $(INSTALL_LIB)/%.a: %.a
-	@echo "Installing library $@"
+	$(ECHO) "Installing library $@"
 	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_LIB)
 ifneq ($(strip $(RANLIB)),)
 	$(RANLIB) $@
 endif # RANLIB

 $(INSTALL_LIB)/%.lib: %.lib
-	@echo "Installing library $@"
+	$(ECHO) "Installing library $@"
 	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_LIB)

 $(INSTALL_SHRLIB)/lib%: lib%
-	@echo "Installing shared library $@"
+	$(ECHO) "Installing shared library $@"
 	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_SHRLIB)
 ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst .$(SHRLIB_VERSION),,$@)
@@ -378,20 +378,20 @@ endif # SHRLIB_VERSION

 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))
 $(INSTALL_TCLLIB)/%: %
-	@echo "Installing Tcl library $@"
+	$(ECHO) "Installing Tcl library $@"
 	@$(INSTALL) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_TCLLIB)

 $(INSTALL_TCLLIB)/%: ../%
-	@echo "Installing Tcl library $@"
+	$(ECHO) "Installing Tcl library $@"
 	@$(INSTALL) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_TCLLIB)
 endif

 $(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS)
-	@echo "Updating $@"
-	@echo eval auto_mkindex $(INSTALL_TCLLIB) "$(TCLLIBNAME)" | tclsh
+	$(ECHO) "Updating $@"
+	$(ECHO) eval auto_mkindex $(INSTALL_TCLLIB) "$(TCLLIBNAME)" | tclsh

 $(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
-	@echo "Installing loadable shared library $@"
+	$(ECHO) "Installing loadable shared library $@"
 	@$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB)
 ifneq (,$(strip $(LOADABLE_SHRLIB_VERSION)))
 	@$(RM) $(subst .$(LOADABLE_SHRLIB_VERSION),,$@)
@@ -399,47 +399,49 @@ ifneq (,$(strip $(LOADABLE_SHRLIB_VERSION)))
 endif # LOADABLE_SHRLIB_VERSION

 $(INSTALL_CONFIG)/%: %
-	@echo "Installing config file $@"
+	$(ECHO) "Installing config file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 $(INSTALL_CONFIG)/%: ../%
-	@echo "Installing config file $@"
+	$(ECHO) "Installing config file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 $(INSTALL_INCLUDE)/% : $(COMMON_DIR)/%
-	@echo "Installing generated generic include file $@"
+	@echo $(INSTALL_INCLUDE)/% : $(COMMON_DIR)/%
+	@echo  $(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+	$(ECHO) "Installing generated generic include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 $(INSTALL_INCLUDE)/% : %
-	@echo "Installing generic include file $@"
+	$(ECHO) "Installing generic include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 $(INSTALL_INCLUDE)/os/$(OS_CLASS)/% : %
-	@echo "Installing os dependent include file $@"
+	$(ECHO) "Installing os dependent include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 $(INSTALL_DOC)/%: %
-	@echo "Installing doc $@"
+	$(ECHO) "Installing doc $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)

 $(INSTALL_DOC)/%: ../%
-	@echo "Installing doc $@"
+	$(ECHO) "Installing doc $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)

 $(INSTALL_HTML)/$(HTMLS_DIR)/%: %
-	@echo "Installing html $@"
+	$(ECHO) "Installing html $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 $(INSTALL_HTML)/$(HTMLS_DIR)/%: ../%
-	@echo "Installing html $@"
+	$(ECHO) "Installing html $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 $(INSTALL_TEMPLATES_SUBDIR)/%: ../%
-	@echo "Installing $@"
+	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 $(INSTALL_TEMPLATES_SUBDIR)/%: %
-	@echo "Installing $@"
+	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

 -include $(CONFIG)/RULES_EXPAND
--- a/configure/RULES_EXPAND
+++ b/configure/RULES_EXPAND
@@ -13,7 +13,7 @@ EXPANDED = $(EXPAND:%@=%)
 buildInstall: $(EXPANDED)

 $(EXPANDED): %: ../%@
-	@echo "Expanding $< to $@"
+	$(ECHO) "Expanding $< to $@"
 	@$(RM) $@
 	@$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@

--- a/configure/RULES_FILE_TYPE
+++ b/configure/RULES_FILE_TYPE
@@ -54,11 +54,11 @@ $(1) += $$(if $$(strip $$($(1)_$$(OS_CLASS))),$$(subst -nil-,,$$($(1)_$$(OS_CLAS
 INSTALLS_$(1) = $$($(1):%=$$(INSTALL_$(1))/%)

 $$(INSTALL_$(1))/%: ../%
-	@echo "Installing $(1) file $$@"
+	$(ECHO) "Installing $(1) file $$@"
 	@$$(INSTALL) -d -m  $$(INSTALL_PERMISSIONS) $$< $$(dir $$@)

 $$(INSTALL_$(1))/%: %
-	@echo "Installing $(1) file $$@"
+	$(ECHO) "Installing $(1) file $$@"
 	@$$(INSTALL) -d -m  $$(INSTALL_PERMISSIONS) $$< $$(dir $$@)

 buildInstall : $$(INSTALLS_$(1))
--- a/configure/RULES_JAVA
+++ b/configure/RULES_JAVA
@@ -114,40 +114,40 @@ $(JAVA_DIRECTORY_TARGETS):
 endif

 $(COMMON_JAVAINC):$(JAVAINC_CLASSFILES)
-	@echo Creating header files $(COMMON_JAVAINC)
+	$(ECHO) Creating header files $(COMMON_JAVAINC)
 	@$(RM) $@
 	$(JAVAHCMD) $(JAVAINC_CLASSNAMES)

 $(COMMON_TESTCLASSES): $(addprefix ../,$(DEPTESTJAVA))
-	@echo Creating test java class files $(COMMON_TESTCLASSES)
+	$(ECHO) Creating test java class files $(COMMON_TESTCLASSES)
 	@$(RM) $@
 	$(JAVACCMD) -d $(COMMON_DIR) $^

 $(INSTALL_CLASSES): $(addprefix ../,$(JAVA))
-	@echo Creating java class files 
+	$(ECHO) Creating java class files 
 	@$(RM) $@
 	$(JAVACCMD) -d $(INSTALL_JAVA) $^

 $(INSTALL_JAVADOC): $(addprefix ../,$(JAVA))
-	@echo Creating java doc files 
+	$(ECHO) Creating java doc files 
 	@$(RM) $@
 	$(JAVADOCCMD) -d $(addprefix $(INSTALL_HTML)/,$(JAVADOC)) $^

 $(COMMON_DIR)/%.jar: $(JARDEPFILES)
-	@echo Creating java jar file $@
+	$(ECHO) Creating java jar file $@
 	@$(RM) $@
 	$(JARCMD)

 $(INSTALL_JAVA)/%.jar: $(COMMON_DIR)/%.jar
-	@echo "Installing java jar file $@"
+	$(ECHO) "Installing java jar file $@"
 	@$(INSTALL) -d -m  $(INSTALL_PERMISSIONS) $< $(@D)

 $(INSTALL_JAVA)/%.jar: %.jar
-	@echo "Installing java jar file $@"
+	$(ECHO) "Installing java jar file $@"
 	@$(INSTALL) -d -m  $(INSTALL_PERMISSIONS) $< $(@D)

 $(addprefix $(INSTALL_JAVA)/, $(JARINPUT)): $(INSTALL_JAVA)/%: ../%
-	@echo "Installing jar input file $@"
+	$(ECHO) "Installing jar input file $@"
 	@$(INSTALL) -d -m  $(INSTALL_PERMISSIONS) $< $(@D)

 .PHONY: all install buildInstall rebuild clean build inc
--- a/configure/RULES_TOP
+++ b/configure/RULES_TOP
@@ -31,8 +31,8 @@ endif
 ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),)
 	@$(RMDIR) $(INSTALL_LOCATION_LIB)
 endif
-	@echo
-# The echo above stops a "nothing to be done for cleandirs" message
+	$(ECHO)
+# The $(ECHO) above stops a "nothing to be done for cleandirs" message

 distclean: realclean realuninstall

@@ -52,32 +52,32 @@ uninstallDirs:
 	@$(RMDIR) $(UNINSTALL_DIRS)

 help:
-	@echo "Usage: gnumake [options] [target] ..."
-	@echo "Targets supported by all Makefiles:"
-	@echo "     install        - Builds and installs all targets (default rule)"
-	@echo "     all            - Same as install"
-	@echo "     buildInstall   - Same as install"
-	@echo "     clean          - Removes the O.<arch> dirs created by running make"
-	@echo "                      In O.<arch> dir, clean removes build created files"
-	@echo "     realclean      - Removes ALL O.<arch> dirs"
-	@echo "                      Cannot be used within an O.<arch> dir"
-	@echo "     rebuild        - Same as clean install"
-	@echo "     inc            - Installs header files"
-	@echo "     build          - Builds all targets"
-	@echo "     archclean      - Removes O.<arch> dirs but not O.Common dir"
-	@echo "\"Partial\" build targets supported by Makefiles:"
-	@echo "     inc.<arch>     - Installs <arch> only header files."
-	@echo "     install.<arch> - Builds and installs <arch> only."
-	@echo "     clean.<arch>   - Cleans <arch> binaries in O.<arch> dirs only."
-	@echo "     build.<arch>   - Builds <arch> only."
-	@echo "Targets supported by top level Makefile:"
-	@echo "     uninstall      - Cleans directories created by the install."
-	@echo "     realuninstall  - Removes ALL install dirs"
-	@echo "     distclean      - Same as realclean realuninstall."
-	@echo "     cvsclean       - Removes cvs .#* files in all dirs of directory tree"
-	@echo "     help           - Prints this list of valid make targets "
-	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
-	@echo "     xxxRecord.o"
+	$(ECHO) "Usage: gnumake [options] [target] ..."
+	$(ECHO) "Targets supported by all Makefiles:"
+	$(ECHO) "     install        - Builds and installs all targets (default rule)"
+	$(ECHO) "     all            - Same as install"
+	$(ECHO) "     buildInstall   - Same as install"
+	$(ECHO) "     clean          - Removes the O.<arch> dirs created by running make"
+	$(ECHO) "                      In O.<arch> dir, clean removes build created files"
+	$(ECHO) "     realclean      - Removes ALL O.<arch> dirs"
+	$(ECHO) "                      Cannot be used within an O.<arch> dir"
+	$(ECHO) "     rebuild        - Same as clean install"
+	$(ECHO) "     inc            - Installs header files"
+	$(ECHO) "     build          - Builds all targets"
+	$(ECHO) "     archclean      - Removes O.<arch> dirs but not O.Common dir"
+	$(ECHO) "\"Partial\" build targets supported by Makefiles:"
+	$(ECHO) "     inc.<arch>     - Installs <arch> only header files."
+	$(ECHO) "     install.<arch> - Builds and installs <arch> only."
+	$(ECHO) "     clean.<arch>   - Cleans <arch> binaries in O.<arch> dirs only."
+	$(ECHO) "     build.<arch>   - Builds <arch> only."
+	$(ECHO) "Targets supported by top level Makefile:"
+	$(ECHO) "     uninstall      - Cleans directories created by the install."
+	$(ECHO) "     realuninstall  - Removes ALL install dirs"
+	$(ECHO) "     distclean      - Same as realclean realuninstall."
+	$(ECHO) "     cvsclean       - Removes cvs .#* files in all dirs of directory tree"
+	$(ECHO) "     help           - Prints this list of valid make targets "
+	$(ECHO) "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
+	$(ECHO) "     xxxRecord.o"

 .PHONY : $(uninstallArchTargets)
 .PHONY : uninstall help cleandirs distclean uninstallDirs realuninstall