mirror of
https://github.com/gnustep/tools-make.git
synced 2025-05-30 00:41:14 +00:00
Implemented new 'make internalmessages=yes' option which prints all recursive 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
This commit is contained in:
parent
f62f8ba47b
commit
36a7ac5659
36 changed files with 155 additions and 102 deletions
23
ChangeLog
23
ChangeLog
|
@ -1,3 +1,26 @@
|
|||
2010-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
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 <nicola.pero@meta-innovation.com>
|
||||
|
||||
* Master/application.make ($(APP_NAME)): Use ECHO_NOTHING and
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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...
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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...
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue