diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index fee707cfb..2742a043d 100644 --- 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)) #-------------------------------------------------- diff --git a/configure/RULES.Db b/configure/RULES.Db index 3ffb3fedb..75993577f 100644 --- 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)))) diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 5832ed899..21ea5114d 100644 --- 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 $$( dirs created by running make" - @echo " In O. dir, clean removes build created files" - @echo " realclean - Removes ALL O. dirs" - @echo " Cannot be used within an O. dir" - @echo " rebuild - Same as clean install" - @echo " inc - Installs header files" - @echo " build - Builds all targets" - @echo " archclean - Removes O. dirs but not O.Common dir" - @echo "\"Partial\" build targets supported by Makefiles:" - @echo " inc. - Installs only header files." - @echo " install. - Builds and installs only." - @echo " clean. - Cleans binaries in O. dirs only." - @echo " build. - Builds 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. 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. dirs created by running make" + $(ECHO) " In O. dir, clean removes build created files" + $(ECHO) " realclean - Removes ALL O. dirs" + $(ECHO) " Cannot be used within an O. dir" + $(ECHO) " rebuild - Same as clean install" + $(ECHO) " inc - Installs header files" + $(ECHO) " build - Builds all targets" + $(ECHO) " archclean - Removes O. dirs but not O.Common dir" + $(ECHO) "\"Partial\" build targets supported by Makefiles:" + $(ECHO) " inc. - Installs only header files." + $(ECHO) " install. - Builds and installs only." + $(ECHO) " clean. - Cleans binaries in O. dirs only." + $(ECHO) " build. - Builds 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. level Makefile .e.g" + $(ECHO) " xxxRecord.o" .PHONY : $(uninstallArchTargets) .PHONY : uninstall help cleandirs distclean uninstallDirs realuninstall