Skip to content

Commit

Permalink
Implemented new 'make internalmessages=yes' option which prints all r…
Browse files Browse the repository at this point in the history
…ecursive make invocations. Never print them (uninteresting/annoying for users) unless internalmessages=yes is used

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@29634 72102866-910b-0410-8b05-ffd578937521
  • Loading branch information
nicola committed Feb 14, 2010
1 parent fd57eea commit 4894271
Show file tree
Hide file tree
Showing 36 changed files with 155 additions and 102 deletions.
23 changes: 23 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
2010-02-14 Nicola Pero <[email protected]>

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 <[email protected]>

* Master/application.make ($(APP_NAME)): Use ECHO_NOTHING and
Expand Down
7 changes: 7 additions & 0 deletions Documentation/releasenotes.texi
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Instance/application.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Instance/bundle.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Instance/ctool.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Instance/framework.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Instance/library.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Instance/objc.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Instance/palette.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Instance/service.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Instance/subproject.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Instance/tool.make
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Master/application.make
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
6 changes: 3 additions & 3 deletions Master/bundle.make
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
6 changes: 3 additions & 3 deletions Master/clibrary.make
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
6 changes: 3 additions & 3 deletions Master/ctool.make
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand 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)
2 changes: 1 addition & 1 deletion Master/framework.make
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions Master/gswapp.make
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
6 changes: 3 additions & 3 deletions Master/gswbundle.make
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand 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)
2 changes: 1 addition & 1 deletion Master/java-tool.make
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion Master/java.make
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions Master/library.make
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
6 changes: 3 additions & 3 deletions Master/objc.make
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand 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)
6 changes: 3 additions & 3 deletions Master/palette.make
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Loading

0 comments on commit 4894271

Please sign in to comment.