diff --git a/ChangeLog b/ChangeLog index 3dd4931a..1b94e80b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2010-02-14 Nicola Pero + + New internalmessages=yes option that prints all the recursive make + invocations. Do not print any of them for messages=yes. + * messages.make (ECHO_NOTHING_RECURSIVE_MAKE, + END_ECHO_RECURSIVE_MAKE, INSIDE_ECHO_MAKING_OPERATION, + INSIDE_ECHO_MAKING_OPERATION_IN_DIRECTORY, + INSIDE_ECHO_MAKING_OPERATION_IN_SUBPROJECTS): New messages. + (ECHO_MAKING_OPERATION_IN_DIRECTORY): Message removed. + (internalmessages): New variable used to decide if to silence or + not the new messages. + * Master/rules.make (%.variables): Removed manual check for + existence of $(MAKEFILE_NAME) in the subdirectory since the + standard GNU make error message is clear enough. Use the new + messages. (%.subprojects): Same changes. + * Master/*.make: Use ECHO_NOTHING_RECURSIVE_MAKE and + END_ECHO_RECURSIVE_MAKE instead of ECHO_NOTHING and END_ECHO for + recursive make invocations. + * Instance/*.make: Same change. + * gnustep-make-help: Document the new internalmessages=yes option. + * Documentation/releasenotes.texi: Mention the new option. + * RELEASENOTES: Regenerated. + 2010-02-14 Nicola Pero * Master/application.make ($(APP_NAME)): Use ECHO_NOTHING and diff --git a/Documentation/releasenotes.texi b/Documentation/releasenotes.texi index f5c5fed7..6e4c1833 100644 --- a/Documentation/releasenotes.texi +++ b/Documentation/releasenotes.texi @@ -7,6 +7,13 @@ migrate to using a newer version of the make system. @section Version 2.4.0 @table @samp +@item new internalmessages=yes option +Starting with version 2.4.0, gnustep-make recognized the new +internalmessages=yes option (separate from messages=yes) which prints +all the recursive make invocations that are used. This is mostly +useful to understand how gnustep-make internally works and is not +meant for end-users. + @item javadoc is run in quiet mode Starting with version 2.4.0, javadoc is by default executed with the -quiet option (unless messages=yes is specified), and a ``Generating diff --git a/Instance/application.make b/Instance/application.make index 74557d9f..a51ae9c6 100644 --- a/Instance/application.make +++ b/Instance/application.make @@ -142,13 +142,13 @@ else # sub-make invocation where _GNUSTEP_MAKE_PARALLEL is set to yet. # That sub-make invocation will compile files in parallel. internal-app-run-compile-submake: - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-app-compile \ GNUSTEP_TYPE=$(GNUSTEP_TYPE) \ GNUSTEP_INSTANCE=$(GNUSTEP_INSTANCE) \ GNUSTEP_OPERATION=compile \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) internal-app-compile: $(APP_FILE) endif diff --git a/Instance/bundle.make b/Instance/bundle.make index 2550300a..819d8495 100644 --- a/Instance/bundle.make +++ b/Instance/bundle.make @@ -190,13 +190,13 @@ else # sub-make invocation where _GNUSTEP_MAKE_PARALLEL is set to yet. # That sub-make invocation will compile files in parallel. internal-bundle-run-compile-submake: - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-bundle-compile \ GNUSTEP_TYPE=$(GNUSTEP_TYPE) \ GNUSTEP_INSTANCE=$(GNUSTEP_INSTANCE) \ GNUSTEP_OPERATION=compile \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) internal-bundle-compile: $(BUNDLE_FILE) endif diff --git a/Instance/ctool.make b/Instance/ctool.make index e04032d6..f7059034 100644 --- a/Instance/ctool.make +++ b/Instance/ctool.make @@ -71,13 +71,13 @@ else # sub-make invocation where _GNUSTEP_MAKE_PARALLEL is set to yet. # That sub-make invocation will compile files in parallel. internal-ctool-all_:: $(GNUSTEP_OBJ_INSTANCE_DIR) $(OBJ_DIRS_TO_CREATE) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-ctool-compile \ GNUSTEP_TYPE=$(GNUSTEP_TYPE) \ GNUSTEP_INSTANCE=$(GNUSTEP_INSTANCE) \ GNUSTEP_OPERATION=compile \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) internal-ctool-compile: $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) endif diff --git a/Instance/framework.make b/Instance/framework.make index 52ecebfc..bfa7edb8 100644 --- a/Instance/framework.make +++ b/Instance/framework.make @@ -602,13 +602,13 @@ else # sub-make invocation where _GNUSTEP_MAKE_PARALLEL is set to yet. # That sub-make invocation will compile files in parallel. internal-framework-run-compile-submake: - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-framework-compile \ GNUSTEP_TYPE=$(GNUSTEP_TYPE) \ GNUSTEP_INSTANCE=$(GNUSTEP_INSTANCE) \ GNUSTEP_OPERATION=compile \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) internal-framework-compile: $(FRAMEWORK_FILE) endif diff --git a/Instance/library.make b/Instance/library.make index 14f65300..581e9d3e 100644 --- a/Instance/library.make +++ b/Instance/library.make @@ -265,13 +265,13 @@ else # sub-make invocation where _GNUSTEP_MAKE_PARALLEL is set to yet. # That sub-make invocation will compile files in parallel. internal-library-all_:: $(GNUSTEP_OBJ_INSTANCE_DIR) $(OBJ_DIRS_TO_CREATE) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-library-compile \ GNUSTEP_TYPE=$(GNUSTEP_TYPE) \ GNUSTEP_INSTANCE=$(GNUSTEP_INSTANCE) \ GNUSTEP_OPERATION=compile \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) internal-library-compile: $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) endif diff --git a/Instance/objc.make b/Instance/objc.make index 53ff12f7..dd9ebf91 100644 --- a/Instance/objc.make +++ b/Instance/objc.make @@ -61,13 +61,13 @@ else # sub-make invocation where _GNUSTEP_MAKE_PARALLEL is set to yet. # That sub-make invocation will compile files in parallel. internal-objc_program-all_:: $(GNUSTEP_OBJ_INSTANCE_DIR) $(OBJ_DIRS_TO_CREATE) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-objc_program-compile \ GNUSTEP_TYPE=$(GNUSTEP_TYPE) \ GNUSTEP_INSTANCE=$(GNUSTEP_INSTANCE) \ GNUSTEP_OPERATION=compile \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) internal-objc_program-compile: $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) endif diff --git a/Instance/palette.make b/Instance/palette.make index b4ff66fe..86125b67 100644 --- a/Instance/palette.make +++ b/Instance/palette.make @@ -122,13 +122,13 @@ else # sub-make invocation where _GNUSTEP_MAKE_PARALLEL is set to yet. # That sub-make invocation will compile files in parallel. internal-palette-run-compile-submake: - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-palette-compile \ GNUSTEP_TYPE=$(GNUSTEP_TYPE) \ GNUSTEP_INSTANCE=$(GNUSTEP_INSTANCE) \ GNUSTEP_OPERATION=compile \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) internal-palette-compile: $(PALETTE_FILE) endif diff --git a/Instance/service.make b/Instance/service.make index 2d3bb06c..e2b884c4 100644 --- a/Instance/service.make +++ b/Instance/service.make @@ -103,13 +103,13 @@ else # sub-make invocation where _GNUSTEP_MAKE_PARALLEL is set to yet. # That sub-make invocation will compile files in parallel. internal-service-run-compile-submake: - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-service-compile \ GNUSTEP_TYPE=$(GNUSTEP_TYPE) \ GNUSTEP_INSTANCE=$(GNUSTEP_INSTANCE) \ GNUSTEP_OPERATION=compile \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) internal-service-compile: $(SERVICE_FILE) endif diff --git a/Instance/subproject.make b/Instance/subproject.make index 92f7675a..cccc5446 100644 --- a/Instance/subproject.make +++ b/Instance/subproject.make @@ -42,13 +42,13 @@ else # sub-make invocation where _GNUSTEP_MAKE_PARALLEL is set to yet. # That sub-make invocation will compile files in parallel. internal-subproject-all_:: $(GNUSTEP_OBJ_INSTANCE_DIR) $(OBJ_DIRS_TO_CREATE) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-subproject-compile \ GNUSTEP_TYPE=$(GNUSTEP_TYPE) \ GNUSTEP_INSTANCE=$(GNUSTEP_INSTANCE) \ GNUSTEP_OPERATION=compile \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) internal-subproject-compile: $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) endif diff --git a/Instance/tool.make b/Instance/tool.make index ea5a0a68..d088c0f3 100644 --- a/Instance/tool.make +++ b/Instance/tool.make @@ -71,13 +71,13 @@ else # sub-make invocation where _GNUSTEP_MAKE_PARALLEL is set to yes. # That sub-make invocation will compile files in parallel. internal-tool-all_:: $(GNUSTEP_OBJ_INSTANCE_DIR) $(OBJ_DIRS_TO_CREATE) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-tool-compile \ GNUSTEP_TYPE=$(GNUSTEP_TYPE) \ GNUSTEP_INSTANCE=$(GNUSTEP_INSTANCE) \ GNUSTEP_OPERATION=compile \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) internal-tool-compile: $(GNUSTEP_OBJ_DIR)/$(GNUSTEP_INSTANCE)$(EXEEXT) endif diff --git a/Master/application.make b/Master/application.make index a412d59a..a3451117 100644 --- a/Master/application.make +++ b/Master/application.make @@ -35,10 +35,10 @@ else # See tool.make for an explanation of the parallel building. internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-app-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-app-all @@ -93,4 +93,4 @@ internal-strings:: $(APP_NAME:=.strings.app.variables) # FIXME - GNUSTEP_BUILD_DIR here. Btw should we remove this or # provide a better more general way of doing it ? $(APP_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.app.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.app.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/bundle.make b/Master/bundle.make index 8734f446..1db4b596 100644 --- a/Master/bundle.make +++ b/Master/bundle.make @@ -34,10 +34,10 @@ internal-all:: $(GNUSTEP_OBJ_DIR) $(BUNDLE_NAME:=.all.bundle.variables) else internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-bundle-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-bundle-all @@ -68,4 +68,4 @@ endif internal-strings:: $(BUNDLE_NAME:=.strings.bundle.variables) $(BUNDLE_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.bundle.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.bundle.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/clibrary.make b/Master/clibrary.make index 64f59386..cd566a1e 100644 --- a/Master/clibrary.make +++ b/Master/clibrary.make @@ -34,10 +34,10 @@ internal-all:: $(GNUSTEP_OBJ_DIR) $(CLIBRARY_NAME:=.all.clibrary.variables) else internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-clibrary-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-clibrary-all @@ -69,4 +69,4 @@ endif internal-strings:: $(CLIBRARY_NAME:=.strings.clibrary.variables) $(CLIBRARY_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.clibrary.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.clibrary.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/ctool.make b/Master/ctool.make index 3e7df689..c80e4fc3 100644 --- a/Master/ctool.make +++ b/Master/ctool.make @@ -33,10 +33,10 @@ internal-all:: $(GNUSTEP_OBJ_DIR) $(CTOOL_NAME:=.all.ctool.variables) else internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-ctool-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-ctool-all @@ -61,4 +61,4 @@ endif internal-strings:: $(CTOOL_NAME:=.strings.ctool.variables) $(CTOOL_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.ctool.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.ctool.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/framework.make b/Master/framework.make index 25ec4ef8..819559d0 100644 --- a/Master/framework.make +++ b/Master/framework.make @@ -52,4 +52,4 @@ internal-distclean:: $(FRAMEWORK_NAME:=.distclean.framework.variables) internal-strings:: $(FRAMEWORK_NAME:=.strings.framework.variables) $(FRAMEWORK_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going $@.all.framework.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going $@.all.framework.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/gswapp.make b/Master/gswapp.make index 463bd0a2..962084ea 100644 --- a/Master/gswapp.make +++ b/Master/gswapp.make @@ -38,10 +38,10 @@ internal-all:: $(GNUSTEP_OBJ_DIR) $(GSWAPP_NAME:=.all.gswapp.variables) else internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-gswapp-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-gswapp-all @@ -77,4 +77,4 @@ endif internal-strings:: $(GSWAPP_NAME:=.strings.gswapp.variables) $(GSWAPP_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.gswapp.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.gswapp.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/gswbundle.make b/Master/gswbundle.make index 4de03287..37ab9e59 100644 --- a/Master/gswbundle.make +++ b/Master/gswbundle.make @@ -38,10 +38,10 @@ internal-all:: $(GNUSTEP_OBJ_DIR) $(GSWBUNDLE_NAME:=.all.gswbundle.variables) else internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-gswbundle-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-gswbundle-all @@ -68,4 +68,4 @@ endif internal-all:: $(GSWBUNDLE_NAME:=.all.gswbundle.variables) $(GSWBUNDLE_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.gswbundle.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.gswbundle.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/java-tool.make b/Master/java-tool.make index a377e3c6..ec3dd1ff 100644 --- a/Master/java-tool.make +++ b/Master/java-tool.make @@ -51,4 +51,4 @@ internal-distclean:: $(JAVA_TOOLS_WITH_SUBPROJECTS:=.distclean.java_tool.subproj endif $(JAVA_TOOL_NAME): - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.java_tool.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.java_tool.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/java.make b/Master/java.make index 073ee1b9..aa5f012f 100644 --- a/Master/java.make +++ b/Master/java.make @@ -45,4 +45,4 @@ internal-distclean:: $(JAVA_PACKAGES_WITH_SUBPROJECTS:=.distclean.java-package.s endif $(JAVA_PACKAGE_NAME): - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.java-package.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.java-package.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/library.make b/Master/library.make index 53eb48e0..2447d47c 100644 --- a/Master/library.make +++ b/Master/library.make @@ -34,10 +34,10 @@ internal-all:: $(GNUSTEP_OBJ_DIR) $(LIBRARY_NAME:=.all.library.variables) else internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-library-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-library-all @@ -69,4 +69,4 @@ endif internal-strings:: $(LIBRARY_NAME:=.strings.library.variables) $(LIBRARY_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.library.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.library.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/objc.make b/Master/objc.make index 185ef23f..ec312162 100644 --- a/Master/objc.make +++ b/Master/objc.make @@ -33,10 +33,10 @@ internal-all:: $(GNUSTEP_OBJ_DIR) $(OBJC_PROGRAM_NAME:=.all.objc-program.variabl else internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-objc-program-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-objc-program-all @@ -61,4 +61,4 @@ endif internal-strings:: $(OBJC_PROGRAM_NAME:=.strings.objc-program.variables) $(OBJC_PROGRAM_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.objc-program.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.objc-program.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/palette.make b/Master/palette.make index a1c7c42b..baf45b2b 100644 --- a/Master/palette.make +++ b/Master/palette.make @@ -35,10 +35,10 @@ internal-all:: $(GNUSTEP_OBJ_DIR) $(PALETTE_NAME:=.all.palette.variables) else internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-palette-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-palette-all @@ -75,4 +75,4 @@ endif internal-strings:: $(PALETTE_NAME:=.strings.palette.variables) $(PALETTE_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.palette.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.palette.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/parallel-subdirectories.make b/Master/parallel-subdirectories.make index 19f8dfc7..8bff7f13 100644 --- a/Master/parallel-subdirectories.make +++ b/Master/parallel-subdirectories.make @@ -52,11 +52,11 @@ ifneq ($(PARALLEL_SUBDIRECTORIES),) # build is not parallel, that submake will simply build normally. internal-all internal-clean internal-distclean \ internal-check internal-strings:: - $(ECHO_NOTHING)operation=$(subst internal-,,$@); \ + $(ECHO_NOTHING_RECURSIVE_MAKE)operation=$(subst internal-,,$@); \ $(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-subdirectories-$$operation \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: \ internal-master-subdirectories-all \ @@ -76,10 +76,10 @@ ifneq ($(PARALLEL_SUBDIRECTORIES),) .PRECIOUS: %.subdirectories %.subdirectories: - $(ECHO_NOTHING)directory=$(basename $*); \ + $(ECHO_NOTHING_RECURSIVE_MAKE)directory=$(basename $*); \ operation=$(subst .,,$(suffix $*)); \ abs_build_dir="$(ABS_GNUSTEP_BUILD_DIR)"; \ - $(ECHO_MAKING_OPERATION_IN_DIRECTORY) \ + $(INSIDE_ECHO_MAKING_OPERATION_IN_DIRECTORY) \ if [ "$${abs_build_dir}" = "." ]; then \ gsbuild="."; \ else \ @@ -89,17 +89,17 @@ ifneq ($(PARALLEL_SUBDIRECTORIES),) $$operation \ GNUSTEP_BUILD_DIR="$$gsbuild" _GNUSTEP_MAKE_PARALLEL=no; then \ :; else exit $$?; \ - fi$(END_ECHO) + fi$(END_ECHO_RECURSIVE_MAKE) # We still do 'install' and 'uninstall' in non-parallel mode, to # prevent any race conditions with the creation of installation # directories. TODO: It would be cool to make this configurable # so you could make it parallel if you so wish. internal-install internal-uninstall:: - $(ECHO_NOTHING)operation=$(subst internal-,,$@); \ + $(ECHO_NOTHING_RECURSIVE_MAKE)operation=$(subst internal-,,$@); \ abs_build_dir="$(ABS_GNUSTEP_BUILD_DIR)"; \ for directory in $(PARALLEL_SUBDIRECTORIES); do \ - $(ECHO_MAKING_OPERATION_IN_DIRECTORY) \ + $(INSIDE_ECHO_MAKING_OPERATION_IN_DIRECTORY) \ if [ "$${abs_build_dir}" = "." ]; then \ gsbuild="."; \ else \ @@ -110,6 +110,6 @@ ifneq ($(PARALLEL_SUBDIRECTORIES),) GNUSTEP_BUILD_DIR="$$gsbuild" _GNUSTEP_MAKE_PARALLEL=no; then \ :; else exit $$?; \ fi; \ - done$(END_ECHO) + done$(END_ECHO_RECURSIVE_MAKE) endif \ No newline at end of file diff --git a/Master/rules.make b/Master/rules.make index fa5c4306..19c9c351 100644 --- a/Master/rules.make +++ b/Master/rules.make @@ -295,20 +295,15 @@ endif # below is 'inlined' here for speed (so that we don't run a separate # shell just to execute that code). %.variables: - @ \ + $(ECHO_NOTHING_RECURSIVE_MAKE) \ instance=$(basename $(basename $*)); \ operation=$(subst .,,$(suffix $(basename $*))); \ type=$(subst -,_,$(subst .,,$(suffix $*))); \ abs_build_dir="$(ABS_GNUSTEP_BUILD_DIR)"; \ if [ "$($(basename $(basename $*))_SUBPROJECTS)" != "" ]; then \ - echo Making $$operation in subprojects of $$type $$instance...; \ + $(INSIDE_ECHO_MAKING_OPERATION_IN_SUBPROJECTS) \ for f in $($(basename $(basename $*))_SUBPROJECTS) __done; do \ if [ $$f != __done ]; then \ - mf=$(MAKEFILE_NAME); \ - if [ ! -f $$f/$$mf -a -f $$f/Makefile ]; then \ - mf=Makefile; \ - echo "WARNING: No $(MAKEFILE_NAME) found for subproject $$f; using 'Makefile'"; \ - fi; \ if [ "$${abs_build_dir}" = "." ]; then \ gsbuild="."; \ else \ @@ -336,7 +331,7 @@ if [ "$($(basename $(basename $*))_SUBPROJECTS)" != "" ]; then \ else \ owning_project_header_dir="../$(OWNING_PROJECT_HEADER_DIR_NAME)"; \ fi; \ - if $(MAKE) -C $$f -f $$mf $(GNUSTEP_MAKE_NO_PRINT_DIRECTORY_FLAG) --no-keep-going $$operation \ + if $(MAKE) -C $$f -f $(MAKEFILE_NAME) $(GNUSTEP_MAKE_NO_PRINT_DIRECTORY_FLAG) --no-keep-going $$operation \ OWNING_PROJECT_HEADER_DIR_NAME="$${owning_project_header_dir}" \ DERIVED_SOURCES="../$(DERIVED_SOURCES)" \ GNUSTEP_BUILD_DIR="$$gsbuild" \ @@ -348,14 +343,14 @@ if [ "$($(basename $(basename $*))_SUBPROJECTS)" != "" ]; then \ fi; \ done; \ fi; \ -echo Making $$operation for $$type $$instance...; \ +$(INSIDE_ECHO_MAKING_OPERATION) \ $(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-$${type}-$$operation \ GNUSTEP_TYPE=$$type \ GNUSTEP_INSTANCE=$$instance \ GNUSTEP_OPERATION=$$operation \ GNUSTEP_BUILD_DIR="$${abs_build_dir}" \ - _GNUSTEP_MAKE_PARALLEL=no \ + _GNUSTEP_MAKE_PARALLEL=no$(END_ECHO_RECURSIVE_MAKE) # # This rule provides exactly the same code as the %.variables one with @@ -372,20 +367,15 @@ $(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ # would be nice to remove this hack without loosing functionality (or # polluting other general-purpose makefiles). %.subprojects: - @ \ + $(ECHO_NOTHING_RECURSIVE_MAKE) \ instance=$(basename $(basename $*)); \ operation=$(subst .,,$(suffix $(basename $*))); \ type=$(subst -,_,$(subst .,,$(suffix $*))); \ abs_build_dir="$(ABS_GNUSTEP_BUILD_DIR)"; \ if [ "$($(basename $(basename $*))_SUBPROJECTS)" != "" ]; then \ - echo Making $$operation in subprojects of $$type $$instance...; \ + $(INSIDE_ECHO_MAKING_OPERATION_IN_SUBPROJECTS) \ for f in $($(basename $(basename $*))_SUBPROJECTS) __done; do \ if [ $$f != __done ]; then \ - mf=$(MAKEFILE_NAME); \ - if [ ! -f $$f/$$mf -a -f $$f/Makefile ]; then \ - mf=Makefile; \ - echo "WARNING: No $(MAKEFILE_NAME) found for subproject $$f; using 'Makefile'"; \ - fi; \ if [ "$${abs_build_dir}" = "." ]; then \ gsbuild="."; \ else \ @@ -413,7 +403,7 @@ if [ "$($(basename $(basename $*))_SUBPROJECTS)" != "" ]; then \ else \ owning_project_header_dir="../$(OWNING_PROJECT_HEADER_DIR_NAME)"; \ fi; \ - if $(MAKE) -C $$f -f $$mf $(GNUSTEP_MAKE_NO_PRINT_DIRECTORY_FLAG) --no-keep-going $$operation \ + if $(MAKE) -C $$f -f $(MAKEFILE_NAME) $(GNUSTEP_MAKE_NO_PRINT_DIRECTORY_FLAG) --no-keep-going $$operation \ OWNING_PROJECT_HEADER_DIR_NAME="$${owning_project_header_dir}" \ DERIVED_SOURCES="../$(DERIVED_SOURCES)" \ GNUSTEP_BUILD_DIR="$$gsbuild" \ @@ -424,7 +414,7 @@ if [ "$($(basename $(basename $*))_SUBPROJECTS)" != "" ]; then \ fi; \ fi; \ done; \ -fi +fi$(END_ECHO_RECURSIVE_MAKE) # # Now rules for packaging - all automatically included diff --git a/Master/serial-subdirectories.make b/Master/serial-subdirectories.make index 6a6fa5e0..8e6e0d8d 100644 --- a/Master/serial-subdirectories.make +++ b/Master/serial-subdirectories.make @@ -50,10 +50,10 @@ ifneq ($(SERIAL_SUBDIRECTORIES),) internal-all internal-install internal-uninstall \ internal-clean internal-distclean \ internal-check internal-strings:: - $(ECHO_NOTHING)operation=$(subst internal-,,$@); \ + $(ECHO_NOTHING_RECURSIVE_MAKE)operation=$(subst internal-,,$@); \ abs_build_dir="$(ABS_GNUSTEP_BUILD_DIR)"; \ for directory in $(SERIAL_SUBDIRECTORIES); do \ - $(ECHO_MAKING_OPERATION_IN_DIRECTORY) \ + $(INSIDE_ECHO_MAKING_OPERATION_IN_DIRECTORY) \ if [ "$${abs_build_dir}" = "." ]; then \ gsbuild="."; \ else \ @@ -64,6 +64,6 @@ ifneq ($(SERIAL_SUBDIRECTORIES),) GNUSTEP_BUILD_DIR="$$gsbuild" _GNUSTEP_MAKE_PARALLEL=no; then \ :; else exit $$?; \ fi; \ - done$(END_ECHO) + done$(END_ECHO_RECURSIVE_MAKE) endif diff --git a/Master/service.make b/Master/service.make index 7149c148..315fb6b0 100644 --- a/Master/service.make +++ b/Master/service.make @@ -34,10 +34,10 @@ internal-all:: $(GNUSTEP_OBJ_DIR) $(SERVICE_NAME:=.all.service.variables) else internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-service-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-service-all @@ -75,5 +75,5 @@ endif internal-strings:: $(SERVICE_NAME:=.strings.service.variables) $(SERVICE_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.service.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.service.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/subproject.make b/Master/subproject.make index 301c19e6..206849ff 100644 --- a/Master/subproject.make +++ b/Master/subproject.make @@ -70,5 +70,5 @@ endif internal-strings:: $(SUBPROJECT_NAME:=.strings.subproject.variables) $(SUBPROJECT_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.subproject.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.subproject.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/test-application.make b/Master/test-application.make index 30d070c0..c147c2d8 100644 --- a/Master/test-application.make +++ b/Master/test-application.make @@ -34,10 +34,10 @@ internal-all:: $(GNUSTEP_OBJ_DIR) $(TEST_APP_NAME:=.all.test-app.variables) else internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-test-app-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-test-app-all @@ -71,7 +71,7 @@ endif internal-strings:: $(TEST_APP_NAME:=.strings.test-app.variables) $(TEST_APP_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.test-app.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.test-app.variables$(END_ECHO_RECURSIVE_MAKE) internal-install:: @ echo Skipping installation of test apps... diff --git a/Master/test-library.make b/Master/test-library.make index 5fa0aabf..aea5afc9 100644 --- a/Master/test-library.make +++ b/Master/test-library.make @@ -34,10 +34,10 @@ internal-all:: $(GNUSTEP_OBJ_DIR) $(TEST_LIBRARY_NAME:=.all.test-lib.variables) else internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-test-lib-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-test-lib-all @@ -71,4 +71,4 @@ internal-check:: $(TEST_LIBRARY_NAME:=.check.test-lib.variables) internal-strings:: $(TEST_LIBRARY_NAME:=.strings.test-lib.variables) $(TEST_LIBRARY_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.test-lib.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.test-lib.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/Master/test-tool.make b/Master/test-tool.make index 803a49ed..acf3f8e3 100644 --- a/Master/test-tool.make +++ b/Master/test-tool.make @@ -33,10 +33,10 @@ internal-all:: $(GNUSTEP_OBJ_DIR) $(TEST_TOOL_NAME:=.all.test-tool.variables) else internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-test-tool-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-test-tool-all @@ -57,7 +57,7 @@ endif internal-strings:: $(TEST_TOOL_NAME:=.strings.test-tool.variables) $(TEST_TOOL_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.test-tool.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.test-tool.variables$(END_ECHO_RECURSIVE_MAKE) internal-install:: @ echo Skipping installation of test tools... diff --git a/Master/tool.make b/Master/tool.make index 2fe1a9cc..3a25da75 100644 --- a/Master/tool.make +++ b/Master/tool.make @@ -46,10 +46,10 @@ else # and when the second one tries to create it, it will fail as it's # already been created). internal-all:: $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \ internal-master-tool-all \ GNUSTEP_BUILD_DIR="$(GNUSTEP_BUILD_DIR)" \ - _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO) + _GNUSTEP_MAKE_PARALLEL=yes$(END_ECHO_RECURSIVE_MAKE) .PHONY: internal-master-tool-all @@ -95,4 +95,4 @@ endif internal-strings:: $(TOOL_NAME:=.strings.tool.variables) $(TOOL_NAME): $(GNUSTEP_OBJ_DIR) - $(ECHO_NOTHING)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going $@.all.tool.variables$(END_ECHO) + $(ECHO_NOTHING_RECURSIVE_MAKE)$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going $@.all.tool.variables$(END_ECHO_RECURSIVE_MAKE) diff --git a/RELEASENOTES b/RELEASENOTES index cc72f172..d19ad54d 100644 --- a/RELEASENOTES +++ b/RELEASENOTES @@ -8,6 +8,13 @@ using a newer version of the make system. 1.1 Version 2.4.0 ================= +`new internalmessages=yes option' + Starting with version 2.4.0, gnustep-make recognized the new + internalmessages=yes option (separate from messages=yes) which + prints all the recursive make invocations that are used. This is + mostly useful to understand how gnustep-make internally works and + is not meant for end-users. + `javadoc is run in quiet mode' Starting with version 2.4.0, javadoc is by default executed with the -quiet option (unless messages=yes is specified), and a diff --git a/gnustep-make-help b/gnustep-make-help index c0f34777..6192f95e 100644 --- a/gnustep-make-help +++ b/gnustep-make-help @@ -45,6 +45,8 @@ Most common options that can be used with any of the targets: MAKEFILE_NAME=xxx (uses makefiles called 'xxx'; the default is 'GNUmakefile'. Note that usually you'd use this option as in '_MAKE_ -f xxx MAKEFILE_NAME=xxx'.) + internalmessages=yes (prints verbosely all the recursive make + invocations. Useful for debugging gnustep-make itself.) You can use multiple of these options at the same time. Examples: diff --git a/messages.make b/messages.make index c72e5487..c1b2df8b 100644 --- a/messages.make +++ b/messages.make @@ -88,10 +88,6 @@ ifneq ($(messages),yes) END_ECHO = ) - # Important - the following is special in that it's inside the shell - # code, not at the beginning. - ECHO_MAKING_OPERATION_IN_DIRECTORY = echo "Making $$operation in $$directory ..."; - # # Translation of messages: # @@ -148,8 +144,6 @@ else END_ECHO = - ECHO_MAKING_OPERATION_IN_DIRECTORY = - endif # The following are warnings that are always displayed, no matter if @@ -170,3 +164,33 @@ WARNING_INFO_PLIST = @(echo "Warning! You have specified Info.plist in $(GNUSTEP echo " Unfortunately, it will not work because Info.plist is automatically generated."; \ echo " To customize Info.plist, please create a $(GNUSTEP_INSTANCE)Info.plist file with your custom entries."; \ echo " $(GNUSTEP_INSTANCE)Info.plist will be automatically merged into Info.plist.") + +# The following are messages that are related to the recursive make invocations. +# Most users will never want to see the recursive make invocations, so we use the messages +# are always displayed unless internalmessages=yes is used. +ifneq ($(internalmessages),yes) + + # ECHO_NOTHING_RECURSIVE_MAKE should be used instead of ECHO_NOTHING + # shell code that does recursive make invocations. It prints nothing, unless + # internalmessages=yes is passed. In that case we display the recursive + # invocation commands. + ECHO_NOTHING_RECURSIVE_MAKE = @( + END_ECHO_RECURSIVE_MAKE = ) + + # Important - the following are special in that it's inside the shell + # code, not at the beginning. + INSIDE_ECHO_MAKING_OPERATION = echo "Making $$operation for $$type $$instance..."; + INSIDE_ECHO_MAKING_OPERATION_IN_DIRECTORY = echo "Making $$operation in $$directory ..."; + INSIDE_ECHO_MAKING_OPERATION_IN_SUBPROJECTS = echo "Making $$operation in subprojects of $$type $$instance..."; + +else + + ECHO_NOTHING_RECURSIVE_MAKE = + END_ECHO_RECURSIVE_MAKE = + + INSIDE_ECHO_MAKING_OPERATION = + INSIDE_ECHO_MAKING_OPERATION_IN_DIRECTORY = + INSIDE_ECHO_MAKING_OPERATION_IN_SUBPROJECTS = + +endif +