GBUILD_TRACE, support for finding out where the build time is spent

See instructions in solenv/gbuild/Trace.mk . This generates a file than can be viewed e.g. in the Chromium tracing view. Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
author: Luboš Luňák <l.lunak@collabora.com> 2020-02-10 10:31:26 +0100
committer: Luboš Luňák <l.lunak@collabora.com> 2020-02-16 14:49:45 +0100
commit: 0adc9b615f118ebb78f5f2edfe0c1c0e41270d57 (patch)
tree: aa84e0793d6e95a94686b6caacc9a0b5e7e8611e /solenv
parent: 52c998be025563802a5056a15352e4608311be1d (diff)
52 files changed, 465 insertions, 52 deletions
diff --git a/solenv/bin/finish-gbuild-trace.py b/solenv/bin/finish-gbuild-trace.py
new file mode 100755
index 000000000000..fcd31fc23fa9
--- /dev/null
+++ b/solenv/bin/finish-gbuild-trace.py
@@ -0,0 +1,137 @@
+#!/usr/bin/env python3
+
+# Process file generated by using GBUILD_TRACE=file with make.
+# The file needs adjusting for viewing in Chromium's "chrome://tracing' URL.
+# See solenv/gbuild/Trace.mk for details.
+
+import os
+import re
+import sys
+
+if len(sys.argv) != 2:
+    print ("Usage: " + sys.argv[0] + " [trace.json]", file=sys.stderr)
+    sys.exit(1)
+
+filename=sys.argv[1]
+
+with open(filename) as infile:
+    lines = [ line.rstrip('\n') for line in infile ]
+
+if len(lines) == 0 :
+    print( "Empty file?", file=sys.stderr)
+    sys.exit(1)
+
+if lines[0] == '{"traceEvents": [':
+    print( "File already processed", file=sys.stderr)
+    sys.exit(3)
+
+# sort items by time (parallel writes may not write them in time order)
+def linekey(line):
+    match = re.match( r'^.*, "ts": ([0-9]*)[0-9][0-9][0-9],.*$', line )
+    assert match, "Unknown line: " + line
+    return int(match.group(1))
+lines.sort( key=linekey )
+
+# 'chrome://tracing' shows several rows, we use those to show build parallelism,
+# but we need to assign the proper ids by allocating them as slots.
+slots = []
+# start time of each slot
+slot_start_time = []
+
+def make_slot_string(type, detail):
+    return type + '#' + detail
+
+def allocate_slot(type, detail):
+    for index in range(len(slots)):
+        if slots[index] == "":
+            slots[index] = make_slot_string(type, detail)
+            return index + 1
+    index = len(slots)
+    slots.append(make_slot_string(type, detail))
+    slot_start_time.append(0)
+    return index + 1
+
+def free_slot(type, detail):
+    for index in range(len(slots)):
+        if slots[index] == make_slot_string(type, detail):
+            slots[index] = ""
+            return index + 1
+    assert False, "free_slot(" + type + "," + detail + ") not found"
+
+# key: Type (e.g. CXX), value: time total
+totals_time = {}
+totals_count = {}
+
+# time of the first item, to rebase all times to 0
+start_time = 0
+
+with open(filename + ".tmp", "w") as outfile:
+    print( '{"traceEvents": [', file=outfile)
+    for iline in range(len(lines)):
+        line = lines[iline]
+        # "ts" needs converting nanoseconds -> milliseconds
+        match = re.match( r'^{"name": "([^"]*)", "ph": "(.)",.*"ts": ([0-9]*)[0-9][0-9][0-9],"args":{"message":"([^"]*)"}.*$', line )
+        if not match:
+            print( "Unknown line: " + line, file=sys.stderr)
+            sys.exit(2)
+        if start_time == 0:
+            start_time = int(match.group(3))
+        # "tid" needs replacing with proper slot
+        tid = "0"
+        # "ph"
+        if match.group(2) == 'B':
+            tid = allocate_slot(match.group(1), match.group(4)) # "name", "args"
+            slot_start_time[tid-1] = int(match.group(3))
+        elif match.group(2) == 'E':
+            tid = free_slot(match.group(1), match.group(4)) # "name", "args"
+            if not match.group(1) in totals_time:
+                totals_time[match.group(1)] = 0
+                totals_count[match.group(1)] = 0
+            totals_time[match.group(1)] += int(match.group(3)) - slot_start_time[tid-1]
+            totals_count[match.group(1)] += 1
+        line = re.sub( r'"ts": [0-9]+,', '"ts": ' + str(int(match.group(3)) - start_time) + ",", line)
+        line = re.sub( r'"tid": 1,', '"tid": ' + str(tid) + ",", line)
+        if match.group(2) == 'i':
+            rline = line
+            # mark as affecting all slots
+            line = re.sub( r'}},$', '}, "s": "p"},', line)
+            print(line, file=outfile)
+            # Chromium search doesn't find 'i' items, add extra 'R' for that
+            rline = re.sub( r', "ph": "i",', ', "ph": "R",', rline)
+            rline = re.sub( r', "tid": [0-9]+,', ',', rline)
+            print(rline, file=outfile)
+        else:
+            print(line, file=outfile)
+        # TODO: By the first time "[DEP]: LNK:Executable/makedepend.exe" is invoked the build tools
+        # are not built yet, so the invocation fails, doesn't abort the build for some reason,
+        # but the matching line about it ending is missing. So add the missing end line if it is
+        # by another start line for it instead of an end line.
+        if match.group(1) == "DEP" and match.group(4) == "[DEP]: LNK:Executable/makedepend.exe" and match.group(2) == "B":
+            for iline2 in range(iline+1,len(lines)): # search following lines
+                line2 = lines[iline2]
+                match2 = re.match( r'^{"name": "([^"]*)", "ph": "(.)",.*"ts": ([0-9]*)[0-9][0-9][0-9],"args":{"message":"([^"]*)"}.*$', line2 )
+                if match2.group(1) == "DEP" and match2.group(4) == "[DEP]: LNK:Executable/makedepend.exe":
+                    if match2.group(2) == "E":
+                        break # it has a matching close
+                    if match2.group(2) == "B":
+                        print(re.sub( r', "ph": "B",', ', "ph": "E",', line), file=outfile) # close the starting line
+                        free_slot(match.group(1), match.group(4))
+                        break
+
+    total_num = 0
+    for total in sorted(totals_time, key=totals_time.get, reverse=True):
+        note = ""
+        if total == "EXTERNAL":
+            note = ',"note": "minimum (cannot detect parallelism)"'
+        print( '{"pid":2,"tid":' + str(total_num) + ',"ts":0,"dur":' + str(totals_time[total]) + ',"ph":"X","name":"' + total
+            + '","args":{"count":"' + str(totals_count[total]) + '"' + note + '}},', file=outfile)
+        total_num += 1
+
+    print( '{"pid":1,"tid":0,"ts":0,"ph":"M","name":"process_name","args":{"name":"gbuild"}},', file=outfile)
+    print( '{"pid":2,"tid":0,"ts":0,"ph":"M","name":"process_name","args":{"name":"totals"}}]}', file=outfile)
+
+for index in range(len(slots)):
+    if slots[index] != "":
+        print( "Unclosed range: " + slots[index], file=sys.stderr)
+
+os.rename(filename + ".tmp", filename)
diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk
index 22d5ad8b533b..32d38166d53f 100644
--- a/solenv/gbuild/AllLangHelp.mk
+++ b/solenv/gbuild/AllLangHelp.mk
@@ -33,6 +33,7 @@ $(dir $(call gb_AllLangHelp_get_target,%))%/.dir :
 $(call gb_AllLangHelp_get_target,%) :
 ifeq ($(ENABLE_HTMLHELP),)
 	$(call gb_Output_announce,$*,$(true),ALH,5)
+	$(call gb_Trace_MakeMark,$*,ALH)
 endif
 	touch $@
 
diff --git a/solenv/gbuild/AllLangMoTarget.mk b/solenv/gbuild/AllLangMoTarget.mk
index 63789f768ec0..e1fbdc732f7c 100644
--- a/solenv/gbuild/AllLangMoTarget.mk
+++ b/solenv/gbuild/AllLangMoTarget.mk
@@ -37,6 +37,7 @@ $(call gb_MoTarget_get_target,%) : \
 		$(gb_Helper_MISCDUMMY) \
 		$(call gb_ExternalExecutable_get_dependencies,python)
 	$(call gb_Output_announce,$*,$(true),MO ,2)
+	$(call gb_Trace_StartRange,$*,MO )
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
 		if test -e $(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po; then \
@@ -45,6 +46,7 @@ $(call gb_MoTarget_get_target,%) : \
 			echo missing $(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po && \
 			$(MSGUNIQ) --force-po $(SRCDIR)/solenv/bin/dummy.po | $(MSGFMT) - -o $@; \
 	        fi)
+	$(call gb_Trace_EndRange,$*,MO )
 
 #$(info $(call gb_MoTarget_get_target,$(1)))
 define gb_MoTarget_MoTarget
diff --git a/solenv/gbuild/AllLangPackage.mk b/solenv/gbuild/AllLangPackage.mk
index f0cf1c92e70c..092716b378ed 100644
--- a/solenv/gbuild/AllLangPackage.mk
+++ b/solenv/gbuild/AllLangPackage.mk
@@ -19,11 +19,12 @@ $(dir $(call gb_AllLangPackage_get_target,%)).dir :
 
 $(call gb_AllLangPackage_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),ALP,3)
+	$(call gb_Trace_MakeMark,$*,ALP)
 	touch $@
 
 .PHONY : $(call gb_AllLangPackage_get_clean_target,%)
 $(call gb_AllLangPackage_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(true),ALP,3)
+	$(call gb_Output_announce,$*,$(false),ALP,3)
 	rm -f $(call gb_AllLangPackage_get_target,$*)
 
 # Define a new package group.
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index 8665644bea78..841baa738e41 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -18,6 +18,7 @@ $(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \
 		$(GBUILDDIR)/gen-autoinstall.py \
 		$(call gb_ExternalExecutable_get_dependencies,python)
 	$(call gb_Output_announce,$*,$(true),AIN,3)
+	$(call gb_Trace_StartRange,$*,AIN)
 	SDKLIBFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
 	   $(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\
 			$(lib) \
@@ -41,6 +42,7 @@ $(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \
 			$${SDKLIBFILE} $${LIBFILE} $${EXEFILE} $${JARFILE} $${PKGFILE} \
 			> $@ \
 	&& rm -f $${SDKLIBFILE} $${LIBFILE} $${EXEFILE} $${JARFILE} $${PKGFILE}
+	$(call gb_Trace_EndRange,$*,AIN)
 
 
 $(call gb_AutoInstall_get_clean_target,%) :
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index a0257708aead..9c97e036fe2b 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -13,7 +13,6 @@ gb_CliConfigTarget_TARGET := $(SRCDIR)/solenv/bin/clipatchconfig.pl
 gb_CliConfigTarget_COMMAND := $(PERL) -w $(gb_CliConfigTarget_TARGET)
 
 define gb_CliConfigTarget__command
-$(call gb_Output_announce,$(2),$(true),CPA,1)
 $(call gb_Helper_abbreviate_dirs,\
 	$(gb_CliConfigTarget_COMMAND) $(3) $(CLI_CONFIG_VERSIONFILE) $(1) \
 )
@@ -23,7 +22,10 @@ $(dir $(call gb_CliConfigTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_CliConfigTarget_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),CPA,1)
+	$(call gb_Trace_StartRange,$*,CPA)
 	$(call gb_CliConfigTarget__command,$@,$*,$<)
+	$(call gb_Trace_EndRange,$*,CPA)
 
 $(call gb_CliConfigTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),CPA,1)
@@ -51,7 +53,6 @@ endef
 gb_CliAssemblyTarget_KEYFILE_DEFAULT := $(SRCDIR)/cli_ure/source/cliuno.snk
 
 define gb_CliAssemblyTarget__command
-$(call gb_Output_announce,$(2),$(true),AL ,2)
 $(call gb_Helper_abbreviate_dirs,\
 	$(GNUCOPY) $(CLI_ASSEMBLY_KEYFILE) $(1).tmp.snk && \
 	al \
@@ -76,7 +77,10 @@ $(call gb_CliAssemblyTarget_get_target,%) :
 	$(if $(strip $(CLI_ASSEMBLY_VERSION)),,$(call gb_Output_error,assembly version not set))
 	$(if $(strip $(CLI_ASSEMBLY_CONFIGFILE)),,$(call gb_Output_error,assembly configuration file not set))
 	$(if $(strip $(CLI_ASSEMBLY_OUTFILE)),,$(call gb_Output_error,assembly name not set))
+	$(call gb_Output_announce,$*,$(true),AL ,2)
+	$(call gb_Trace_StartRange,$*,AL )
 	$(call gb_CliAssemblyTarget__command,$@,$*,$<)
+	$(call gb_Trace_EndRange,$*,AL )
 
 $(call gb_CliAssemblyTarget_get_assembly_target,%) :
 	touch $@
@@ -142,6 +146,7 @@ gb_CliAssembly_get_dll = $(call gb_CliAssemblyTarget_get_dll,$(1))
 
 $(call gb_CliAssembly_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),CLA,3)
+	$(call gb_Trace_MakeMark,$*,CLA)
 	mkdir -p $(dir $@) && touch $@
 
 .PHONY : $(call gb_CliAssembly_get_clean_target,%)
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 275f0d68f439..e6af83891925 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -35,7 +35,6 @@ gb_CliLibrary__get_generated_source = $(WORKDIR)/$(1).cs
 
 # csc has silly problems handling files passed on command line
 define gb_CliLibrary__command
-$(call gb_Output_announce,$(2),$(true),CSC,3)
 	csc \
 		$(call gb_CliLibrary__get_csflags) \
 		$(CLI_CSCFLAGS) \
@@ -80,7 +79,10 @@ $$(eval $$(call gb_Module_register_target,$(call gb_CliLibrary_get_target,$(1)),
 $(call gb_Helper_make_userfriendly_targets,$(1),CliLibrary)
 
 $(call gb_CliLibrary_get_target,$(1)) :
+	$$(call gb_Output_announce,$(1),$(true),CSC,3)
+	$$(call gb_Trace_StartRange,$(1),CSC)
 	$$(call gb_CliLibrary__command,$$@,$(1))
+	$$(call gb_Trace_EndRange,$(1),CSC)
 
 endef
 
diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk
index 6ff28ce6f842..9e19ccd709b5 100644
--- a/solenv/gbuild/CliNativeLibrary.mk
+++ b/solenv/gbuild/CliNativeLibrary.mk
@@ -15,7 +15,6 @@ gb_CliNativeLibrary_EXT := $(gb_CliAssembly_POLICYEXT)
 gb_CliNativeLibrary__get_library = $(call gb_CliAssembly_get_dll,$(1))
 
 define gb_CliNativeLibrary__command
-$(call gb_Output_announce,$(2),$(true),SN ,4)
 $(call gb_Helper_abbreviate_dirs,\
 	$(GNUCOPY) $(CLI_NATIVE_LIBRARY) $(1).tmp && \
 	sn -R $(1).tmp $(CLI_NATIVE_KEYFILE) && \
@@ -57,8 +56,10 @@ $$(eval $$(call gb_Module_register_target,$(call gb_CliNativeLibrary_get_target,
 $(call gb_Helper_make_userfriendly_targets,$(1),CliNativeLibrary)
 
 $(call gb_CliNativeLibrary_get_target,$(1)) :
+	$$(call gb_Output_announce,$(1),$(true),SN ,4)
+	$$(call gb_Trace_StartRange,$(1),SN )
 	$$(call gb_CliNativeLibrary__command,$$@,$(1))
-
+	$$(call gb_Trace_EndRange,$(1),SN )
 
 endef
 
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index d12dc62f7998..20b840bf2f25 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -17,7 +17,6 @@ gb_CliUnoApi_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker)
 gb_CliUnoApi_COMMAND := $(call gb_Executable_get_command,climaker)
 
 define gb_CliUnoApi__command
-$(call gb_Output_announce,$(2),$(true),CLI,4)
 $(call gb_Helper_abbreviate_dirs,\
 	$(gb_CliUnoApi_COMMAND) \
 		--out $(1) \
@@ -62,7 +61,10 @@ $(call gb_Helper_make_userfriendly_targets,$(1),CliUnoApi)
 
 
 $(call gb_CliUnoApi_get_target,$(1)) : $(gb_CliUnoApi_DEPS)
+	$$(call gb_Output_announce,$(1),$(true),CLI,4)
+	$$(call gb_Trace_StartRange,$(1),CLI)
 	$$(call gb_CliUnoApi__command,$$@,$(1))
+	$$(call gb_Trace_EndRange,$(1),CLI)
 
 endef
 
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index f56a980c3fcc..8b1ad971bb02 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -26,7 +26,6 @@ gb_ComponentTarget_get_source = $(SRCDIR)/$(1).component
 # is a mapping from library filenames to direct pointers to the
 # corresponding PREFIX_component_getFactory functions.
 define gb_ComponentTarget__command
-$(call gb_Output_announce,$(2),$(true),CMP,1)
 $(if $(LIBFILENAME),,$(call gb_Output_error,No LIBFILENAME set at component target: $(1)))
 	mkdir -p $(dir $(1)) && \
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
@@ -47,7 +46,10 @@ $(call gb_ComponentTarget_get_target,%) : \
 		$(SRCDIR)/Repository.mk \
 		$(SRCDIR)/RepositoryFixes.mk \
 		| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
+	$(call gb_Output_announce,$*,$(true),CMP,1)
+	$(call gb_Trace_StartRange,$*,CMP)
 	$(call gb_ComponentTarget__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,CMP)
 
 define gb_ComponentTarget_ComponentTarget
 $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 378a3d5625b4..028ed63ac7a4 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -69,7 +69,6 @@ gb_XcsTarget_XSLT_SchemaTrim := $(SRCDIR)/officecfg/util/schema_trim.xsl
 gb_XcsTarget_DTD_Schema := $(SRCDIR)/officecfg/registry/component-schema.dtd
 
 define gb_XcsTarget__command
-$(call gb_Output_announce,$(2),$(true),XCS,1)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_Configuration_XSLTCOMMAND) --nonet \
@@ -95,7 +94,10 @@ $(call gb_XcsTarget_get_target,%) : \
 	    $(gb_XcsTarget_XSLT_SchemaVal) $(gb_XcsTarget_XSLT_Sanity) \
 		$(gb_XcsTarget_XSLT_SchemaTrim) $(gb_XcsTarget_DTD_Schema) \
 		| $(gb_Configuration_XSLTCOMMAND_DEPS)
+	$(call gb_Output_announce,$*,$(true),XCS,1)
+	$(call gb_Trace_StartRange,$*,XCS)
 	$(call gb_XcsTarget__command,$@,$*,$(filter %.xcs,$^))
+	$(call gb_Trace_EndRange,$*,XCS)
 
 $(call gb_XcsTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),XCS,1)
@@ -109,7 +111,6 @@ gb_XcuDataTarget_XSLT_DataVal := $(SRCDIR)/officecfg/util/data_val.xsl
 gb_XcuDataTarget_DTD_ComponentUpdate := $(SRCDIR)/officecfg/registry/component-update.dtd
 
 define gb_XcuDataTarget__command
-$(call gb_Output_announce,$(2),$(true),XCU,2)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_Configuration_XSLTCOMMAND) --nonet \
@@ -133,7 +134,10 @@ endef
 $(call gb_XcuDataTarget_get_target,%) : $(gb_XcuDataTarget_XSLT_DataVal) \
 		$(gb_XcuTarget_XSLT_AllLang) $(gb_XcuDataTarget_DTD_ComponentUpdate) \
 		| $(gb_Configuration_XSLTCOMMAND_DEPS)
+	$(call gb_Output_announce,$*,$(true),XCU,2)
+	$(call gb_Trace_StartRange,$*,XCU)
 	$(call gb_XcuDataTarget__command,$@,$*,$(filter %.xcu,$^))
+	$(call gb_Trace_EndRange,$*,XCU)
 
 $(call gb_XcuDataTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),XCU,2)
@@ -152,7 +156,6 @@ $(call gb_XcsTarget_get_target,$(basename $(subst -,.,$(basename $(1)))).xcs)
 endef
 
 define gb_XcuModuleTarget__command
-$(call gb_Output_announce,$(2),$(true),XCM,3)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_Configuration_XSLTCOMMAND) --nonet \
@@ -169,7 +172,10 @@ endef
 $(call gb_XcuModuleTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang) \
 		| $(gb_Configuration_XSLTCOMMAND_DEPS)
 	$(if $(filter %.xcu,$^),,$(error There is no target $(call gb_XcuModuleTarget_get_target,$*)))
+	$(call gb_Output_announce,$*,$(true),XCM,3)
+	$(call gb_Trace_StartRange,$*,XCM)
 	$(call gb_XcuModuleTarget__command,$@,$*,$(filter %.xcu,$^),$(filter %.xcs,$^))
+	$(call gb_Trace_EndRange,$*,XCM)
 
 $(call gb_XcuModuleTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),XCM,3)
@@ -187,7 +193,6 @@ gb_XcuLangpackTarget__get_target_with_lang = \
 gb_XcuLangpackTarget_SED_delcomment := $(SRCDIR)/officecfg/util/delcomment.sed
 
 define gb_XcuLangpackTarget__command
-$(call gb_Output_announce,$(2),$(true),XCL,1)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	sed -e "s/__LANGUAGE__/$(LANGUAGE)/" -f $(gb_XcuLangpackTarget_SED_delcomment)\
@@ -196,7 +201,10 @@ endef
 
 $(call gb_XcuLangpackTarget_get_target,%) : \
 		$(gb_XcuLangpackTarget_SED_delcomment)
+	$(call gb_Output_announce,$*,$(true),XCL,1)
+	$(call gb_Trace_StartRange,$*,XCL)
 	$(call gb_XcuLangpackTarget__command,$@,$*,$(filter %.tmpl,$^))
+	$(call gb_Trace_EndRange,$*,XCL)
 
 $(call gb_XcuLangpackTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),XCL,1)
@@ -211,7 +219,6 @@ gb_XcuMergeTarget_CFGEXDEPS := $(call gb_Executable_get_runtime_dependencies,cfg
 gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex)
 
 define gb_XcuMergeTarget__command
-$(call gb_Output_announce,$(2),$(true),XCX,1)
 MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
@@ -226,7 +233,10 @@ endef
 
 $(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXDEPS)
 	$(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES)))),\
+		$(call gb_Output_announce,$*,$(true),XCX,1) \
+		$(call gb_Trace_StartRange,$*,XCX) \
 		$(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),\
+		$(call gb_Trace_EndRange,$*,XCX) \
 		mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@)
 
 $(call gb_XcuMergeTarget_get_clean_target,%) :
@@ -249,7 +259,6 @@ endef
 
 # locale is extracted from the stem (parameter $(2))
 define gb_XcuResTarget__command
-$(call gb_Output_announce,$(2),$(true),XCR,2)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_Configuration_XSLTCOMMAND) --nonet \
@@ -266,7 +275,10 @@ endef
 
 $(call gb_XcuResTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang) \
 		| $(gb_Configuration_XSLTCOMMAND_DEPS)
+	$(call gb_Output_announce,$*,$(true),XCR,2)
+	$(call gb_Trace_StartRange,$*,XCR)
 	$(call gb_XcuResTarget__command,$@,$*,$(filter %.xcu,$^))
+	$(call gb_Trace_EndRange,$*,XCR)
 
 $(call gb_XcuResTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),XCR,2)
@@ -298,6 +310,7 @@ $(call gb_Configuration_get_clean_target,%) :
 
 $(call gb_Configuration_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),CFG,4)
+	$(call gb_Trace_MakeMark,$*,CFG)
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && touch $@)
 
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 1eb954c4242d..602dba107947 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -109,6 +109,7 @@ ifneq ($(gb_SUPPRESS_TESTS),)
 	@true
 else
 	$(call gb_Output_announce,$*,$(true),CUT,2)
+	$(call gb_Trace_StartRange,$*,CUT)
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
 		rm -fr $@.user && cp -r $(WORKDIR)/unittest $@.user && \
@@ -143,6 +144,7 @@ else
 					RET=$$?; \
 					$(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> $@.log 2>&1;) \
 				cat $@.log; $(gb_CppunitTest_UNITTESTFAILED) Cppunit $*)))
+	$(call gb_Trace_EndRange,$*,CUT)
 endif
 
 define gb_CppunitTest_CppunitTest
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 28ffc16af22f..27ce89fba06f 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -23,6 +23,7 @@ $(call gb_CustomTarget_get_workdir,%)/.dir :
 
 $(call gb_CustomTarget_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),CUS,3)
+	$(call gb_Trace_MakeMark,$*,CUS)
 	touch $@
 
 .PHONY: $(call gb_CustomTarget_get_clean_target,%)
@@ -55,10 +56,12 @@ ifneq ($(WITH_LANG),)
 # $(call gb_CustomTarget_ulfex__command,ulftarget,ulfsource,pofiles)
 define gb_CustomTarget_ulfex__command
 $(call gb_Output_announce,$(1),$(true),ULF,1)
+	$(call gb_Trace_StartRange,$(1),ULF)
 MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(3)) && \
 $(call gb_Helper_abbreviate_dirs,\
 	$(call gb_Executable_get_command,ulfex) -i $(2) -o $(1) -m $${MERGEINPUT} -l all) && \
 rm -rf $${MERGEINPUT}
+	$(call gb_Trace_EndRange,$(1),ULF)
 endef
 
 else
@@ -103,6 +106,7 @@ $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx : \
 		$(SRCDIR)/$(3)/$(4).hxx.head \
 		$(SRCDIR)/$(3)/$(4).hxx.tail
 	$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,PRL,1)
+	$$(call gb_Trace_StartRange,$$(subst $(WORKDIR)/,,$$@),PRL)
 	mkdir -p $(call gb_CustomTarget_get_workdir,$(1))/misc \
 	    	$(call gb_CustomTarget_get_workdir,$(1)) \
 		$(call gb_CustomTarget_get_workdir,$(1))/$(2)/token
@@ -118,6 +122,7 @@ $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx : \
 		$(SRCDIR)/$(3)/$(4).hxx.tail \
 		> $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx \
 	&& touch $$@
+	$$(call gb_Trace_EndRange,$$(subst $(WORKDIR)/,,$$@),PRL)
 
 $(call gb_CustomTarget_get_target,$(1)) : \
     $(call gb_CustomTarget_get_workdir,$(1))/$(5)names.inc \
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index 6c4e6a7490e7..12a42d16f46d 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -15,7 +15,6 @@ gb_ThesaurusIndexTarget_INDEX_DEPS := $(call gb_Executable_get_runtime_dependenc
 gb_ThesaurusIndexTarget_INDEX_COMMAND := $(call gb_Executable_get_command,idxdict)
 
 define gb_ThesaurusIndexTarget__command
-$(call gb_Output_announce,$(2),$(true),THI,1)
 $(call gb_Helper_abbreviate_dirs,\
 	$(gb_ThesaurusIndexTarget_INDEX_COMMAND) -o $(1) < $(THESAURUS_FILE) \
 )
@@ -29,7 +28,10 @@ $(dir $(call gb_ThesaurusIndexTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_ThesaurusIndexTarget_get_target,%) : $(gb_ThesaurusIndexTarget_INDEX_DEPS) | $(gb_ThesaurusIndexTarget_CHECK_TARGET)
+	$(call gb_Output_announce,$*,$(true),THI,1)
+	$(call gb_Trace_StartRange,$*,THI)
 	$(call gb_ThesaurusIndexTarget__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,THI)
 
 .PHONY : $(call gb_ThesaurusIndexTarget_get_clean_target,%)
 $(call gb_ThesaurusIndexTarget_get_clean_target,%) :
@@ -58,7 +60,6 @@ gb_PropertiesTranslateTarget_COMMAND := $(call gb_Executable_get_command,propex)
 gb_PropertiesTranslateTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,propex)
 
 define gb_PropertiesTranslateTarget__command
-$(call gb_Output_announce,$(2),$(true),PRP,1)
 $(call gb_Helper_abbreviate_dirs, \
 	$(if $(filter-out qtz,$(LANGUAGE)), \
 		MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILE)) && \
@@ -85,7 +86,10 @@ $(dir $(call gb_PropertiesTranslateTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_PropertiesTranslateTarget_get_target,%) : $(gb_PropertiesTranslateTarget_DEPS)
+	$(call gb_Output_announce,$*,$(true),PRP,1)
+	$(call gb_Trace_StartRange,$*,PRP)
 	$(call gb_PropertiesTranslateTarget__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,PRP)
 
 .PHONY : $(call gb_PropertiesTranslateTarget_get_clean_target,%)
 $(call gb_PropertiesTranslateTarget_get_clean_target,%) :
@@ -122,7 +126,6 @@ gb_DescriptionTranslateTarget_COMMAND := $(call gb_Executable_get_command,xrmex)
 gb_DescriptionTranslateTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,xrmex)
 
 define gb_DescriptionTranslateTarget__command
-$(call gb_Output_announce,$(2),$(true),XRM,1)
 $(call gb_Helper_abbreviate_dirs,\
 	MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
 	$(gb_DescriptionTranslateTarget_COMMAND) \
@@ -141,7 +144,10 @@ $(dir $(call gb_DescriptionTranslateTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_DescriptionTranslateTarget_get_target,%) : $(gb_DescriptionTranslateTarget_DEPS)
+	$(call gb_Output_announce,$*,$(true),XRM,1)
+	$(call gb_Trace_StartRange,$*,XRM)
 	$(call gb_DescriptionTranslateTarget__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,XRM)
 
 .PHONY : $(call gb_DescriptionTranslateTarget_get_clean_target,%)
 $(call gb_DescriptionTranslateTarget_get_clean_target,%) :
@@ -195,6 +201,7 @@ $(dir $(call gb_Dictionary_get_target,%))%/.dir :
 
 $(call gb_Dictionary_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),DIC,3)
+	$(call gb_Trace_MakeMark,$*,DIC)
 	touch $@
 
 .PHONY : $(call gb_Dictionary_get_clean_target,%)
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index f23165e1d7bb..e069acf325f7 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -72,12 +72,15 @@ $(call gb_Extension__get_preparation_target,%) :
 ifeq ($(strip $(gb_WITH_LANG)),)
 $(call gb_Extension_get_workdir,%)/description.xml : $(gb_Helper_LANGSTARGET)
 	$(call gb_Output_announce,$*/description.xml,$(true),CPY,3)
+	$(call gb_Trace_StartRange,$*/description.xml,CPY)
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(call gb_Extension_get_workdir,$*) && \
 		cp -f $(LOCATION)/description.xml $@)
+	$(call gb_Trace_EndRange,$*/description.xml,CPY)
 else
 $(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXDEPS) $(gb_Helper_LANGSTARGET)
 	$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
+	$(call gb_Trace_StartRange,$*/description.xml,XRM)
 	MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(call gb_Extension_get_workdir,$*) && \
@@ -87,6 +90,7 @@ $(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXDEPS) $
 			-m $${MERGEINPUT} \
 			-l all) && \
 	rm -rf $${MERGEINPUT}
+	$(call gb_Trace_EndRange,$*/description.xml,XRM)
 
 endif
 
@@ -95,6 +99,7 @@ endif
 $(call gb_Extension_get_target,%) : \
 		$(call gb_Extension_get_workdir,%)/description.xml
 	$(call gb_Output_announce,$*,$(true),OXT,3)
+	$(call gb_Trace_StartRange,$*,OXT)
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(call gb_Extension_get_rootdir,$*)/META-INF \
 			$(if $(LICENSE),$(call gb_Extension_get_rootdir,$*)/registration) && \
@@ -107,6 +112,7 @@ $(call gb_Extension_get_target,%) : \
 		$(gb_Extension_ZIPCOMMAND) -rX --filesync --must-match \
 			$(call gb_Extension_get_target,$*) \
 			`cat $${ZIPFILES} | tr -d '\r'` && rm $${ZIPFILES})
+	$(call gb_Trace_EndRange,$*,OXT)
 
 # set file list and location of manifest and description files
 # register target and clean target
@@ -304,6 +310,7 @@ $(call gb_Extension_get_rootdir,$(1))/$(2) \
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) \
 		$(gb_Extension_PROPMERGEDEPS)
 	$$(call gb_Output_announce,$(2),$(true),PRP,3)
+	$$(call gb_Trace_StartRange,$(2),PRP)
 	$$(call gb_Helper_abbreviate_dirs, \
 		mkdir -p $$(dir $$@) && \
 		$(if $(filter qtz,$(4)), \
@@ -319,6 +326,7 @@ $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) \
 			) \
 		) \
 	)
+	$$(call gb_Trace_EndRange,$(2),PRP)
 
 endef
 
@@ -354,6 +362,7 @@ $(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \
 $(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \
         $(2)/$(or $(4),$(3))
 	$$(call gb_Output_announce,$(1) $(3) $(5),$(true),XHP,3)
+	$$(call gb_Trace_StartRange,$(1) $(3) $(5),XHP)
 	$$(call gb_Helper_abbreviate_dirs, \
 		mkdir -p $$(dir $$@) && \
 		$(if $(filter qtz,$(5)), \
@@ -371,6 +380,7 @@ $(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \
 		) && \
 		touch $(call gb_Extension_get_rootdir,$(1))/help/$(5)-xhp.done \
 	)
+	$$(call gb_Trace_EndRange,$(1) $(3) $(5),XHP)
 
 endef
 
@@ -405,6 +415,7 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(5)/$(3) : \
 $(call gb_Extension_get_rootdir,$(1))/help/$(5)/$(3) : \
         $(2)/$(or $(4),$(3))
 	$$(call gb_Output_announce,$(1) $(3) $(5),$(true),TRE,3)
+	$$(call gb_Trace_StartRange,$(1) $(3) $(5),TRE)
 	$$(call gb_Helper_abbreviate_dirs, \
 		mkdir -p $$(dir $$@) && \
 		$(if $(filter qtz,$(5)), \
@@ -424,6 +435,7 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(5)/$(3) : \
 			) \
 		) \
 	)
+	$$(call gb_Trace_EndRange,$(1) $(3) $(5),XHP)
 
 endef
 
@@ -442,6 +454,7 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(2).done : \
         $(SRCDIR)/xmlhelp/util/idxcontent.xsl | \
         $(call gb_Extension_get_rootdir,$(1))/help/.dir
 	$$(call gb_Output_announce,$(1) $(2),$(true),XHC,3)
+	$$(call gb_Trace_StartRange,$(1) $(2),XHC)
 	$$(call gb_Helper_abbreviate_dirs, \
         mkdir -p $$(basename $$@) && \
         $$(gb_Extension_HELPLINKERCOMMAND) -mod help \
@@ -458,6 +471,7 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(2).done : \
             -dir $$(basename $$@) && \
             rm -fr $$(basename $$@)/caption $$(basename $$@)/content && \
         touch $$@)
+	$$(call gb_Trace_EndRange,$(1) $(2),XHC)
 
 endef
 
diff --git a/solenv/gbuild/ExtensionPackage.mk b/solenv/gbuild/ExtensionPackage.mk
index e2c99a4764b6..6a86aa0270b6 100644
--- a/solenv/gbuild/ExtensionPackage.mk
+++ b/solenv/gbuild/ExtensionPackage.mk
@@ -23,12 +23,14 @@ $(call gb_ExtensionPackage_get_preparation_target,%) :
 
 $(call gb_ExtensionPackage_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),OXP,3)
+	$(call gb_Trace_StartRange,$*,OXP)
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) \
 		&& rm -rf $(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/$* \
 		&& unzip -q $(ZIPFILE) -d $(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/$* \
 		&& zipinfo -1 $(ZIPFILE) | grep -v '/$$' \
 			| sed s+^+$(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/$*/+ > $@)
+	$(call gb_Trace_EndRange,$*,OXP)
 
 # call gb_ExtensionPackage_ExtensionPackage_internal,package,oxt
 define gb_ExtensionPackage_ExtensionPackage_internal
@@ -69,6 +71,7 @@ $(call gb_ExtensionPackageSet_get_clean_target,%) :
 
 $(call gb_ExtensionPackageSet_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),OXS,3)
+	$(call gb_Trace_MakeMark,$*,OXS)
 	mkdir -p $(dir $@) && touch $@
 
 # call gb_ExtensionPackageSet_ExtensionPackageSet,set
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index 670106bd95bd..05bfa6d0cd18 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -30,6 +30,7 @@ $(dir $(call gb_ExternalPackage_get_target,%))%/.dir :
 
 $(call gb_ExternalPackage_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),EPK,2)
+	$(call gb_Trace_MakeMark,$*,EPK)
 	touch $@
 
 $(call gb_ExternalPackage_get_clean_target,%) :
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 402437d6f567..afb76c3a19d8 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -57,6 +57,7 @@ $(call gb_ExternalProject_get_preparation_target,%) :
 
 $(call gb_ExternalProject_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),PRJ,3)
+	$(call gb_Trace_MakeMark,$*,PRJ)
 	touch $@
 
 .PHONY : $(call gb_ExternalProject_get_clean_target,%)
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 17569a626e6f..0869750683b9 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -15,7 +15,6 @@ gb_Gallery_TRANSLATE := $(SRCDIR)/solenv/bin/desktop-translate.pl
 gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery
 
 define gb_Gallery__command
-$(call gb_Output_announce,$(2),$(true),GAL,1)
 $(call gb_Helper_abbreviate_dirs,\
 	rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
 	RESPONSEFILE=$(call var2file,$(shell $(call gb_MKTEMP)),100,$(GALLERY_FILES)) && \
@@ -34,7 +33,6 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 
 define gb_Gallery__command_str
-$(call gb_Output_announce,$(2),$(true),STR,1)
 cp -f $(GALLERY_STRFILE) $@ && \
 $(PERL) $(gb_Gallery_TRANSLATE) \
 		--ext "str" --key "name" \
@@ -52,7 +50,10 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
 
 $(call gb_Gallery_get_target,%) : \
 		$(call gb_Executable_get_runtime_dependencies,gengal)
+	$(call gb_Output_announce,$*,$(true),GAL,1)
+	$(call gb_Trace_StartRange,$*,GAL)
 	$(call gb_Gallery__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,GAL)
 
 $(call gb_Gallery__get_final_target,%) :
 	touch $@
@@ -65,7 +66,10 @@ $(call gb_Gallery_get_workdir,%).ulf : \
 			$(gb_POLOCATION)/$(lang)/extras/source/gallery/share.po))
 
 $(call gb_Gallery_get_workdir,%).str : $(gb_Gallery_TRANSLATE)
+	$(call gb_Output_announce,$*,$(true),STR,1)
+	$(call gb_Trace_StartRange,$*,STR)
 	$(call gb_Gallery__command_str,$@,$*)
+	$(call gb_Trace_EndRange,$*,STR)
 
 # there must be a rule for these since they are targets due to Package
 $(call gb_Gallery_get_workdir,%).sdg :
diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk
index 05bbcf43a93e..92f176436989 100644
--- a/solenv/gbuild/GeneratedPackage.mk
+++ b/solenv/gbuild/GeneratedPackage.mk
@@ -35,6 +35,7 @@ $(call gb_GeneratedPackage_get_target,%) :| $(foreach pair,$(PACKAGE_DIRS),$(PAC
 # on windows with all languages the processing of help can truncate the find command otherwise
 $(call gb_GeneratedPackage_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),GPK,2)
+	$(call gb_Trace_StartRange,$*,GPK)
 	$(if $(PACKAGE_DIRS),,$(call gb_Output_error,no dirs were added))
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -rf $(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair))) \
@@ -44,6 +45,7 @@ $(call gb_GeneratedPackage_get_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		$(FIND) $(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair))) \( -type f -o -type l \) -print | LC_ALL=C $(SORT) > $@ \
 	)
+	$(call gb_Trace_EndRange,$*,GPK)
 
 .PHONY : $(call gb_GeneratedPackage_get_clean_target,%)
 $(call gb_GeneratedPackage_get_clean_target,%) :
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 821ed59ff68c..780fb55aebc6 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -37,7 +37,6 @@ gb_HelpTranslatePartTarget_DEPS := $(call gb_Executable_get_runtime_dependencies
 gb_HelpTranslatePartTarget_COMMAND := $(call gb_Executable_get_command,helpex)
 
 define gb_HelpTranslatePartTarget__command
-$(call gb_Output_announce,$(2),$(true),HPX,1)
 HELPFILES=$(call var2file,$(shell $(gb_MKTEMP)),100,$(sort $(filter %.xhp,$(3)))) && \
 $(call gb_Helper_abbreviate_dirs, \
 	$(if $(filter-out qtz,$(HELP_LANG)), \
@@ -65,7 +64,10 @@ $(dir $(call gb_HelpTranslatePartTarget_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_HelpTranslatePartTarget_get_target,%) : $(gb_HelpTranslatePartTarget_DEPS)
+	$(call gb_Output_announce,$*,$(true),HPX,1)
+	$(call gb_Trace_StartRange,$*,HPX)
 	$(call gb_HelpTranslatePartTarget__command,$@,$*,$^)
+	$(call gb_Trace_EndRange,$*,HPX)
 
 .PHONY : $(call gb_HelpTranslatePartTarget_get_clean_target,%)
 $(call gb_HelpTranslatePartTarget_get_clean_target,%) :
@@ -116,6 +118,7 @@ $(dir $(call gb_HelpTranslateTarget_get_target,%))%/.dir :
 
 $(call gb_HelpTranslateTarget_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),XHP,2)
+	$(call gb_Trace_MakeMark,$*,XHP)
 	touch $@
 
 $(call gb_HelpTranslateTarget__get_any_translated_target,%) :
@@ -186,7 +189,6 @@ gb_HelpTreeTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,treex)
 gb_HelpTreeTarget_COMMAND := $(call gb_Executable_get_command,treex)
 
 define gb_HelpTreeTarget__command
-$(call gb_Output_announce,$(2),$(true),TRE,1)
 $(call gb_Helper_abbreviate_dirs,\
 	$(if $(filter-out qtz,$(HELP_LANG)), \
 		POFILES=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
@@ -218,7 +220,10 @@ $(dir $(call gb_HelpTreeTarget_get_target,%))%/.dir :
 $(call gb_HelpTreeTarget_get_target,%) : $(gb_HelpTreeTarget_DEPS)
 	$(if $(HELP_TEXTDIR),,$(call gb_Output_error,HelpTreeTarget: no help text dir for .tree was set))
 	$(if $(HELP_TREE),,$(call gb_Output_error,HelpTreeTarget: no .tree file to translate was set))
+	$(call gb_Output_announce,$*,$(true),TRE,1)
+	$(call gb_Trace_StartRange,$*,TRE)
 	$(call gb_HelpTreeTarget__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,TRE)
 
 .PHONY : $(call gb_HelpTreeTarget_get_clean_target,%)
 $(call gb_HelpTreeTarget_get_clean_target,%) :
@@ -284,7 +289,6 @@ gb_HelpLinkTarget_DEPS := \
 # the index files in the .idxl dir are created by HelpIndexer,
 # the ones outside the dir by HelpLinker
 define gb_HelpLinkTarget__command
-$(call gb_Output_announce,$(2),$(true),HLK,3)
 	$(if $(HELP_INDEXED),rm -rf $(addprefix $(HELP_WORKDIR)/,$(HELP_INDEXED)) && \)
 RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
 	-lang $(HELP_LANG) \
@@ -320,7 +324,10 @@ $(dir $(call gb_HelpLinkTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_HelpLinkTarget_get_target,%) : $(gb_HelpLinkTarget_DEPS)
+	$(call gb_Output_announce,$*,$(true),HLK,3)
+	$(call gb_Trace_StartRange,$*,HLK)
 	$(call gb_HelpLinkTarget__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,HLK)
 
 .PHONY : $(call gb_HelpLinkTarget_get_clean_target,%)
 $(call gb_HelpLinkTarget_get_clean_target,%) :
@@ -428,7 +435,6 @@ gb_HelpIndexTarget_COMMAND := $(call gb_Executable_get_command,HelpIndexer)
 # first delete the index stuff since when it is generated an existing _0.cfs
 # will not be overwritten; instead a new _1.cfs etc. created until disk is full
 define gb_HelpIndexTarget__command
-$(call gb_Output_announce,$*,$(true),HIX,3)
 $(call gb_Helper_abbreviate_dirs,\
 	(\
 		rm -rf $(HELP_WORKDIR)/$(HELP_MODULE).idxl \
@@ -449,7 +455,10 @@ $(dir $(call gb_HelpIndexTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_HelpIndexTarget_get_target,%) : $(gb_HelpIndexTarget_DEPS)
+	$(call gb_Output_announce,$*,$(true),HIX,3)
+	$(call gb_Trace_StartRange,$*,HIX)
 	$(call gb_HelpIndexTarget__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,HIX)
 
 .PHONY : $(call gb_HelpIndexTarget_get_clean_target,%)
 $(call gb_HelpIndexTarget_get_clean_target,%) :
@@ -475,7 +484,6 @@ endef
 gb_HelpJarTarget_COMMAND := zip
 
 define gb_HelpJarTarget__get_command
-$(call gb_Output_announce,$*,$(true),HEJ,3)
 cd $(HELP_WORKDIR) && \
 $(gb_HelpJarTarget_COMMAND) -q -0 -rX --filesync --must-match $(HELP_MODULE).jar text/$(HELP_MODULE) && \
 touch $@
@@ -488,7 +496,10 @@ $(dir $(call gb_HelpJarTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_HelpJarTarget_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),HEJ,3)
+	$(call gb_Trace_StartRange,$*,HEJ)
 	$(call gb_HelpJarTarget__get_command,$@,$*)
+	$(call gb_Trace_EndRange,$*,HEJ)
 
 $(call gb_HelpJarTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),HEJ,3)
@@ -543,6 +554,7 @@ endef
 
 define gb_HelpTarget__command
 $(if $(ENABLE_HTMLHELP),,$(call gb_Output_announce,$(2),$(true),HLP,4))
+$(if $(ENABLE_HTMLHELP),,$(call gb_Trace_MakeMark,$(2),HLP))
 touch $@
 endef
 
diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk
index 162af86fc2a8..ba009e0306aa 100644
--- a/solenv/gbuild/InstallModule.mk
+++ b/solenv/gbuild/InstallModule.mk
@@ -14,6 +14,7 @@ $(dir $(call gb_InstallModule_get_target,%))%/.dir :
 
 $(call gb_InstallModule_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),IMO,3)
+	$(call gb_Trace_MakeMark,$*,IMO)
 	$(if $(INSTALL_MODULE_DEFINED),,$(call gb_Output_error,Something depends on install module $* which does not exist.))
 	touch $@
 
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index d24b201550cf..3ae5f67e0839 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -25,7 +25,6 @@ endef
 gb_ScpTemplateTarget_get_source = $(SRCDIR)/$(1).sct
 
 define gb_ScpTemplateTarget__command
-$(call gb_Output_announce,$(2),$(true),SCT,1)
 $(call gb_Helper_abbreviate_dirs,\
 	export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \
 	$(gb_ScpTemplateTarget_COMMAND) \
@@ -41,7 +40,10 @@ $(dir $(call gb_ScpTemplateTarget_get_target,%))%/.dir :
 # depend on configure output to rebuild everything
 $(call gb_ScpTemplateTarget_get_target,%) : \
 		$(gb_ScpTemplateTarget_TARGET) $(BUILDDIR)/config_$(gb_Side).mk
+	$(call gb_Output_announce,$*,$(true),SCT,1)
+	$(call gb_Trace_StartRange,$*,SCT)
 	$(call gb_ScpTemplateTarget__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,SCT)
 
 .PHONY : $(call gb_ScpTemplateTarget_get_clean_target,%)
 $(call gb_ScpTemplateTarget_get_clean_target,%) :
@@ -64,7 +66,6 @@ gb_ScpPreprocessTarget_COMMAND := $(call gb_Executable_get_command,cpp)
 gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp
 
 define gb_ScpPreprocessTarget__command
-$(call gb_Output_announce,$(2),$(true),SPP,2)
 $(call gb_Helper_abbreviate_dirs,\
 	$(gb_ScpPreprocessTarget_COMMAND) \
 		-+ -P \
@@ -81,7 +82,10 @@ $(dir $(call gb_ScpPreprocessTarget_get_target,%))%/.dir :
 # depend on configure output to rebuild everything
 $(call gb_ScpPreprocessTarget_get_target,%) : \
 		$(gb_ScpPreprocessTarget_DEPS) $(BUILDDIR)/config_$(gb_Side).mk
+	$(call gb_Output_announce,$*,$(true),SPP,2)
+	$(call gb_Trace_StartRange,$*,SPP)
 	$(call gb_ScpPreprocessTarget__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,SPP)
 
 .PHONY : $(call gb_ScpPreprocessTarget_get_clean_target,%)
 $(call gb_ScpPreprocessTarget_get_clean_target,%) :
@@ -133,7 +137,6 @@ gb_ScpTarget_TARGET := $(SRCDIR)/solenv/bin/pre2par.pl
 gb_ScpTarget_COMMAND := $(PERL) $(gb_ScpTarget_TARGET)
 
 define gb_ScpTarget__command
-$(call gb_Output_announce,$(2),$(true),SCP,2)
 $(call gb_Helper_abbreviate_dirs,\
 	$(gb_ScpTarget_COMMAND) -l $(SCP_ULF) -s $(SCP_SOURCE) -o $(1) \
 )
@@ -143,7 +146,10 @@ $(dir $(call gb_ScpTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_ScpTarget_get_target,%) : $(gb_ScpTarget_TARGET)
+	$(call gb_Output_announce,$*,$(true),SCP,2)
+	$(call gb_Trace_StartRange,$*,SCP)
 	$(call gb_ScpTarget__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,SCP)
 
 $(call gb_ScpTarget_get_external_target,%) :
 	touch $@
@@ -188,7 +194,6 @@ endef
 #  gb_InstallModuleTarget_InstallModuleTarget_platform
 
 define gb_InstallModuleTarget__command
-$(call gb_Output_announce,$(2),$(true),INM,3)
 $(call gb_Helper_abbreviate_dirs,\
 	rm -f $(1) \
 	$(foreach scpfile,$(SCP_FILES),&& echo $(scpfile) >> $(1)) \
@@ -199,7 +204,10 @@ $(dir $(call gb_InstallModuleTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_InstallModuleTarget_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),INM,3)
+	$(call gb_Trace_StartRange,$*,INM)
 	$(call gb_InstallModuleTarget__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,INM)
 
 $(call gb_InstallModuleTarget_get_external_target,%) :
 	touch $@
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index 593bd3e0861b..afc89e95ea6f 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -28,7 +28,6 @@ $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),$(1),$(2))
 endef
 
 define gb_InstallScript__command
-$(call gb_Output_announce,$(2),$(true),INS,4)
 $(call gb_Helper_abbreviate_dirs,\
 	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
 		$(call gb_InstallScript__make_arglist,\
@@ -50,7 +49,10 @@ $(dir $(call gb_InstallScript_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_InstallScript_get_target,%) : $(gb_InstallScript_TARGET)
+	$(call gb_Output_announce,$*,$(true),INS,4)
+	$(call gb_Trace_StartRange,$*,INS)
 	$(call gb_InstallScript__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,INS)
 
 .PHONY : $(call gb_InstallScript_get_clean_target,%)
 $(call gb_InstallScript_get_clean_target,%) :
diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index 296c783f35fc..dae0cb503c48 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -15,6 +15,7 @@ $(dir $(call gb_InternalUnoApi_get_target,%))%/.dir :
 
 $(call gb_InternalUnoApi_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),UNI,5) \
+	$(call gb_Trace_MakeMark,$*,UNI)
 	touch $@
 
 .PHONY : $(call gb_InternalUnoApi_get_clean_target,%)
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 84d41921f972..76385702f1ab 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -54,7 +54,6 @@ gb_Jar_get_install_target = $(call gb_Jar__get_dir_for_layer,$(call gb_Jar__get_
 # the archive with the main class hierarchy and then updating it from
 # the other one(s), which seems to work .-)
 define gb_Jar__command
-	$(call gb_Output_announce,$(1),$(true),JAR,3)
 	$(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(call gb_Jar_get_workdir,$(1))/META-INF && \
 	echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) && \
@@ -79,7 +78,10 @@ $(call gb_Jar_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(ca
 
 # rule for creating the jar file using the command defined above
 $(WORKDIR)/Jar/%.jar :
+	$(call gb_Output_announce,$*,$(true),JAR,3)
+	$(call gb_Trace_StartRange,$*,JAR)
 	$(call gb_Jar__command,$*,$@)
+	$(call gb_Trace_EndRange,$*,JAR)
 
 # call gb_Jar__make_installed_rule,jar
 define gb_Jar__make_installed_rule
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index ee94a6525c26..dc7d02e8904a 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -50,7 +50,9 @@ endef
 
 $(call gb_JavaClassSet_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),JCS,3)
+	$(call gb_Trace_StartRange,$*,JCS)
 	$(call gb_JavaClassSet__command,$@,$*,$?,$^)
+	$(call gb_Trace_EndRange,$*,JCS)
 
 $(call gb_JavaClassSet_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),JCS,3)
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index e5fab5eae68e..290fab3af4c8 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -36,6 +36,7 @@ ifneq ($(gb_SUPPRESS_TESTS),)
 	@true
 else
 	$(call gb_Output_announce,$*,$(true),JUT,2)
+	$(call gb_Trace_StartRange,$*,JUT)
 	$(call gb_Helper_abbreviate_dirs,\
         rm -rf $(call gb_JunitTest_get_userdir,$*) && \
 		mkdir -p $(call gb_JunitTest_get_userdir,$*)/user && \
@@ -56,6 +57,7 @@ else
 		&& echo \
 		&& false)))
 	$(CLEAN_CMD)
+	$(call gb_Trace_EndRange,$*,JUT)
 endif
 
 define gb_JunitTest_JunitTest
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e71c6127d845..914c36d35cd2 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -83,7 +83,6 @@ gb_LinkTarget_LAYER_LINKPATHS := \
 #
 # $(call gb_CObject__tool_command,relative-source,source)
 define gb_CObject__tool_command
-$(call gb_Output_announce,$(1).c,$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs,\
         ICECC=no CCACHE_DISABLE=1 \
 	$(gb_CC) \
@@ -100,7 +99,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		)
 endef
 define gb_ObjCObject__tool_command
-$(call gb_Output_announce,$(1).m,$(true),OCC,3)
 $(call gb_Helper_abbreviate_dirs,\
         ICECC=no CCACHE_DISABLE=1 \
 	$(gb_CC) \
@@ -117,7 +115,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		)
 endef
 define gb_CxxObject__tool_command
-$(call gb_Output_announce,$(1).cxx,$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs,\
         ICECC=no CCACHE_DISABLE=1 \
 	$(gb_CXX) \
@@ -134,7 +131,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		)
 endef
 define gb_ObjCxxObject__tool_command
-$(call gb_Output_announce,$(1).mm,$(true),OCX,3)
 $(call gb_Helper_abbreviate_dirs,\
         ICECC=no CCACHE_DISABLE=1 \
 	$(gb_CXX) \
@@ -151,7 +147,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		)
 endef
 define gb_CxxClrObject__tool_command
-$(call gb_Output_announce,$(1).cxx,$(true),CLR,3)
 $(call gb_Helper_abbreviate_dirs,\
         ICECC=no CCACHE_DISABLE=1 \
 	$(gb_CXX) \
@@ -233,11 +228,16 @@ gb_CObject_get_source = $(1)/$(2).c
 
 ifneq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),)
 $(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%) $(gb_FORCE_COMPILE_ALL_TARGET)
+	$(call gb_Output_announce,$*.c,$(true),C  ,3)
+	$(call gb_Trace_StartRange,$*.c,C  )
 	$(call gb_CObject__tool_command,$*,$<)
+	$(call gb_Trace_EndRange,$*.c,C  )
 else
 $(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%)
 	$(call gb_Output_announce,$*.c,$(true),$(if $(COMPILER_TEST),C? ,C  ),3)
+	$(call gb_Trace_StartRange,$*.c,$(if $(COMPILER_TEST),C? ,C  ))
 	$(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$<,$(call gb_CObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS))
+	$(call gb_Trace_EndRange,$*.c,$(if $(COMPILER_TEST),C? ,C  ))
 endif
 
 # Note: if the *Object_dep_target does not exist it will be created by
@@ -290,12 +290,17 @@ endef
 
 ifneq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),)
 $(call gb_CxxObject_get_target,%) : $(call gb_CxxObject_get_source,$(SRCDIR),%) $(gb_FORCE_COMPILE_ALL_TARGET)
+	$(call gb_Output_announce,$*.cxx,$(true),CXX,3)
+	$(call gb_Trace_StartRange,$*.cxx,CXX)
 	$(call gb_CxxObject__tool_command,$*,$<)
+	$(call gb_Trace_EndRange,$*.cxx,CXX)
 else
 $(call gb_CxxObject_get_target,%) : $(call gb_CxxObject_get_source,$(SRCDIR),%)
 	$(call gb_Output_announce,$*.cxx,$(true),$(if $(COMPILER_TEST),CPT,CXX),3)
+	$(call gb_Trace_StartRange,$*.cxx,$(if $(COMPILER_TEST),CPT,CXX))
 	$(eval $(gb_CxxObject__set_pchflags))
 	$(call gb_CObject__command_pattern,$@,$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND) $(if $(COMPILER_TEST),$(gb_COMPILER_TEST_FLAGS)),$<,$(call gb_CxxObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS))
+	$(call gb_Trace_EndRange,$*.cxx,$(if $(COMPILER_TEST),CPT,CXX))
 endif
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -317,8 +322,10 @@ gb_GenCObject_get_source = $(WORKDIR)/$(1).c
 
 $(call gb_GenCObject_get_target,%) : $(gb_FORCE_COMPILE_ALL_TARGET)
 	$(call gb_Output_announce,$*.c,$(true),C  ,3)
+	$(call gb_Trace_StartRange,$*.c,C  )
 	test -f $(call gb_GenCObject_get_source,$*) || (echo "Missing generated source file $(call gb_GenCObject_get_source,$*)" && false)
 	$(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$(call gb_GenCObject_get_source,$*),$(call gb_GenCObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS))
+	$(call gb_Trace_EndRange,$*.c,C  )
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(dir $(call gb_GenCObject_get_dep_target,%)).dir :
@@ -339,9 +346,11 @@ gb_GenCxxObject_get_source = $(WORKDIR)/$(1).$(gb_LinkTarget_CXX_SUFFIX_$(call g
 
 $(call gb_GenCxxObject_get_target,%) : $(gb_FORCE_COMPILE_ALL_TARGET)
 	$(call gb_Output_announce,$(subst $(BUILDDIR)/,,$(GEN_CXX_SOURCE)),$(true),CXX,3)
+	$(call gb_Trace_StartRange,$(subst $(BUILDDIR)/,,$(GEN_CXX_SOURCE)),CXX)
 	test -f $(GEN_CXX_SOURCE) || (echo "Missing generated source file $(GEN_CXX_SOURCE)" && false)
 	$(eval $(gb_CxxObject__set_pchflags))
 	$(call gb_CObject__command_pattern,$@,$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND),$(GEN_CXX_SOURCE),$(call gb_GenCxxObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS))
+	$(call gb_Trace_EndRange,$(subst $(BUILDDIR)/,,$(GEN_CXX_SOURCE)),CXX)
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(dir $(call gb_GenCxxObject_get_dep_target,%)).dir :
@@ -362,8 +371,10 @@ gb_GenCxxClrObject_get_source = $(WORKDIR)/$(1).$(gb_LinkTarget_CXX_SUFFIX_$(cal
 
 $(call gb_GenCxxClrObject_get_target,%) : $(gb_FORCE_COMPILE_ALL_TARGET)
 	$(call gb_Output_announce,$(subst $(BUILDDIR)/,,$(GEN_CXXCLR_SOURCE)),$(true),CLR,3)
+	$(call gb_Trace_StartRange,$(subst $(BUILDDIR)/,,$(GEN_CXXCLR_SOURCE)),CLR)
 	test -f $(GEN_CXXCLR_SOURCE) || (echo "Missing generated source file $(GEN_CXXCLR_SOURCE)" && false)
 	$(call gb_CObject__command_pattern,$@,$(T_CXXCLRFLAGS) $(T_CXXCLRFLAGS_APPEND),$(GEN_CXXCLR_SOURCE),$(call gb_GenCxxClrObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS))
+	$(call gb_Trace_EndRange,$(subst $(BUILDDIR)/,,$(GEN_CXXCLR_SOURCE)),CLR)
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(dir $(call gb_GenCxxClrObject_get_dep_target,%)).dir :
@@ -416,7 +427,10 @@ $(call gb_LexTarget_get_clean_target,%) :
 	    rm -f $(call gb_LexTarget_get_scanner_target,$*) $(call gb_LexTarget_get_target,$*))
 
 $(call gb_LexTarget_get_target,%) : $(call gb_LexTarget_get_source,$(SRCDIR),%)
+	$(call gb_Output_announce,$*,$(true),LEX,3)
+	$(call gb_Trace_StartRange,$*,LEX)
 	$(call gb_LexTarget__command,$<,$*,$@,$(call gb_LexTarget_get_scanner_target,$*))
+	$(call gb_Trace_EndRange,$*,LEX)
 
 # gb_LexTarget_LexTarget(scanner-file)
 define gb_LexTarget_LexTarget
@@ -427,7 +441,6 @@ endef
 
 #  gb_LexTarget__command(scanner-file, stem-for-message, done-pseudo-target, source-target)
 define gb_LexTarget__command
-$(call gb_Output_announce,$(2),$(true),LEX,3)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(3)) && \
 	$(FLEX) $(T_LEXFLAGS) -o$(4) $(1) && touch $(3) )
@@ -441,11 +454,16 @@ gb_ObjCxxObject_get_source = $(1)/$(2).mm
 
 ifneq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),)
 $(call gb_ObjCxxObject_get_target,%) : $(call gb_ObjCxxObject_get_source,$(SRCDIR),%) $(gb_FORCE_COMPILE_ALL_TARGET)
+	$(call gb_Output_announce,$*.mm,$(true),OCX,3)
+	$(call gb_Trace_StartRange,$*.mm,OCX)
 	$(call gb_ObjCxxObject__tool_command,$*,$<)
+	$(call gb_Trace_EndRange,$*.mm,OCX)
 else
 $(call gb_ObjCxxObject_get_target,%) : $(call gb_ObjCxxObject_get_source,$(SRCDIR),%)
 	$(call gb_Output_announce,$*.mm,$(true),$(if $(COMPILER_TEST),O?X,OCX),3)
+	$(call gb_Trace_StartRange,$*.mm,$(if $(COMPILER_TEST),O?X,OCX))
 	$(call gb_CObject__command_pattern,$@,$(T_OBJCXXFLAGS) $(T_OBJCXXFLAGS_APPEND),$<,$(call gb_ObjCxxObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS))
+	$(call gb_Trace_EndRange,$*.mm,$(if $(COMPILER_TEST),O?X,OCX))
 endif
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -468,11 +486,16 @@ gb_ObjCObject_get_source = $(1)/$(2).m
 
 ifneq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),)
 $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%) $(gb_FORCE_COMPILE_ALL_TARGET)
+	$(call gb_Output_announce,$*.m,$(true),OCC,3)
+	$(call gb_Trace_StartRange,$*.m,OCC)
 	$(call gb_ObjCObject__tool_command,$*,$<)
+	$(call gb_Trace_EndRange,$*.m,OCC)
 else
 $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%)
 	$(call gb_Output_announce,$*.m,$(true),$(if $(COMPILER_TEST),O?C,OCC),3)
+	$(call gb_Trace_StartRange,$*.m,$(if $(COMPILER_TEST),O?C,OCC))
 	$(call gb_CObject__command_pattern,$@,$(T_OBJCFLAGS) $(T_OBJCFLAGS_APPEND),$<,$(call gb_ObjCObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS))
+	$(call gb_Trace_EndRange,$*.m,$(if $(COMPILER_TEST),O?C,OCC))
 endif
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -495,11 +518,16 @@ gb_CxxClrObject_get_source = $(1)/$(2).cxx
 
 ifneq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),)
 $(call gb_CxxClrObject_get_target,%) : $(call gb_CxxClrObject_get_source,$(SRCDIR),%) $(gb_FORCE_COMPILE_ALL_TARGET)
+	$(call gb_Output_announce,$*.cxx,$(true),CLR,3)
+	$(call gb_Trace_StartRange,$*.cxx,CLR)
 	$(call gb_CxxClrObject__tool_command,$*,$<)
+	$(call gb_Trace_EndRange,$*.cxx,CLR)
 else
 $(call gb_CxxClrObject_get_target,%) : $(call gb_CxxClrObject_get_source,$(SRCDIR),%)
 	$(call gb_Output_announce,$*.cxx,$(true),$(if $(COMPILER_TEST),C?R,CLR),3)
+	$(call gb_Trace_StartRange,$*.cxx,$(if $(COMPILER_TEST),C?R,CLR))
 	$(call gb_CObject__command_pattern,$@,$(T_CXXCLRFLAGS) $(T_CXXCLRFLAGS_APPEND),$<,$(call gb_CxxClrObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS))
+	$(call gb_Trace_EndRange,$*.cxx,$(if $(COMPILER_TEST),C?R,CLR))
 endif
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -584,6 +612,7 @@ $(WORKDIR)/Clean/LinkTarget/% :
 # call gb_LinkTarget__command_dep,dep_target,linktargetname
 define gb_LinkTarget__command_dep
 $(call gb_Output_announce,LNK:$(2),$(true),DEP,1)
+	$(call gb_Trace_StartRange,LNK:$(2),DEP)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
@@ -599,6 +628,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		) && \
 	$(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1)) && \
 	rm -f $${RESPONSEFILE}
+	$(call gb_Trace_EndRange,LNK:$(2),DEP)
 
 endef
 
@@ -649,16 +679,16 @@ endef
 # (especially since external libraries are delivered via Package)
 # call gb_LinkTarget__command_impl,linktargettarget,linktargetname
 define gb_LinkTarget__command_impl
-	$(if $(gb_FULLDEPS),\
-		$(if $(findstring concat-deps,$(2)),,\
-			$(call gb_LinkTarget__command_dep,$(call gb_LinkTarget_get_dep_target,$(2)).tmp,$(2)) \
+	$(if $(gb_FULLDEPS),
+		$(if $(findstring concat-deps,$(2)),,
+			$(call gb_LinkTarget__command_dep,$(call gb_LinkTarget_get_dep_target,$(2)).tmp,$(2))
 			mv $(call gb_LinkTarget_get_dep_target,$(2)).tmp $(call gb_LinkTarget_get_dep_target,$(2))))
-	$(if $(filter $(2),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library__get_workdir_linktargetname,$(lib)))),\
-		$(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$(2))),\
-			$(call gb_LinkTarget__command,$(1),$(2)),\
-			mkdir -p $(dir $(1)) && echo invalid - merged lib > $(1) \
-			$(if $(SOVERSIONSCRIPT),&& echo invalid - merged lib > $(WORKDIR)/LinkTarget/$(2))),\
-		$(if $(filter-out CompilerTest,$(TARGETTYPE)), \
+	$(if $(filter $(2),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library__get_workdir_linktargetname,$(lib)))),
+		$(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$(2))),
+			$(call gb_LinkTarget__command,$(1),$(2)),
+			mkdir -p $(dir $(1)) && echo invalid - merged lib > $(1)
+			$(if $(SOVERSIONSCRIPT),&& echo invalid - merged lib > $(WORKDIR)/LinkTarget/$(2))),
+		$(if $(filter-out CompilerTest,$(TARGETTYPE)),
 			$(call gb_LinkTarget__command,$(1),$(2))))
 	$(call gb_LinkTarget__command_objectlist,$(WORKDIR)/LinkTarget/$(2).objectlist)
 endef
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index aa3b1cb19485..d419ecbc069c 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -65,6 +65,7 @@ gb_Module_CURRENTMAKEFILE :=
 
 $(call gb_Module_get_nonl10n_target,%) :
 	$(call gb_Output_announce,$*,$(true),BIN,5)
+	$(call gb_Trace_MakeMark,$*,BIN)
 	-$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
 		touch $@)
@@ -78,6 +79,7 @@ $(call gb_Module_get_clean_target,%) :
 
 $(call gb_Module_get_l10n_target,%) :
 	$(call gb_Output_announce,$*,$(true),LOC,5)
+	$(call gb_Trace_MakeMark,$*,LOC)
 	$(call gb_Output_announce_title,module $* done.)
 	-$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
@@ -85,6 +87,7 @@ $(call gb_Module_get_l10n_target,%) :
 
 $(call gb_Module_get_check_target,%) :
 	$(call gb_Output_announce,$*,$(true),CHK,5)
+	$(call gb_Trace_MakeMark,$*,CHK)
 	$(call gb_Output_announce_title,module $* checks done.)
 	-$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
@@ -92,6 +95,7 @@ $(call gb_Module_get_check_target,%) :
 
 $(call gb_Module_get_slowcheck_target,%) :
 	$(call gb_Output_announce,$*,$(true),SLC,5)
+	$(call gb_Trace_MakeMark,$*,SLC)
 	$(call gb_Output_announce_title,module $* slowchecks done.)
 	-$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
@@ -99,6 +103,7 @@ $(call gb_Module_get_slowcheck_target,%) :
 
 $(call gb_Module_get_screenshot_target,%) :
 	$(call gb_Output_announce,$*,$(true),SCR,5)
+	$(call gb_Trace_MakeMark,$*,SCR)
 	$(call gb_Output_announce_title,module $* screenshots done.)
 	-$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
@@ -106,6 +111,7 @@ $(call gb_Module_get_screenshot_target,%) :
 
 $(call gb_Module_get_subsequentcheck_target,%) :
 	$(call gb_Output_announce,$*,$(true),SCK,5)
+	$(call gb_Trace_MakeMark,$*,SCK)
 	$(call gb_Output_announce_title,module $* subsequentchecks done.)
 	-$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
@@ -113,6 +119,7 @@ $(call gb_Module_get_subsequentcheck_target,%) :
 
 $(call gb_Module_get_stagingcheck_target,%) :
 	$(call gb_Output_announce,$*,$(true),STC,5)
+	$(call gb_Trace_MakeMark,$*,STC)
 	$(call gb_Output_announce_title,module $* stagingchecks done.)
 	-$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
@@ -120,6 +127,7 @@ $(call gb_Module_get_stagingcheck_target,%) :
 
 $(call gb_Module_get_perfcheck_target,%) :
 	$(call gb_Output_announce,$*,$(true),PFC,5)
+	$(call gb_Trace_MakeMark,$*,PFC)
 	$(call gb_Output_announce_title,module $* perfchecks done.)
 	-$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
@@ -127,6 +135,7 @@ $(call gb_Module_get_perfcheck_target,%) :
 
 $(call gb_Module_get_uicheck_target,%) :
 	$(call gb_Output_announce,$*,$(true),UIT,5)
+	$(call gb_Trace_MakeMark,$*,UIT)
 	$(call gb_Output_announce_title,module $* uicheck done.)
 	-$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
@@ -134,6 +143,7 @@ $(call gb_Module_get_uicheck_target,%) :
 
 $(call gb_Module_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),MOD,5)
+	$(call gb_Trace_MakeMark,$*,MOD)
 	$(call gb_Output_announce_title,module $* done.)
 	-$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
@@ -147,24 +157,28 @@ all : build $(if $(CROSS_COMPILING),,unitcheck $(if $(gb_PARTIAL_BUILD),,slowche
 ifeq ($(gb_Side),build)
 build-tools : $(gb_BUILD_TOOLS)
 	$(call gb_Output_announce,loaded tools: $(gb_BUILD_TOOLS),$(true),ALL,6)
+	$(call gb_Trace_MakeMark,$(gb_BUILD_TOOLS),ALL)
 	$(call gb_Output_announce_title,build-tools done.)
 	$(call gb_Output_announce_bell)
 endif
 
 build :
 	$(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6)
+	$(call gb_Trace_MakeMark,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),ALL)
 	$(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6))
 	$(call gb_Output_announce_title,build done.)
 	$(call gb_Output_announce_bell)
 
 build-l10n-only :
 	$(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),LOC,6)
+	$(call gb_Trace_MakeMark,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),LOC)
 	$(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),LOC,6))
 	$(call gb_Output_announce_title,l10n done.)
 	$(call gb_Output_announce_bell)
 
 build-non-l10n-only :
 	$(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),BIN,6)
+	$(call gb_Trace_MakeMark,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),BIN)
 	$(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),BIN,6))
 	$(call gb_Output_announce_title,non-l10n done.)
 	$(call gb_Output_announce_bell)
@@ -233,6 +247,7 @@ translations : $(WORKDIR)/pot.done
 $(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize propex ulfex xrmex treex, \
 							$(call gb_Executable_get_target_for_build,$(exec)))
 	$(call gb_Output_announce,$(subst .pot,,$(subst $(WORKDIR)/,,$@)),$(true),POT,1)
+	$(call gb_Trace_MakeMark,$(subst .pot,,$(subst $(WORKDIR)/,,$@)),POT)
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && $(call gb_Helper_execute,localize) $(SRCDIR) $(dir $@)/pot \
 		&& $(FIND) $(dir $@)/pot -type f -printf "%P\n" | sed -e "s/\.pot/.po/" | LC_ALL=C $(SORT) > $(dir $@)/LIST \
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 035a4af064f2..87de87cae617 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -79,9 +79,11 @@ $(call gb_Package_get_preparation_target,%) :
 # Package_foo makefiles.
 $(call gb_Package_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),PKG,2)
+	$(call gb_Trace_StartRange,$*,PKG)
 	$(if $(PACKAGE_DEFINED),,$(call gb_Output_error,Something depends on package $* which does not exist.))
 	rm -f $@ && \
 	mv $(call var2file,$@.tmp,100,$(sort $(FILES))) $@
+	$(call gb_Trace_EndRange,$*,PKG)
 
 # for other targets that want to create Packages, does not register at Module
 define gb_Package_Package_internal
diff --git a/solenv/gbuild/PackageSet.mk b/solenv/gbuild/PackageSet.mk
index 8ba3273f459b..e85c3eceaf5d 100644
--- a/solenv/gbuild/PackageSet.mk
+++ b/solenv/gbuild/PackageSet.mk
@@ -23,7 +23,9 @@ $(dir $(call gb_PackageSet_get_target,%))%/.dir :
 
 $(call gb_PackageSet_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),PKS,2)
+	$(call gb_Trace_StartRange,$*,PKS)
 	cat $(sort $(FILELISTS)) > $@
+	$(call gb_Trace_EndRange,$*,PKS)
 
 .PHONY : $(call gb_PackageSet_get_clean_target,%)
 $(call gb_PackageSet_get_clean_target,%) :
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index 1dd5cd692efd..606596ce29bf 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -17,7 +17,6 @@ $(if $(call gb_Pagein__is_library,$(1)),$(call gb_Pagein__make_library_path,$(1)
 gb_Pagein__get_install_target = $(INSTROOT)/$(LIBO_BIN_FOLDER)/pagein-$(1)
 
 define gb_Pagein__command
-$(call gb_Output_announce,$(2),$(true),PAG,5)
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && rm -f $(1) \
     && touch $(1) \
@@ -32,7 +31,10 @@ $(call gb_Pagein_get_clean_target,%) :
         rm -f $(call gb_Pagein__get_install_target,$*) $(call gb_Pagein_get_target,$*))
 
 $(call gb_Pagein_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),PAG,5)
+	$(call gb_Trace_StartRange,$*,PAG)
 	$(call gb_Pagein__command,$@,$*,$^)
+	$(call gb_Trace_EndRange,$*,PAG)
 
 define gb_Pagein_Pagein
 $(call gb_Pagein_get_target,$(1)) : OBJECTS :=
diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk
index 5b20a6686cfe..2c1dfd2f454b 100644
--- a/solenv/gbuild/Postprocess.mk
+++ b/solenv/gbuild/Postprocess.mk
@@ -12,6 +12,7 @@ $(dir $(call gb_Postprocess_get_target,%)).dir :
 
 $(call gb_Postprocess_get_target,%) :
 	$(call gb_Output_announce,$(POSTPROCESS_INFO): $(if $(POSTPROCESS_PREFIX),$(subst $(POSTPROCESS_PREFIX),,$^),$^),$(true),ALL,6)
+	$(call gb_Trace_MakeMark,$(POSTPROCESS_INFO): $(if $(POSTPROCESS_PREFIX),$(subst $(POSTPROCESS_PREFIX),,$^),$^),ALL)
 	touch $@
 
 .PHONY : $(call gb_Postprocess_get_clean_target,%)
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 966cad821b98..52ecbffe7f1c 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -39,6 +39,7 @@ ifneq ($(gb_SUPPRESS_TESTS),)
 	@true
 else
 	$(call gb_Output_announce,$*,$(true),PYT,2)
+	$(call gb_Trace_StartRange,$*,PYT)
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -rf $(dir $(call gb_PythonTest_get_target,$*)) && \
 		mkdir -p $(dir $(call gb_PythonTest_get_target,$*))user/user/autotext && \
@@ -65,6 +66,7 @@ else
 					RET=$$?; \
 					$(call gb_CppunitTest_postprocess,$(gb_PythonTest_EXECUTABLE_GDB),$@.core,$$RET) >> $@.log 2>&1;) \
 				cat $@.log; $(gb_PythonTest_UNITTESTFAILED) Python $*))))
+	$(call gb_Trace_EndRange,$*,PYT)
 endif
 
 # always use udkapi and URE services
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index b9ccb49a3e2e..334a21cbc70a 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -21,6 +21,7 @@ $(dir $(call gb_Pyuno_get_target,%))%/.dir :
 
 $(call gb_Pyuno_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),PYU,3)
+	$(call gb_Trace_MakeMark,$*,PYU)
 	touch $@
 
 $(call gb_Pyuno_get_final_target,%) :
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 4e5f57810e82..337fcc858a3d 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -24,7 +24,9 @@ endef
 
 $(call gb_Rdb_get_target,%) :| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
 	$(call gb_Output_announce,$*,$(true),RDB,1)
+	$(call gb_Trace_StartRange,$*,RDB)
 	$(call gb_Rdb__command,$@,$*,$?,$^)
+	$(call gb_Trace_EndRange,$*,RDB)
 
 .PHONY : $(call gb_Rdb_get_clean_target,%)
 $(call gb_Rdb_get_clean_target,%) :
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index 5821ed8950bf..1b02e7f1699e 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -23,6 +23,7 @@ gb_SdiTarget_SVIDLCOMMAND := $(call gb_Executable_get_command,svidl)
 
 $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS)
 	$(call gb_Output_announce,$*,$(true),SDI,1)
+	$(call gb_Trace_StartRange,$*,SDI)
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@))
 	$(call gb_Helper_abbreviate_dirs,\
@@ -35,6 +36,7 @@ $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS)
 			$(if $(gb_FULLDEPS),-fM$(call gb_SdiTarget_get_dep_target,$*)) \
 			$< \
 		&& touch $@.hxx)
+	$(call gb_Trace_EndRange,$*,SDI)
 # touch the hxx file so it's newer than the target - the .hxx only occurs in
 # generated .d files, so it's not a target yet when building from scratch!
 
diff --git a/solenv/gbuild/Trace.mk b/solenv/gbuild/Trace.mk
new file mode 100644
index 000000000000..8d416157d28d
--- /dev/null
+++ b/solenv/gbuild/Trace.mk
@@ -0,0 +1,61 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# Support for tracing what gbuild does.
+# Run 'make GBUILD_TRACE=/somewhere/log.json', process the file
+# using solenv/bin/finish-gbuild-trace.py, and then view it in Chromium
+# using the chrome://tracing URL:
+# - the '?' icon in the top-right is the help
+# - 'gbuild' rows represent per-parallelism (per-CPU) usage in time
+# - 'totals' rows represent sums for reach build type
+# - note that 'EXTERNAL' targets do not detect whether the external package
+#   is built with parallelism or not, so the actual CPU time may be higher
+# - vertical lines represent targets that themselves do not take any time
+#   to build
+# - any target can be found using the search field in the top right corner
+#   (just type e.g. '[MOD]: sal' and hit the '->' button, if you cannot see
+#   it pressing 'm' or 'f' can help)
+
+gb_TRACE :=
+ifneq ($(GBUILD_TRACE),)
+gb_TRACE := $(abspath $(GBUILD_TRACE))
+endif
+
+ifneq ($(gb_TRACE),)
+
+# call gb_Trace_AddMark,marktype,detail,type,extra
+# The (flock;cat) part is to minimize lock time.
+define gb_Trace__AddMark
+echo "{\"name\": \"$(3)\", \"ph\": \"$(1)\", \"pid\": 1, \"tid\": 1, \"ts\": $$(date +%s%N),\"args\":{\"message\":\"[$(3)]: $(2)\"}}," | ( flock 1; cat ) >>$(gb_TRACE)
+endef
+
+# call gb_Trace_StartRange,detail,type
+define gb_Trace_StartRange
+$(call gb_Trace__AddMark,B,$(1),$(2))
+endef
+
+# call gb_Trace_EndRange,detail,type
+define gb_Trace_EndRange
+$(call gb_Trace__AddMark,E,$(1),$(2))
+endef
+
+# call gb_Trace_MakeMark,detail,type
+define gb_Trace_MakeMark
+$(call gb_Trace__AddMark,i,$(1),$(2))
+endef
+
+ifeq ($(MAKE_RESTARTS),)
+$(shell rm -f $(gb_TRACE) 2>/dev/null)
+else
+$(shell $(call gb_Trace__AddMark,i,make restart,MAKE))
+endif
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index e7fa50a745b0..5b322fb6b0f5 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -51,7 +51,6 @@ gb_UIImageListTarget_XSLTFILE := $(SRCDIR)/solenv/bin/uiimagelist.xsl
 # NOTE: for some reason xsltproc does not produce any file if there is
 # no output, so we touch the target to make sure it exists.
 define gb_UIImageListTarget__command
-$(call gb_Output_announce,$(2),$(true),UIL,1)
 $(call gb_Helper_abbreviate_dirs,\
 	$(gb_UIImageListTarget_COMMAND) --nonet -o $@ $(gb_UIImageListTarget_XSLTFILE) $(UIFILE) && \
 	touch $@ \
@@ -65,7 +64,10 @@ $(dir $(call gb_UIImageListTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_UIImageListTarget_get_target,%) : $(gb_UIImageListTarget_DEPS) $(gb_UIImageListTarget_XSLTFILE)
+	$(call gb_Output_announce,$*,$(true),UIL,1)
+	$(call gb_Trace_StartRange,$*,UIL)
 	$(call gb_UIImageListTarget__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,UIL)
 
 .PHONY : $(call gb_UIImageListTarget_get_clean_target,%)
 $(call gb_UIImageListTarget_get_clean_target,%) :
@@ -109,9 +111,11 @@ $(dir $(call gb_UIConfig_get_target,%))%/.dir :
 
 $(call gb_UIConfig_get_target,%) : $(call gb_UIConfig_get_imagelist_target,%) $(call gb_UIConfig_get_a11yerrors_target,%)
 	$(call gb_Output_announce,$*,$(true),UIC,2)
+	$(call gb_Trace_StartRange,$*,UIC)
 	$(call gb_Helper_abbreviate_dirs,\
 		touch $@ \
 	)
+	$(call gb_Trace_EndRange,$*,UIC)
 
 $(call gb_UIConfig_get_imagelist_target,%) :
 	$(call gb_UIConfig__command)
@@ -146,12 +150,14 @@ gb_UIConfig_gla11y_PARAMETERS += --widgets-button +svtlo-ManagedMenuButton
 gb_UIConfig_gla11y_PARAMETERS += --fatal-all --not-fatal-type duplicate-mnemonic --not-fatal-type labelled-by-and-mnemonic --not-fatal-type orphan-label
 
 define gb_UIConfig_a11yerrors__command
-$(call gb_Output_announce,$(2),$(true),UIA,1)
 $(call gb_UIConfig__gla11y_command)
 endef
 
 $(call gb_UIConfig_get_a11yerrors_target,%) : $(gb_UIConfig_LXML_TARGET) $(call gb_ExternalExecutable_get_dependencies,python) $(gb_UIConfig_gla11y_SCRIPT)
+	$(call gb_Output_announce,$*,$(true),UIA,1)
+	$(call gb_Trace_StartRange,$*,UIA)
 	$(call gb_UIConfig_a11yerrors__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,UIA)
 
 gb_UIConfig_get_packagename = UIConfig/$(1)
 gb_UIConfig_get_packagesetname = UIConfig/$(1)
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index d558edbc034f..f90a1abe1b21 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -54,6 +54,7 @@ ifneq ($(gb_SUPPRESS_TESTS),)
 	@true
 else
 	$(call gb_Output_announce,$*,$(true),UIT,2)
+	$(call gb_Trace_StartRange,$*,UIT)
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -rf $(dir $(call gb_UITest_get_target,$*)) && \
 		mkdir -p $(dir $(call gb_UITest_get_target,$*))/user/user && \
@@ -88,6 +89,7 @@ else
                     cat $(dir $(call gb_UITest_get_target,$*))/soffice.out.log; \
                     printf ' >>>\n\n';) \
 			    cat $@.log; $(gb_UITest_UNITTESTFAILED) UI $*))))
+	$(call gb_Trace_EndRange,$*,UIT)
 endif
 
 # always use udkapi and URE services
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index ca1fbf76bbb0..bc364ad9ae34 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -26,7 +26,6 @@ gb_UnoApiTarget_UNOIDLCHECKDEPS := $(call gb_Executable_get_runtime_dependencies
 gb_UnoApiTarget_UNOIDLCHECKCOMMAND := $(call gb_Executable_get_command,unoidl-check)
 
 define gb_UnoApiTarget__command
-$(call gb_Output_announce,$(2),$(true),UNO,4)
 mkdir -p $(dir $(1)) \
 $(if $(UNOAPI_ENTITIES), \
 	&& RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(UNOAPI_ENTITIES))) \
@@ -42,7 +41,10 @@ $(if $(UNOAPI_REFERENCE), \
 endef
 
 $(call gb_UnoApiTarget_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),UNO,4)
+	$(call gb_Trace_StartRange,$*,UNO)
 	$(call gb_UnoApiTarget__command,$@,$*)
+	$(call gb_Trace_EndRange,$*,UNO)
 
 .PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
 $(call gb_UnoApiTarget_get_clean_target,%) :
@@ -139,17 +141,23 @@ endef
 $(call gb_UnoApiHeadersTarget_get_real_bootstrap_target,%) : \
 		$(gb_UnoApiHeadersTarget_CPPUMAKERDEPS)
 	$(call gb_Output_announce,$*,$(true),HPB,3) \
+	$(call gb_Trace_StartRange,$*,HPB)
 	$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*))
+	$(call gb_Trace_EndRange,$*,HPB)
 
 $(call gb_UnoApiHeadersTarget_get_real_comprehensive_target,%) : \
 		$(gb_UnoApiHeadersTarget_CPPUMAKERDEPS)
 	$(call gb_Output_announce,$*,$(true),HPC,3)
+	$(call gb_Trace_StartRange,$*,HPC)
 	$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*),-C)
+	$(call gb_Trace_EndRange,$*,HPC)
 
 $(call gb_UnoApiHeadersTarget_get_real_target,%) : \
 		$(gb_UnoApiHeadersTarget_CPPUMAKERDEPS)
 	$(call gb_Output_announce,$*,$(true),HPP,3) \
+	$(call gb_Trace_StartRange,$*,HPP)
 	$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-L)
+	$(call gb_Trace_EndRange,$*,HPP)
 
 .PHONY : $(call gb_UnoApiHeadersTarget_get_clean_target,%)
 $(call gb_UnoApiHeadersTarget_get_clean_target,%) :
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 59403de4d9ac..d177ed43503e 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -40,12 +40,14 @@ endef
 
 define gb_UnpackedTarget__command
 $(call gb_Output_announce,$(notdir $(2)),$(true),UPK,1)
+	$(call gb_Trace_StartRange,$(notdir $(2)),UPK)
 $(call gb_Helper_abbreviate_dirs,\
 	$(if $(wildcard $(UNPACKED_DIR)),rm -rf $(UNPACKED_DIR) &&) \
 	mkdir -p $(UNPACKED_DIR) && \
 	$(call gb_UnpackedTarget__command_$(1),$(2),$(3),$(4)) && \
 	touch $(2) \
 )
+	$(call gb_Trace_EndRange,$(notdir $(2)),UPK)
 endef
 
 $(dir $(call gb_UnpackedTarget_get_target,%)).dir :
@@ -120,7 +122,6 @@ $(call gb_UnpackedTarball__copy_files_fix,$(call gb_UnpackedTarball__copy_files_
 endef
 
 define gb_UnpackedTarball__command
-$(call gb_Output_announce,$(2),$(true),PAT,2)
 $(call gb_Helper_abbreviate_dirs,\
 	( \
 		cd $(3) \
@@ -169,7 +170,10 @@ $(call gb_UnpackedTarball_get_preparation_target,%) :
 	touch $@
 
 $(call gb_UnpackedTarball_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),PAT,2)
+	$(call gb_Trace_StartRange,$*,PAT)
 	$(call gb_UnpackedTarball__command,$@,$*,$(call gb_UnpackedTarball_get_dir,$*))
+	$(call gb_Trace_EndRange,$*,PAT)
 
 $(call gb_UnpackedTarball_get_final_target,%) :
 	touch $@
@@ -242,7 +246,10 @@ $(call gb_ExternalProject_get_state_target,$(1),%) : UNPACKED_IS_BIN_TARBALL :=
 $(if $(findstring out,$(5)),$(call gb_Module_get_target,$(4)) : $(TARFILE_LOCATION)/$(6)
 $(TARFILE_LOCATION)/$(6) : $(call gb_Module_get_nonl10n_target,$(4))
 	$$(call gb_Output_announce,$(6),$(true),PKB,3)
-	if test ! -f "$$@" ; then cd $(call gb_UnpackedTarball_get_dir,) && $(GNUTAR) -czf "$$@" $(1)/ || $(GNUTAR) -czf "$$@" $(1)/ ; else touch "$$@" ; fi)
+	$$(call gb_Trace_StartRange,$(6),PKB)
+	if test ! -f "$$@" ; then cd $(call gb_UnpackedTarball_get_dir,) && $(GNUTAR) -czf "$$@" $(1)/ || $(GNUTAR) -czf "$$@" $(1)/ ; else touch "$$@" ; fi
+	$$(call gb_Trace_EndRange,$(6),PKB)
+)
 
 endef
 
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index b8f76d98f321..673a02df1370 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -43,6 +43,7 @@ $(dir $(call gb_Zip_get_target,%))%/.dir :
 # if there are no files, zip fails; copy empty zip file to target in that case
 $(call gb_Zip_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),ZIP,3)
+	$(call gb_Trace_StartRange,$*,ZIP)
 	$(call gb_Helper_abbreviate_dirs,\
 		$(if $(FILES),\
 			RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
@@ -56,6 +57,7 @@ $(call gb_Zip_get_target,%) :
 		,	cp $(SRCDIR)/solenv/gbuild/empty.zip $@)\
 		$(if $(INSTALL_NAME),&& cp $(call gb_Zip_get_target,$*) $(INSTALL_NAME)) \
 	)
+	$(call gb_Trace_EndRange,$*,ZIP)
 
 # the preparation target is here to ensure proper ordering of actions in cases
 # when we want to, e.g., create a zip from files created by a custom target
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 94bb0f93e866..99547941ef8c 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -281,6 +281,8 @@ include $(GBUILDDIR)/Deliver.mk
 
 $(eval $(call gb_Deliver_init))
 
+include $(GBUILDDIR)/Trace.mk
+
 # We are using a set of scopes that we might as well call classes.
 
 # TODO: to what extent is the following still true?
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index 3c25314639e1..9205e32885e1 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -102,9 +102,11 @@ gb_CppunitTest_get_filename = libtest_$(1).a
 # static archives), they are just a waste of disk space.
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
+	$(call gb_Trace_StartRange,$(2),LNK)
 $(if $(filter CppunitTest,$(TARGETTYPE)), \
 	touch $(1), \
 	$(call gb_LinkTarget__command_staticlink,$(1)))
+	$(call gb_Trace_EndRange,$(2),LNK)
 endef
 
 endif
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 12ae0a21537e..d113b8651156 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -111,6 +111,7 @@ gb_PrecompiledHeader_get_objectfile =
 
 define gb_PrecompiledHeader__command
 $(call gb_Output_announce,$(2),$(true),PCH,1)
+	$(call gb_Trace_StartRange,$(2),PCH)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2),$(7))) && \
 	cd $(BUILDDIR)/ && \
@@ -130,6 +131,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		-o$(1) \
 		$(call gb_cxx_dep_copy,$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2),$(7))) \
 		)
+	$(call gb_Trace_EndRange,$(2),PCH)
 endef
 
 ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 77fd83a733a6..83f6553a518c 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -91,6 +91,7 @@ gb_PrecompiledHeader_get_objectfile = $(1).obj
 
 define gb_PrecompiledHeader__command
 $(call gb_Output_announce,$(2),$(true),PCH,1)
+	$(call gb_Trace_StartRange,$(2),PCH)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2),$(7))) && \
 	unset INCLUDE && \
@@ -104,6 +105,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(6) \
 		-c $(3) \
 		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2),$(7)),$(1),$(3))
+	$(call gb_Trace_EndRange,$(2),PCH)
 endef
 
 # No ccache with MSVC, no need to create a checksum for it.
@@ -190,6 +192,7 @@ MSC_SUBSYSTEM_VERSION=$(COMMA)6.01
 # length in check - otherwise the dupes easily hit the limit when linking mergedlib
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
+	$(call gb_Trace_StartRange,$(2),LNK)
 $(call gb_Helper_abbreviate_dirs,\
 	rm -f $(1) && \
 	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100, \
@@ -243,7 +246,9 @@ $(call gb_Helper_abbreviate_dirs,\
 			-dump -exports $(ILIBTARGET) \
 			>> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \
 		$(call gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp,$(WORKDIR)/LinkTarget/$(2).exports,$(1))) \
-	; exit $$RC)
+	; \
+	$(call gb_Trace_EndRange,$(2),LNK) $(if $(gb_TRACE),;) \
+	exit $$RC)
 endef
 
 define gb_MSVCRT_subst
@@ -538,6 +543,7 @@ ifeq ($(gb_FULLDEPS),$(true))
 gb_WinResTarget__command_target = $(WORKDIR)/LinkTarget/Executable/makedepend.exe
 define gb_WinResTarget__command_dep
 $(call gb_Output_announce,RC:$(2),$(true),DEP,1)
+	$(call gb_Trace_StartRange,RC:$(2),DEP)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(call gb_Executable_get_target,makedepend) \
@@ -547,6 +553,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		-o .res \
 		-p $(dir $(3)) \
 		-f $(1))
+	$(call gb_Trace_EndRange,RC:$(2),DEP)
 endef
 else
 gb_WinResTarget__command_target =
@@ -658,7 +665,9 @@ endef
 
 define gb_UIMenubarTarget__command
 $(call gb_Output_announce,$(2),$(true),UIM,1)
+$(call gb_Trace_StartRange,$(2),UIM)
 cp $(3) $(1)
+$(call gb_Trace_EndRange,$(2),UIM)
 
 endef
 
diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk
index abdeb8cc59e7..dc7d2a8c25d8 100644
--- a/solenv/gbuild/platform/iOS.mk
+++ b/solenv/gbuild/platform/iOS.mk
@@ -123,8 +123,10 @@ endef
 
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
+	$(call gb_Trace_StartRange,$(2),LNK)
 $(if $(filter Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
 $(if $(filter CppunitTest Library StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
+	$(call gb_Trace_EndRange,$(2),LNK)
 endef
 
 define gb_LinkTarget_use_system_darwin_frameworks
@@ -248,7 +250,9 @@ endif
 
 define gb_UIMenubarTarget__command
 $(call gb_Output_announce,$(2),$(true),UIM,1)
+$(call gb_Trace_StartRange,$(2),UIM)
 cp $(3) $(1)
+$(call gb_Trace_EndRange,$(2),UIM)
 
 endef
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 1156255e3769..c850d3f068a3 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -161,8 +161,10 @@ endef
 
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
+	$(call gb_Trace_StartRange,$(2),LNK)
 $(if $(filter Library Bundle CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
 $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
+	$(call gb_Trace_EndRange,$(2),LNK)
 endef
 
 define gb_LinkTarget_use_system_darwin_frameworks
@@ -351,7 +353,9 @@ endif
 
 define gb_UIMenubarTarget__command
 $(call gb_Output_announce,$(2),$(true),UIM,1)
+$(call gb_Trace_StartRange,$(2),UIM)
 $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $(1) $(UI_MENUBAR_XSLT) $(3)
+$(call gb_Trace_EndRange,$(2),UIM)
 
 endef
 
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index e386601996f2..d1d068c8fd22 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -157,8 +157,10 @@ endef
 
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
+	$(call gb_Trace_StartRange,$(2),LNK)
 $(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
 $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
+	$(call gb_Trace_EndRange,$(2),LNK)
 endef
 
 
@@ -343,7 +345,9 @@ endif
 
 define gb_UIMenubarTarget__command
 $(call gb_Output_announce,$(2),$(true),UIM,1)
+$(call gb_Trace_StartRange,$(2),UIM)
 cp $(3) $(1)
+$(call gb_Trace_EndRange,$(2),UIM)
 
 endef
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 8854aab6c425..6abfb75da4b7 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -171,9 +171,11 @@ endef
 
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
+	$(call gb_Trace_StartRange,$(2),LNK)
 $(if $(filter CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
 $(if $(filter Library,$(TARGETTYPE)),$(if $(filter TRUE,$(DISABLE_DYNLOADING)),$(call gb_LinkTarget__command_staticlink,$(1)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2))))
 $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
+	$(call gb_Trace_EndRange,$(2),LNK)
 endef
 
 
@@ -376,7 +378,9 @@ endif
 
 define gb_UIMenubarTarget__command
 $(call gb_Output_announce,$(2),$(true),UIM,1)
+$(call gb_Trace_StartRange,$(2),UIM)
 cp $(3) $(1)
+$(call gb_Trace_EndRange,$(2),UIM)
 
 endef
author	Luboš Luňák <l.lunak@collabora.com>	2020-02-10 10:31:26 +0100
committer	Luboš Luňák <l.lunak@collabora.com>	2020-02-16 14:49:45 +0100
commit	0adc9b615f118ebb78f5f2edfe0c1c0e41270d57 (patch)
tree	aa84e0793d6e95a94686b6caacc9a0b5e7e8611e /solenv
parent	52c998be025563802a5056a15352e4608311be1d (diff)