[Libreoffice-commits] core.git: android/CustomTarget_lo_android.mk desktop/CustomTarget_soffice.mk extensions/CustomTarget_automationtest.mk extensions/CustomTarget_so_activex_idl.mk external/apache-commons external/apr external/beanshell external/breakpad external/bzip2 external/cairo external/coinmp external/cppunit external/curl external/epm external/expat external/firebird external/fontconfig external/freetype external/gpgmepp external/harfbuzz external/hsqldb external/hunspell external/hyphen external/icu external/jfreereport external/lcms2 external/libabw external/libassuan external/libatomic_ops external/libcdr external/libebook external/libeot external/libepubgen external/libetonyek external/libexttextcat external/libffi external/libfreehand external/libgpg-error external/libjpeg-turbo external/liblangtag external/libmspub external/libmwaw external/libnumbertext external/libodfgen external/liborcus external/libpagemaker external/libqxp external/librevenge external/libstaroffice external/l ibtommath external/libvisio external/libwpd external/libwpg external/libwps external/libxml2 external/libxslt external/libzmf external/lpsolve external/lxml external/mythes external/nss external/openldap external/openssl external/owncloud-android-lib external/postgresql external/python3 external/redland external/rhino external/serf external/xmlsec extras/CustomTarget_autocorr.mk extras/CustomTarget_autotextshare.mk extras/CustomTarget_autotextuser.mk extras/CustomTarget_glade.mk extras/CustomTarget_opensymbol.mk extras/CustomTarget_tplofficorr.mk extras/CustomTarget_tploffimisc.mk extras/CustomTarget_tplpersonal.mk extras/CustomTarget_tplpresnt.mk extras/CustomTarget_tpl_styles.mk filter/Configuration_filter.mk i18npool/CustomTarget_breakiterator.mk i18npool/CustomTarget_collator.mk i18npool/CustomTarget_indexentry.mk i18npool/CustomTarget_localedata.mk i18npool/CustomTarget_textconversion.mk instsetoo_native/CustomTarget_install.mk instsetoo_native/CustomTarget_setup.mk ios/CustomT arget_iOS_link.mk ios/CustomTarget_iOS_setup.mk jvmfwk/CustomTarget_jreproperties.mk jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk librelogo/CustomTarget_librelogo.mk odk/CustomTarget_allheaders.mk odk/CustomTarget_check.mk odk/CustomTarget_doxygen.mk odk/CustomTarget_html.mk odk/CustomTarget_javadoc.mk officecfg/CustomTarget_registry.mk postprocess/CustomTarget_check_dynamic_objects.mk postprocess/CustomTarget_images.mk postprocess/CustomTarget_registry.mk postprocess/CustomTarget_signing.mk pyuno/CustomTarget_python_shell.mk pyuno/CustomTarget_pyuno_pythonloader_ini.mk readlicense_oo/CustomTarget_license.mk readlicense_oo/CustomTarget_readme.mk ridljar/CustomTarget_javamaker.mk ridljar/CustomTarget_test_urp.mk sdext/CustomTarget_pdfimport.mk shell/CustomTarget_shlxthdl_res.mk shell/CustomTarget_spsupp_idl.mk solenv/bin solenv/gbuild sysui/CustomTarget_infoplist.mk sysui/CustomTarget_share.mk testtools/CustomTarget_bridgetest_climaker.mk testtools/CustomTarget_bridgetest_javamaker.mk t esttools/CustomTarget_bridgetest.mk tools/CustomTarget_reversemap.mk unoil/CustomTarget_javamaker.mk vcl/CustomTarget_gtk3_kde5_moc.mk vcl/CustomTarget_kf5_moc.mk vcl/CustomTarget_qt5_moc.mk winaccessibility/CustomTarget_ia2_idl.mk wizards/CustomTarget_share.mk wizards/CustomTarget_wizards.mk

Luboš Luňák (via logerrit) logerrit at kemper.freedesktop.org
Sun Feb 16 13:50:24 UTC 2020


 android/CustomTarget_lo_android.mk                                    |    2 
 desktop/CustomTarget_soffice.mk                                       |    2 
 extensions/CustomTarget_automationtest.mk                             |    4 
 extensions/CustomTarget_so_activex_idl.mk                             |    2 
 external/apache-commons/ExternalProject_apache_commons_logging.mk     |    2 
 external/apr/ExternalProject_apr.mk                                   |    4 
 external/apr/ExternalProject_apr_util.mk                              |    4 
 external/beanshell/ExternalProject_beanshell.mk                       |    2 
 external/breakpad/ExternalProject_breakpad.mk                         |    2 
 external/bzip2/ExternalProject_bzip2.mk                               |    4 
 external/cairo/ExternalProject_cairo.mk                               |    4 
 external/cairo/ExternalProject_pixman.mk                              |    4 
 external/coinmp/ExternalProject_coinmp.mk                             |    4 
 external/cppunit/ExternalProject_cppunit.mk                           |    4 
 external/curl/ExternalProject_curl.mk                                 |    4 
 external/epm/ExternalProject_epm.mk                                   |    2 
 external/expat/ExternalProject_expat.mk                               |    2 
 external/firebird/ExternalProject_firebird.mk                         |    3 
 external/fontconfig/ExternalProject_fontconfig.mk                     |    2 
 external/freetype/ExternalProject_freetype.mk                         |    4 
 external/gpgmepp/ExternalProject_gpgmepp.mk                           |    4 
 external/harfbuzz/ExternalProject_harfbuzz.mk                         |    2 
 external/hsqldb/ExternalProject_hsqldb.mk                             |    2 
 external/hunspell/ExternalProject_hunspell.mk                         |    2 
 external/hyphen/ExternalProject_hyphen.mk                             |    2 
 external/icu/ExternalProject_icu.mk                                   |    4 
 external/jfreereport/ExternalProject_jfreereport_flow_engine.mk       |    2 
 external/jfreereport/ExternalProject_jfreereport_flute.mk             |    2 
 external/jfreereport/ExternalProject_jfreereport_libbase.mk           |    2 
 external/jfreereport/ExternalProject_jfreereport_libfonts.mk          |    2 
 external/jfreereport/ExternalProject_jfreereport_libformula.mk        |    2 
 external/jfreereport/ExternalProject_jfreereport_liblayout.mk         |    2 
 external/jfreereport/ExternalProject_jfreereport_libloader.mk         |    2 
 external/jfreereport/ExternalProject_jfreereport_librepository.mk     |    2 
 external/jfreereport/ExternalProject_jfreereport_libserializer.mk     |    2 
 external/jfreereport/ExternalProject_jfreereport_libxml.mk            |    2 
 external/jfreereport/ExternalProject_jfreereport_sac.mk               |    2 
 external/lcms2/ExternalProject_lcms2.mk                               |    4 
 external/libabw/ExternalProject_libabw.mk                             |    2 
 external/libassuan/ExternalProject_libassuan.mk                       |    4 
 external/libatomic_ops/ExternalProject_libatomic_ops.mk               |    2 
 external/libcdr/ExternalProject_libcdr.mk                             |    2 
 external/libebook/ExternalProject_libebook.mk                         |    2 
 external/libeot/ExternalProject_libeot.mk                             |    2 
 external/libepubgen/ExternalProject_libepubgen.mk                     |    2 
 external/libetonyek/ExternalProject_libetonyek.mk                     |    2 
 external/libexttextcat/ExternalProject_libexttextcat.mk               |    2 
 external/libffi/ExternalProject_libffi.mk                             |    2 
 external/libfreehand/ExternalProject_libfreehand.mk                   |    2 
 external/libgpg-error/ExternalProject_libgpg-error.mk                 |    4 
 external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk               |    4 
 external/liblangtag/ExternalProject_liblangtag.mk                     |    3 
 external/libmspub/ExternalProject_libmspub.mk                         |    2 
 external/libmwaw/ExternalProject_libmwaw.mk                           |    2 
 external/libnumbertext/ExternalProject_libnumbertext.mk               |    2 
 external/libodfgen/ExternalProject_libodfgen.mk                       |    2 
 external/liborcus/ExternalProject_liborcus.mk                         |    2 
 external/libpagemaker/ExternalProject_libpagemaker.mk                 |    2 
 external/libqxp/ExternalProject_libqxp.mk                             |    2 
 external/librevenge/ExternalProject_librevenge.mk                     |    2 
 external/libstaroffice/ExternalProject_libstaroffice.mk               |    2 
 external/libtommath/ExternalProject_libtommath.mk                     |    4 
 external/libvisio/ExternalProject_libvisio.mk                         |    2 
 external/libwpd/ExternalProject_libwpd.mk                             |    2 
 external/libwpg/ExternalProject_libwpg.mk                             |    2 
 external/libwps/ExternalProject_libwps.mk                             |    2 
 external/libxml2/ExternalProject_libxml2.mk                           |    4 
 external/libxslt/ExternalProject_libxslt.mk                           |    4 
 external/libzmf/ExternalProject_libzmf.mk                             |    2 
 external/lpsolve/ExternalProject_lpsolve.mk                           |    4 
 external/lxml/ExternalProject_lxml.mk                                 |    4 
 external/mythes/ExternalProject_mythes.mk                             |    2 
 external/nss/ExternalProject_nss.mk                                   |    4 
 external/openldap/ExternalProject_openldap.mk                         |    2 
 external/openssl/ExternalProject_openssl.mk                           |    4 
 external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk |    2 
 external/postgresql/ExternalProject_postgresql.mk                     |    4 
 external/python3/ExternalProject_python3.mk                           |    4 
 external/redland/ExternalProject_raptor.mk                            |    2 
 external/redland/ExternalProject_rasqal.mk                            |    2 
 external/redland/ExternalProject_redland.mk                           |    2 
 external/rhino/ExternalProject_rhino.mk                               |    2 
 external/serf/ExternalProject_serf.mk                                 |    4 
 external/xmlsec/ExternalProject_xmlsec.mk                             |    4 
 extras/CustomTarget_autocorr.mk                                       |    6 
 extras/CustomTarget_autotextshare.mk                                  |   12 
 extras/CustomTarget_autotextuser.mk                                   |    6 
 extras/CustomTarget_glade.mk                                          |    2 
 extras/CustomTarget_opensymbol.mk                                     |    2 
 extras/CustomTarget_tpl_styles.mk                                     |   16 +
 extras/CustomTarget_tplofficorr.mk                                    |   16 +
 extras/CustomTarget_tploffimisc.mk                                    |   16 +
 extras/CustomTarget_tplpersonal.mk                                    |   16 +
 extras/CustomTarget_tplpresnt.mk                                      |   14 +
 filter/Configuration_filter.mk                                        |   12 
 i18npool/CustomTarget_breakiterator.mk                                |   10 
 i18npool/CustomTarget_collator.mk                                     |    4 
 i18npool/CustomTarget_indexentry.mk                                   |    2 
 i18npool/CustomTarget_localedata.mk                                   |    2 
 i18npool/CustomTarget_textconversion.mk                               |    2 
 instsetoo_native/CustomTarget_install.mk                              |   10 
 instsetoo_native/CustomTarget_setup.mk                                |   16 +
 ios/CustomTarget_iOS_link.mk                                          |    2 
 ios/CustomTarget_iOS_setup.mk                                         |    4 
 jvmfwk/CustomTarget_jreproperties.mk                                  |    2 
 jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk                             |    2 
 librelogo/CustomTarget_librelogo.mk                                   |    2 
 odk/CustomTarget_allheaders.mk                                        |    2 
 odk/CustomTarget_check.mk                                             |    2 
 odk/CustomTarget_doxygen.mk                                           |    8 
 odk/CustomTarget_html.mk                                              |    2 
 odk/CustomTarget_javadoc.mk                                           |    2 
 officecfg/CustomTarget_registry.mk                                    |    4 
 postprocess/CustomTarget_check_dynamic_objects.mk                     |    2 
 postprocess/CustomTarget_images.mk                                    |    6 
 postprocess/CustomTarget_registry.mk                                  |   12 
 postprocess/CustomTarget_signing.mk                                   |    2 
 pyuno/CustomTarget_python_shell.mk                                    |    4 
 pyuno/CustomTarget_pyuno_pythonloader_ini.mk                          |    2 
 readlicense_oo/CustomTarget_license.mk                                |    6 
 readlicense_oo/CustomTarget_readme.mk                                 |    4 
 ridljar/CustomTarget_javamaker.mk                                     |    2 
 ridljar/CustomTarget_test_urp.mk                                      |    2 
 sdext/CustomTarget_pdfimport.mk                                       |    2 
 shell/CustomTarget_shlxthdl_res.mk                                    |    2 
 shell/CustomTarget_spsupp_idl.mk                                      |    2 
 solenv/bin/finish-gbuild-trace.py                                     |  137 ++++++++++
 solenv/gbuild/AllLangHelp.mk                                          |    1 
 solenv/gbuild/AllLangMoTarget.mk                                      |    2 
 solenv/gbuild/AllLangPackage.mk                                       |    3 
 solenv/gbuild/AutoInstall.mk                                          |    2 
 solenv/gbuild/CliAssembly.mk                                          |    9 
 solenv/gbuild/CliLibrary.mk                                           |    4 
 solenv/gbuild/CliNativeLibrary.mk                                     |    5 
 solenv/gbuild/CliUnoApi.mk                                            |    4 
 solenv/gbuild/ComponentTarget.mk                                      |    4 
 solenv/gbuild/Configuration.mk                                        |   25 +
 solenv/gbuild/CppunitTest.mk                                          |    2 
 solenv/gbuild/CustomTarget.mk                                         |    5 
 solenv/gbuild/Dictionary.mk                                           |   13 
 solenv/gbuild/Extension.mk                                            |   14 +
 solenv/gbuild/ExtensionPackage.mk                                     |    3 
 solenv/gbuild/ExternalPackage.mk                                      |    1 
 solenv/gbuild/ExternalProject.mk                                      |    1 
 solenv/gbuild/Gallery.mk                                              |    8 
 solenv/gbuild/GeneratedPackage.mk                                     |    2 
 solenv/gbuild/HelpTarget.mk                                           |   22 +
 solenv/gbuild/InstallModule.mk                                        |    1 
 solenv/gbuild/InstallModuleTarget.mk                                  |   16 -
 solenv/gbuild/InstallScript.mk                                        |    4 
 solenv/gbuild/InternalUnoApi.mk                                       |    1 
 solenv/gbuild/Jar.mk                                                  |    4 
 solenv/gbuild/JavaClassSet.mk                                         |    2 
 solenv/gbuild/JunitTest.mk                                            |    2 
 solenv/gbuild/LinkTarget.mk                                           |   60 +++-
 solenv/gbuild/Module.mk                                               |   15 +
 solenv/gbuild/Package.mk                                              |    2 
 solenv/gbuild/PackageSet.mk                                           |    2 
 solenv/gbuild/Pagein.mk                                               |    4 
 solenv/gbuild/Postprocess.mk                                          |    1 
 solenv/gbuild/PythonTest.mk                                           |    2 
 solenv/gbuild/Pyuno.mk                                                |    1 
 solenv/gbuild/Rdb.mk                                                  |    2 
 solenv/gbuild/SdiTarget.mk                                            |    2 
 solenv/gbuild/Trace.mk                                                |   61 ++++
 solenv/gbuild/UIConfig.mk                                             |   10 
 solenv/gbuild/UITest.mk                                               |    2 
 solenv/gbuild/UnoApiTarget.mk                                         |   10 
 solenv/gbuild/UnpackedTarball.mk                                      |   11 
 solenv/gbuild/Zip.mk                                                  |    2 
 solenv/gbuild/gbuild.mk                                               |    2 
 solenv/gbuild/platform/android.mk                                     |    2 
 solenv/gbuild/platform/com_GCC_class.mk                               |    2 
 solenv/gbuild/platform/com_MSC_class.mk                               |   11 
 solenv/gbuild/platform/iOS.mk                                         |    4 
 solenv/gbuild/platform/macosx.mk                                      |    4 
 solenv/gbuild/platform/solaris.mk                                     |    4 
 solenv/gbuild/platform/unxgcc.mk                                      |    4 
 sysui/CustomTarget_infoplist.mk                                       |    4 
 sysui/CustomTarget_share.mk                                           |   16 +
 testtools/CustomTarget_bridgetest.mk                                  |    8 
 testtools/CustomTarget_bridgetest_climaker.mk                         |    2 
 testtools/CustomTarget_bridgetest_javamaker.mk                        |    2 
 tools/CustomTarget_reversemap.mk                                      |    2 
 unoil/CustomTarget_javamaker.mk                                       |    2 
 vcl/CustomTarget_gtk3_kde5_moc.mk                                     |    2 
 vcl/CustomTarget_kf5_moc.mk                                           |    2 
 vcl/CustomTarget_qt5_moc.mk                                           |    2 
 winaccessibility/CustomTarget_ia2_idl.mk                              |    2 
 wizards/CustomTarget_share.mk                                         |    2 
 wizards/CustomTarget_wizards.mk                                       |    2 
 191 files changed, 979 insertions(+), 54 deletions(-)

New commits:
commit 0adc9b615f118ebb78f5f2edfe0c1c0e41270d57
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Feb 10 10:31:26 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Sun Feb 16 14:49:45 2020 +0100

    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 at collabora.com>

diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk
index b64c9245aeff..c735139fa06e 100644
--- a/android/CustomTarget_lo_android.mk
+++ b/android/CustomTarget_lo_android.mk
@@ -15,12 +15,14 @@ $(call gb_CustomTarget_get_target,android/loandroid3) : \
 
 $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
+	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MAK)
 	cd $(SRCDIR)/android/source && $(MAKE) all
 # Copy to $(BUILDDIR)/instsetoo_native as that is where the tinderbox build script
 # still looks for the .apk, and we want fresh daily builds to be uploaded.
 # Us "foo" instead of the old INPATH
 	mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \
 	if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/$(if $(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) $(BUILDDIR)/instsetoo_native/foo/bin ; fi
+	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),MAK)
 
 $(call gb_CustomTarget_get_clean_target,android/loandroid3) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk
index 2fbd54b682c0..1fa356db16b3 100644
--- a/desktop/CustomTarget_soffice.mk
+++ b/desktop/CustomTarget_soffice.mk
@@ -16,10 +16,12 @@ $(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh : \
 		$(SRCDIR)/desktop/scripts/soffice.sh \
 		| $(call gb_CustomTarget_get_workdir,desktop/soffice)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
+	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED)
 ifneq ($(JITC_PROCESSOR_TYPE),)
 	sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@
 else
 	cp $< $@
 endif
+	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/extensions/CustomTarget_automationtest.mk b/extensions/CustomTarget_automationtest.mk
index 1c115b09a8b5..e895c0b2a337 100644
--- a/extensions/CustomTarget_automationtest.mk
+++ b/extensions/CustomTarget_automationtest.mk
@@ -17,11 +17,13 @@ extensions_AUTOMATIONTESTLOG2 := $(extensions_AUTOMATIONTESTDIR)/automationtest.
 $(call gb_CustomTarget_get_target,extensions/automationtest) : \
 		$(SRCDIR)/extensions/qa/ole/automationtest.vbs \
 		| $(extensions_AUTOMATIONTESTDIR)/.dir
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),VBS,1) \
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),VBS,1)
+	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),VBS)
 	SAL_LOG=+INFO.extensions.olebridge+WARN $(INSTDIR)/program/soffice 2>$(extensions_AUTOMATIONTESTLOG1) &
 	sleep 10
 	$(call gb_Helper_abbreviate_dirs, \
 	cscript -nologo $(SRCDIR)/extensions/qa/ole/automationtest.vbs $(SRCDIR)) >$(extensions_AUTOMATIONTESTLOG2) || \
             (cat $(extensions_AUTOMATIONTESTLOG1) $(extensions_AUTOMATIONTESTLOG2) && exit 1)
+	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),VBS)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/extensions/CustomTarget_so_activex_idl.mk b/extensions/CustomTarget_so_activex_idl.mk
index db1679434af1..b4d841aec524 100644
--- a/extensions/CustomTarget_so_activex_idl.mk
+++ b/extensions/CustomTarget_so_activex_idl.mk
@@ -21,6 +21,7 @@ $(extensions_AXIDLDIR)/so_activex.tlb : \
 		$(SRCDIR)/extensions/source/activex/so_activex.idl \
 		| $(extensions_AXIDLDIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1)
+	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),IDL)
 	$(call gb_Helper_abbreviate_dirs, \
 	midl.exe \
 		-tlb $@ \
@@ -31,5 +32,6 @@ $(extensions_AXIDLDIR)/so_activex.tlb : \
 		-Oicf \
 		$(INCLUDE) \
 		$<)
+	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),IDL)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/external/apache-commons/ExternalProject_apache_commons_logging.mk b/external/apache-commons/ExternalProject_apache_commons_logging.mk
index 47981ee9ecd6..640810d9c1ed 100644
--- a/external/apache-commons/ExternalProject_apache_commons_logging.mk
+++ b/external/apache-commons/ExternalProject_apache_commons_logging.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\
 ))
 
 $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) :
+	$(call gb_Trace_StartRange,apache_commons_logging,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
 	$(ICECREAM_RUN) "$(ANT)" \
@@ -25,5 +26,6 @@ $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) :
 		$(if $(debug),-Dcompile.debug="true",-Dcompile.debug="false") \
 		compile build-jar \
 	)
+	$(call gb_Trace_EndRange,apache_commons_logging,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/apr/ExternalProject_apr.mk b/external/apr/ExternalProject_apr.mk
index 00e3ab67086a..1c94480e5ab7 100644
--- a/external/apr/ExternalProject_apr.mk
+++ b/external/apr/ExternalProject_apr.mk
@@ -17,14 +17,17 @@ $(eval $(call gb_ExternalProject_use_nmake,apr,build))
 
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,apr,build):
+	$(call gb_Trace_StartRange,apr,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		nmake -nologo -f apr.mak \
 			CFG="apr - Win32 $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)" \
 			RECURSE=0 \
 	)
+	$(call gb_Trace_EndRange,apr,EXTERNAL)
 
 else
 $(call gb_ExternalProject_get_state_target,apr,build):
+	$(call gb_Trace_StartRange,apr,EXTERNAL)
 	+$(call gb_ExternalProject_run,build,\
 		 $(if $(ENABLE_MACOSX_SANDBOX),ac_cv_func_fdatasync=no) \
 		./configure \
@@ -33,6 +36,7 @@ $(call gb_ExternalProject_get_state_target,apr,build):
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
 		&& $(MAKE) libapr-1.la \
 	)
+	$(call gb_Trace_EndRange,apr,EXTERNAL)
 
 endif
 
diff --git a/external/apr/ExternalProject_apr_util.mk b/external/apr/ExternalProject_apr_util.mk
index 4de76ba4c43a..a311f32e8e01 100644
--- a/external/apr/ExternalProject_apr_util.mk
+++ b/external/apr/ExternalProject_apr_util.mk
@@ -19,14 +19,17 @@ $(eval $(call gb_ExternalProject_use_nmake,apr_util,build))
 
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,apr_util,build):
+	$(call gb_Trace_StartRange,apr_util,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		nmake -nologo -f aprutil.mak \
 			CFG="aprutil - Win32 $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)" \
 			RECURSE=0 \
 	)
+	$(call gb_Trace_EndRange,apr_util,EXTERNAL)
 
 else
 $(call gb_ExternalProject_get_state_target,apr_util,build):
+	$(call gb_Trace_StartRange,apr_util,EXTERNAL)
 	+$(call gb_ExternalProject_run,build,\
 		./configure \
 			--enable-static --disable-shared \
@@ -35,6 +38,7 @@ $(call gb_ExternalProject_get_state_target,apr_util,build):
 			--with-apr=$(call gb_UnpackedTarball_get_dir,apr)/apr-1-config \
 		&& $(MAKE) libaprutil-1.la \
 	)
+	$(call gb_Trace_EndRange,apr_util,EXTERNAL)
 
 endif
 
diff --git a/external/beanshell/ExternalProject_beanshell.mk b/external/beanshell/ExternalProject_beanshell.mk
index 6f43c9477e40..d6ce0af49ebe 100644
--- a/external/beanshell/ExternalProject_beanshell.mk
+++ b/external/beanshell/ExternalProject_beanshell.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,beanshell,\
 ))
 
 $(call gb_ExternalProject_get_state_target,beanshell,build) :
+	$(call gb_Trace_StartRange,beanshell,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 	$(ICECREAM_RUN) "$(ANT)" \
 		$(if $(verbose),-v,-q) \
@@ -23,5 +24,6 @@ $(call gb_ExternalProject_get_state_target,beanshell,build) :
 		-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 		$(if $(debug),-Dbuild.debug="on") \
 	)
+	$(call gb_Trace_EndRange,beanshell,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/breakpad/ExternalProject_breakpad.mk b/external/breakpad/ExternalProject_breakpad.mk
index f95b4b2e65b4..9e7e72485849 100644
--- a/external/breakpad/ExternalProject_breakpad.mk
+++ b/external/breakpad/ExternalProject_breakpad.mk
@@ -19,10 +19,12 @@ ifeq ($(COM),MSC)
 else # !ifeq($(COM),MSC)
 
 $(call gb_ExternalProject_get_state_target,breakpad,build) :
+	$(call gb_Trace_StartRange,breakpad,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure CXXFLAGS="-O2 $(gb_VISIBILITY_FLAGS)" \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,breakpad,EXTERNAL)
 
 endif
 
diff --git a/external/bzip2/ExternalProject_bzip2.mk b/external/bzip2/ExternalProject_bzip2.mk
index 5b88ced29b10..8b37bcd27151 100644
--- a/external/bzip2/ExternalProject_bzip2.mk
+++ b/external/bzip2/ExternalProject_bzip2.mk
@@ -17,14 +17,18 @@ $(eval $(call gb_ExternalProject_use_nmake,bzip2,build))
 
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,bzip2,build):
+	$(call gb_Trace_StartRange,bzip2,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		nmake -nologo -f makefile.msc \
 	)
+	$(call gb_Trace_EndRange,bzip2,EXTERNAL)
 else
 $(call gb_ExternalProject_get_state_target,bzip2,build):
+	$(call gb_Trace_StartRange,bzip2,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(MAKE) \
 	)
+	$(call gb_Trace_EndRange,bzip2,EXTERNAL)
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index 3dac98fc4362..43b4a7b53b2a 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -29,9 +29,11 @@ $(eval $(call gb_ExternalProject_register_targets,cairo,\
 ifeq ($(OS),WNT)
 
 $(call gb_ExternalProject_get_state_target,cairo,build) :
+	$(call gb_Trace_StartRange,cairo,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 	$(MAKE) -f Makefile.win32 CFG=release ZLIB3RDLIB=zlib.lib \
 	)
+	$(call gb_Trace_EndRange,cairo,EXTERNAL)
 
 
 else
@@ -40,6 +42,7 @@ else
 # from cairo.h in non-overridable way
 
 $(call gb_ExternalProject_get_state_target,cairo,build) :
+	$(call gb_Trace_StartRange,cairo,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 	./configure \
 		$(if $(debug),STRIP=" ") \
@@ -69,6 +72,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
 	&& cp cairo-version.h src/cairo-version.h \
 	&& cd src && $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,cairo,EXTERNAL)
 
 endif
 
diff --git a/external/cairo/ExternalProject_pixman.mk b/external/cairo/ExternalProject_pixman.mk
index 6dd2d6bed867..fec943762df8 100644
--- a/external/cairo/ExternalProject_pixman.mk
+++ b/external/cairo/ExternalProject_pixman.mk
@@ -16,9 +16,11 @@ $(eval $(call gb_ExternalProject_register_targets,pixman,\
 ifeq ($(OS),WNT)
 
 $(call gb_ExternalProject_get_state_target,pixman,build) :
+	$(call gb_Trace_StartRange,pixman,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(MAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release \
 	,pixman)
+	$(call gb_Trace_EndRange,pixman,EXTERNAL)
 
 else
 
@@ -30,6 +32,7 @@ else
 # pixman-cpu.c to be hardcoded as TRUE and patch out the run-time
 # check?
 $(call gb_ExternalProject_get_state_target,pixman,build) :
+	$(call gb_Trace_StartRange,pixman,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure \
 		$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,$(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static)) \
@@ -38,6 +41,7 @@ $(call gb_ExternalProject_get_state_target,pixman,build) :
 		$(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,pixman,EXTERNAL)
 
 endif
 
diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk
index e2eeaf93ed8f..7c10b0576a62 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_ExternalProject_register_targets,coinmp,\
 
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,coinmp,build) :
+	$(call gb_Trace_StartRange,coinmp,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		MSBuild.exe CoinMP.sln /t:Build \
 			/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
@@ -23,9 +24,11 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
 			$(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
 			$(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
 	,CoinMP/MSVisualStudio/v9)
+	$(call gb_Trace_EndRange,coinmp,EXTERNAL)
 
 else
 $(call gb_ExternalProject_get_state_target,coinmp,build) :
+	$(call gb_Trace_StartRange,coinmp,EXTERNAL)
 	+$(call gb_ExternalProject_run,build,\
 		./configure COIN_SKIP_PROJECTS="Data/Sample" \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
@@ -50,6 +53,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
 			$(EXTERNAL_WORKDIR)/CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib \
 			$(EXTERNAL_WORKDIR)/Osi/src/Osi/.libs/libOsi.1.11.5.dylib) \
 	)
+	$(call gb_Trace_EndRange,coinmp,EXTERNAL)
 
 endif
 
diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk
index 4bacac8ffe80..b9ff8b50684b 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\
 
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,cppunit,build) :
+	$(call gb_Trace_StartRange,cppunit,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 	    PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
 		/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
@@ -25,6 +26,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
 		&& cd ../DllPlugInTester \
 		&& msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$${PROFILEFLAGS} \
 	,src/cppunit)
+	$(call gb_Trace_EndRange,cppunit,EXTERNAL)
 else
 
 cppunit_CXXFLAGS=$(CXXFLAGS)
@@ -40,6 +42,7 @@ cppunit_CXXFLAGS+=-g
 endif
 
 $(call gb_ExternalProject_get_state_target,cppunit,build) :
+	$(call gb_Trace_StartRange,cppunit,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure \
 			--disable-dependency-tracking \
@@ -57,6 +60,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
 		&& cd src \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,cppunit,EXTERNAL)
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index fc5866df6115..cb6fd0809a37 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -38,6 +38,7 @@ endif
 # use --with-darwinssl on macOS >10.5 and iOS to get a native UI for SSL certs for CMIS usage
 # use --with-nss only on platforms other than macOS and iOS
 $(call gb_ExternalProject_get_state_target,curl,build):
+	$(call gb_Trace_StartRange,curl,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure \
 			$(if $(filter iOS MACOSX,$(OS)),\
@@ -67,12 +68,14 @@ $(call gb_ExternalProject_get_state_target,curl,build):
 		&& cd lib \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,curl,EXTERNAL)
 
 else ifeq ($(COM),MSC)
 
 $(eval $(call gb_ExternalProject_use_nmake,curl,build))
 
 $(call gb_ExternalProject_get_state_target,curl,build):
+	$(call gb_Trace_StartRange,curl,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		nmake -f Makefile.vc \
 			mode=dll \
@@ -84,6 +87,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
 			ENABLE_SSPI=yes \
 			ENABLE_WINSSL=yes \
 	,winbuild)
+	$(call gb_Trace_EndRange,curl,EXTERNAL)
 
 endif
 
diff --git a/external/epm/ExternalProject_epm.mk b/external/epm/ExternalProject_epm.mk
index ca0c298509c6..68a61a78a744 100644
--- a/external/epm/ExternalProject_epm.mk
+++ b/external/epm/ExternalProject_epm.mk
@@ -14,11 +14,13 @@ $(eval $(call gb_ExternalProject_register_targets,epm,\
 ))
 
 $(call gb_ExternalProject_get_state_target,epm,build) :
+	$(call gb_Trace_StartRange,epm,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure --disable-fltk \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \
 		&& $(MAKE) \
 		&& touch $@ \
 	)
+	$(call gb_Trace_EndRange,epm,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/expat/ExternalProject_expat.mk b/external/expat/ExternalProject_expat.mk
index 87886eab1f7e..4f4f0301c1bc 100644
--- a/external/expat/ExternalProject_expat.mk
+++ b/external/expat/ExternalProject_expat.mk
@@ -14,10 +14,12 @@ $(eval $(call gb_ExternalProject_register_targets,expat,\
 ))
 
 $(call gb_ExternalProject_get_state_target,expat,configure) :
+	$(call gb_Trace_StartRange,expat,EXTERNAL)
 	$(call gb_ExternalProject_run,configure,\
 		./configure --without-docbook \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 			$(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \
 	,,expat_configure.log)
+	$(call gb_Trace_EndRange,expat,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index a70a53d0e9d5..ce99e909aee1 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -38,6 +38,7 @@ MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
 			$(EXTERNAL_WORKDIR)/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.dylib.3.0.0)
 
 $(call gb_ExternalProject_get_state_target,firebird,build):
+	$(call gb_Trace_StartRange,firebird,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		unset MAKEFLAGS \
 		&& FB_CPU_ARG='$(filter --jobserver-fds=%,$(MAKEFLAGS))' \
@@ -110,4 +111,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 				$(MAKE_POST); \
 			fi \
 	)
+	$(call gb_Trace_EndRange,firebird,EXTERNAL)
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk
index 32fc03f52db7..b82c7657395b 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,fontconfig,\
 ))
 
 $(call gb_ExternalProject_get_state_target,fontconfig,build) :
+	$(call gb_Trace_StartRange,fontconfig,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" $(if $(filter ANDROID,$(OS)),LIBS="-lm") \
 		./configure \
@@ -30,5 +31,6 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
 			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 		&& $(MAKE) -C src \
 	)
+	$(call gb_Trace_EndRange,fontconfig,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk
index 46c7972d0601..3f4a719d5663 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -15,12 +15,15 @@ $(eval $(call gb_ExternalProject_register_targets,freetype,\
 
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,freetype,build) :
+	$(call gb_Trace_StartRange,freetype,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		cd ../builds/win32/vc2010/ && \
 		msbuild.exe freetype.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
 	,objs)
+	$(call gb_Trace_EndRange,freetype,EXTERNAL)
 else
 $(call gb_ExternalProject_get_state_target,freetype,build) :
+	$(call gb_Trace_StartRange,freetype,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure \
 			--disable-shared \
@@ -32,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
 			CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \
 		&& $(MAKE) install \
 		&& touch $@	)
+	$(call gb_Trace_EndRange,freetype,EXTERNAL)
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 8ecdf60e6f87..989844465f1f 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -24,6 +24,7 @@ ifeq ($(COM),MSC)
 gb_ExternalProject_gpgmepp_host := $(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32)
 gb_ExternalProject_gpgmepp_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
 $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_get_target,cpp)
+	$(call gb_Trace_StartRange,gpgmepp,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		autoreconf \
 		&& ./configure \
@@ -43,8 +44,10 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_
 		   MAKE=$(MAKE) \
 	    && $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,gpgmepp,EXTERNAL)
 else
 $(call gb_ExternalProject_get_state_target,gpgmepp,build):
+	$(call gb_Trace_StartRange,gpgmepp,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		autoreconf \
 		&& ./configure \
@@ -76,6 +79,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
 			  $(EXTERNAL_WORKDIR)/src/.libs/libgpgme.11.dylib \
 		) \
 	)
+	$(call gb_Trace_EndRange,gpgmepp,EXTERNAL)
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 583ffc363bf7..7219d402df3c 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,harfbuzz,\
 ))
 
 $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
+	$(call gb_Trace_StartRange,harfbuzz,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(if $(CROSS_COMPILING),ICU_CONFIG=$(SRCDIR)/external/icu/cross-bin/icu-config) \
 		$(if $(SYSTEM_ICU),,ICU_CONFIG=$(SRCDIR)/external/icu/cross-bin/icu-config) \
@@ -53,5 +54,6 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
 			MAKE=$(MAKE) \
 		&& (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) lib) \
 	)
+	$(call gb_Trace_EndRange,harfbuzz,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/hsqldb/ExternalProject_hsqldb.mk b/external/hsqldb/ExternalProject_hsqldb.mk
index 4ecc00af978f..d253334549b7 100644
--- a/external/hsqldb/ExternalProject_hsqldb.mk
+++ b/external/hsqldb/ExternalProject_hsqldb.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,hsqldb,\
 ))
 
 $(call gb_ExternalProject_get_state_target,hsqldb,build) :
+	$(call gb_Trace_StartRange,hsqldb,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(ICECREAM_RUN) "$(ANT)" \
 			$(if $(verbose),-v,-q) \
@@ -24,5 +25,6 @@ $(call gb_ExternalProject_get_state_target,hsqldb,build) :
 			$(if $(debug),-Dbuild.debug="on") \
 			jar \
 	)
+	$(call gb_Trace_EndRange,hsqldb,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/hunspell/ExternalProject_hunspell.mk b/external/hunspell/ExternalProject_hunspell.mk
index 3686f141f2c2..43da1c254e34 100644
--- a/external/hunspell/ExternalProject_hunspell.mk
+++ b/external/hunspell/ExternalProject_hunspell.mk
@@ -22,6 +22,7 @@ endif
 endif
 
 $(call gb_ExternalProject_get_state_target,hunspell,build):
+	$(call gb_Trace_StartRange,hunspell,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure --disable-shared --disable-nls --with-pic \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
@@ -30,5 +31,6 @@ $(call gb_ExternalProject_get_state_target,hunspell,build):
 			CXXFLAGS="$(CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS))" \
 		&& cd src/hunspell && $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,hunspell,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/ExternalProject_hyphen.mk b/external/hyphen/ExternalProject_hyphen.mk
index 9332cecd26b6..21cef66d85d0 100644
--- a/external/hyphen/ExternalProject_hyphen.mk
+++ b/external/hyphen/ExternalProject_hyphen.mk
@@ -16,11 +16,13 @@ $(eval $(call gb_ExternalProject_register_targets,hyphen,\
 ))
 
 $(call gb_ExternalProject_get_state_target,hyphen,build):
+	$(call gb_Trace_StartRange,hyphen,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure --disable-shared \
 			$(if $(filter-out iOS,$(OS)),--with-pic) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,hyphen,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index b01190917497..1845ec3472a1 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -19,6 +19,7 @@ ifeq ($(OS),WNT)
 
 # Note: runConfigureICU ignores everything following the platform name!
 $(call gb_ExternalProject_get_state_target,icu,build) :
+	$(call gb_Trace_StartRange,icu,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export LIB="$(ILIB)" \
 		&& CFLAGS="-FS -arch:SSE $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="-FS -arch:SSE $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" \
@@ -28,6 +29,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 			Cygwin/MSVC --disable-extras \
 		&& $(MAKE) \
 	,source)
+	$(call gb_Trace_EndRange,icu,EXTERNAL)
 
 else # $(OS)
 
@@ -59,6 +61,7 @@ icu_LDFLAGS:=" \
 # data directory/doesn't build the requested library in that case (icu/source/Makefile.in)
 # so we need to add it back to the list of subdirectories to build
 $(call gb_ExternalProject_get_state_target,icu,build) :
+	$(call gb_Trace_StartRange,icu,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \
 		CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \
@@ -84,6 +87,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 				OOO \
 				$(EXTERNAL_WORKDIR)/source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)) \
 	,source)
+	$(call gb_Trace_EndRange,icu,EXTERNAL)
 
 endif
 
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index 38247c21f50f..ffa12623d191 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_flow_engine,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
+	$(call gb_Trace_StartRange,jfreereport_flow_engine,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(ICECREAM_RUN) "$(ANT)" \
 			$(if $(verbose),-v,-q) \
@@ -36,5 +37,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
 			-Dant.build.javac.target=$(JAVA_TARGET_VER) \
 			$(if $(debug),-Dbuild.debug="on") jar \
 	)
+	$(call gb_Trace_EndRange,jfreereport_flow_engine,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/ExternalProject_jfreereport_flute.mk b/external/jfreereport/ExternalProject_jfreereport_flute.mk
index e3b4167a3cfa..a9cb63819c87 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flute.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flute.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_flute,build) :
+	$(call gb_Trace_StartRange,jfreereport_flute,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(ICECREAM_RUN) "$(ANT)" \
 			$(if $(verbose),-v,-q) \
@@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flute,build) :
 			-Dproject.revision="$(FLUTE_VERSION)" \
 			$(if $(debug),-Dbuild.debug="on") jar \
 	)
+	$(call gb_Trace_EndRange,jfreereport_flute,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/ExternalProject_jfreereport_libbase.mk b/external/jfreereport/ExternalProject_jfreereport_libbase.mk
index 8ad52770342d..2e236d192143 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libbase.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libbase.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) :
+	$(call gb_Trace_StartRange,jfreereport_libbase,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(ICECREAM_RUN) "$(ANT)" \
 			$(if $(verbose),-v,-q) \
@@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) :
 			-Dproject.revision="$(LIBBASE_VERSION)" \
 			$(if $(debug),-Dbuild.debug="on") jar \
 	)
+	$(call gb_Trace_EndRange,jfreereport_libbase,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/ExternalProject_jfreereport_libfonts.mk b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk
index bf19cd112d21..b14644c80c3b 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libfonts.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) :
+	$(call gb_Trace_StartRange,jfreereport_libfonts,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(ICECREAM_RUN) "$(ANT)" \
 			$(if $(verbose),-v,-q) \
@@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) :
 			-Dproject.revision="$(LIBFONTS_VERSION)" \
 			$(if $(debug),-Dbuild.debug="on") jar \
 	)
+	$(call gb_Trace_EndRange,jfreereport_libfonts,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/ExternalProject_jfreereport_libformula.mk b/external/jfreereport/ExternalProject_jfreereport_libformula.mk
index 4b0a21198e34..95c650e8fe64 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libformula.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libformula.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) :
+	$(call gb_Trace_StartRange,jfreereport_libformula,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(ICECREAM_RUN) "$(ANT)" \
 			$(if $(verbose),-v,-q) \
@@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) :
 			-Dproject.revision="$(LIBFORMULA_VERSION)" \
 			$(if $(debug),-Dbuild.debug="on") jar \
 	)
+	$(call gb_Trace_EndRange,jfreereport_libformula,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
index 831711dd44c8..519368c2b649 100644
--- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_liblayout,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
+	$(call gb_Trace_StartRange,jfreereport_liblayout,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(ICECREAM_RUN) "$(ANT)" \
 			$(if $(verbose),-v,-q) \
@@ -53,5 +54,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
 			-Dbuild.id="10682" \
 			$(if $(debug),-Dbuild.debug="on") jar \
 	)
+	$(call gb_Trace_EndRange,jfreereport_liblayout,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/ExternalProject_jfreereport_libloader.mk b/external/jfreereport/ExternalProject_jfreereport_libloader.mk
index 02e913b2bff9..2b37d9a224b8 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libloader.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libloader.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) :
+	$(call gb_Trace_StartRange,jfreereport_libloader,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(ICECREAM_RUN) "$(ANT)" \
 			$(if $(verbose),-v,-q) \
@@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) :
 			-Dproject.revision="$(LIBLOADER_VERSION)" \
 			$(if $(debug),-Dbuild.debug="on") jar \
 	)
+	$(call gb_Trace_EndRange,jfreereport_libloader,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/ExternalProject_jfreereport_librepository.mk b/external/jfreereport/ExternalProject_jfreereport_librepository.mk
index 046aba46aad4..e95610b854c6 100644
--- a/external/jfreereport/ExternalProject_jfreereport_librepository.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_librepository.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) :
+	$(call gb_Trace_StartRange,jfreereport_librepository,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(ICECREAM_RUN) "$(ANT)" \
 			$(if $(verbose),-v,-q) \
@@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) :
 			-Dproject.revision="$(LIBREPOSITORY_VERSION)" \
 			$(if $(debug),-Dbuild.debug="on") jar \
 	)
+	$(call gb_Trace_EndRange,jfreereport_librepository,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/ExternalProject_jfreereport_libserializer.mk b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk
index 5bf76573f001..34614fb08b6a 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libserializer.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) :
+	$(call gb_Trace_StartRange,jfreereport_libserializer,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(ICECREAM_RUN) "$(ANT)" \
 			$(if $(verbose),-v,-q) \
@@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) :
 			-Dproject.revision="$(LIBSERIALIZER_VERSION)" \
 			$(if $(debug),-Dbuild.debug="on") jar \
 	)
+	$(call gb_Trace_EndRange,jfreereport_libserializer,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/ExternalProject_jfreereport_libxml.mk b/external/jfreereport/ExternalProject_jfreereport_libxml.mk
index fd4b6d832cc7..478a75747dc6 100644
--- a/external/jfreereport/ExternalProject_jfreereport_libxml.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_libxml.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) :
+	$(call gb_Trace_StartRange,jfreereport_libxml,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(ICECREAM_RUN) "$(ANT)" \
 			$(if $(verbose),-v,-q) \
@@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) :
 			-Dproject.revision="$(LIBXML_VERSION)" \
 			$(if $(debug),-Dbuild.debug="on") jar \
 	)
+	$(call gb_Trace_EndRange,jfreereport_libxml,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/ExternalProject_jfreereport_sac.mk b/external/jfreereport/ExternalProject_jfreereport_sac.mk
index f6aeee2ad271..b78d8a970b15 100644
--- a/external/jfreereport/ExternalProject_jfreereport_sac.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_sac.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\
 ))
 
 $(call gb_ExternalProject_get_state_target,jfreereport_sac,build) :
+	$(call gb_Trace_StartRange,jfreereport_sac,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(ICECREAM_RUN) "$(ANT)" \
 			$(if $(verbose),-v,-q) \
@@ -24,5 +25,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_sac,build) :
 			-Dantcontrib.available="true" \
 			$(if $(debug),-Dbuild.debug="on") all \
 	)
+	$(call gb_Trace_EndRange,jfreereport_sac,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk
index 062a727e04fe..ceafec548b1b 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,lcms2,\
 ifeq ($(COM),MSC)
 
 $(call gb_ExternalProject_get_state_target,lcms2,build):
+	$(call gb_Trace_StartRange,lcms2,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		MSBuild.exe lcms2_DLL.vcxproj \
 			$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 /p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
@@ -24,8 +25,10 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
 			/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
 			/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:TargetName=lcms2 \
 	,Projects/VC2017/lcms2_DLL)
+	$(call gb_Trace_EndRange,lcms2,EXTERNAL)
 else
 $(call gb_ExternalProject_get_state_target,lcms2,build):
+	$(call gb_Trace_StartRange,lcms2,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure --without-jpeg --without-tiff --with-pic \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
@@ -41,5 +44,6 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
 		&& cd src \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,lcms2,EXTERNAL)
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk
index 4f71a5739a3b..50e66fdb76ca 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libabw,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libabw,build) :
+	$(call gb_Trace_StartRange,libabw,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
@@ -40,5 +41,6 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libabw,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk
index 83d79a520988..565d38ff9a1c 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -23,6 +23,7 @@ ifeq ($(COM),MSC)
 gb_ExternalProject_libassuan_host := $(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32)
 gb_ExternalProject_libassuan_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
 $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executable_get_target,cpp)
+	$(call gb_Trace_StartRange,libassuan,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 	  autoreconf \
 	  && ./configure \
@@ -38,8 +39,10 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl
 		MAKE=$(MAKE) \
 	  && $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libassuan,EXTERNAL)
 else
 $(call gb_ExternalProject_get_state_target,libassuan,build):
+	$(call gb_Trace_StartRange,libassuan,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		autoreconf \
 		&& ./configure \
@@ -58,6 +61,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
 			  $(EXTERNAL_WORKDIR)/src/.libs/libassuan.0.dylib \
 		) \
 	)
+	$(call gb_Trace_EndRange,libassuan,EXTERNAL)
 
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/external/libatomic_ops/ExternalProject_libatomic_ops.mk b/external/libatomic_ops/ExternalProject_libatomic_ops.mk
index 2bb31a4003d3..20cefa39b4fe 100644
--- a/external/libatomic_ops/ExternalProject_libatomic_ops.mk
+++ b/external/libatomic_ops/ExternalProject_libatomic_ops.mk
@@ -16,11 +16,13 @@ $(eval $(call gb_ExternalProject_register_targets,libatomic_ops,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libatomic_ops,build) :
+	$(call gb_Trace_StartRange,libatomic_ops,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))") \
 		./configure \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libatomic_ops,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk
index 503307cf3488..b3e78f469cbf 100644
--- a/external/libcdr/ExternalProject_libcdr.mk
+++ b/external/libcdr/ExternalProject_libcdr.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libcdr,build) :
+	$(call gb_Trace_StartRange,libcdr,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
@@ -42,5 +43,6 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libcdr,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk
index bac09b699b12..8ee2c7293e11 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_ExternalProject_use_externals,libebook,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libebook,build) :
+	$(call gb_Trace_StartRange,libebook,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
@@ -47,5 +48,6 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libebook,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libeot/ExternalProject_libeot.mk b/external/libeot/ExternalProject_libeot.mk
index e40186e9e849..75e8054a0a4c 100644
--- a/external/libeot/ExternalProject_libeot.mk
+++ b/external/libeot/ExternalProject_libeot.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,libeot,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libeot,build) :
+	$(call gb_Trace_StartRange,libeot,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		touch Makefile.in \
 		&& export PKG_CONFIG="" \
@@ -25,5 +26,6 @@ $(call gb_ExternalProject_get_state_target,libeot,build) :
 			CFLAGS='$(filter-out -std=gnu89,$(CFLAGS))' \
 		&& $(MAKE) $(if $(verbose),V=1) \
 	)
+	$(call gb_Trace_EndRange,libeot,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libepubgen/ExternalProject_libepubgen.mk b/external/libepubgen/ExternalProject_libepubgen.mk
index 772a41daa2e4..54a9a3d68bdc 100644
--- a/external/libepubgen/ExternalProject_libepubgen.mk
+++ b/external/libepubgen/ExternalProject_libepubgen.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,libepubgen,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libepubgen,build) :
+	$(call gb_Trace_StartRange,libepubgen,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
@@ -36,5 +37,6 @@ $(call gb_ExternalProject_get_state_target,libepubgen,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libepubgen,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index 4eaa90bd99c3..0eabfe5f4ffb 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_ExternalProject_use_externals,libetonyek,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libetonyek,build) :
+	$(call gb_Trace_StartRange,libetonyek,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
@@ -61,5 +62,6 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
 				$(EXTERNAL_WORKDIR)/src/lib/.libs/libetonyek-0.1.1.dylib \
 		) \
 	)
+	$(call gb_Trace_EndRange,libetonyek,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libexttextcat/ExternalProject_libexttextcat.mk b/external/libexttextcat/ExternalProject_libexttextcat.mk
index 842b369f2fee..1d729a103b33 100644
--- a/external/libexttextcat/ExternalProject_libexttextcat.mk
+++ b/external/libexttextcat/ExternalProject_libexttextcat.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,libexttextcat,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libexttextcat,build):
+	$(call gb_Trace_StartRange,libexttextcat,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure --disable-shared --with-pic \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
@@ -24,5 +25,6 @@ $(call gb_ExternalProject_get_state_target,libexttextcat,build):
 			$(if $(filter AIX,$(OS)),-D_LINUX_SOURCE_COMPAT)" \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libexttextcat,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libffi/ExternalProject_libffi.mk b/external/libffi/ExternalProject_libffi.mk
index bdf8fe61eb76..13a4b18db13d 100644
--- a/external/libffi/ExternalProject_libffi.mk
+++ b/external/libffi/ExternalProject_libffi.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libffi,\
 # set prefix so that it ends up in libffi.pc so that pkg-config in python3 works
 
 $(call gb_ExternalProject_get_state_target,libffi,build):
+	$(call gb_Trace_StartRange,libffi,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure \
 			--enable-option-checking=fatal \
@@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,libffi,build):
 			--disable-docs \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libffi,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk
index 095ba47d6719..be3a478485aa 100644
--- a/external/libfreehand/ExternalProject_libfreehand.mk
+++ b/external/libfreehand/ExternalProject_libfreehand.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_ExternalProject_use_externals,libfreehand,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libfreehand,build) :
+	$(call gb_Trace_StartRange,libfreehand,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
@@ -42,5 +43,6 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libfreehand,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk
index 1fcd63180e20..cf0b594dca24 100644
--- a/external/libgpg-error/ExternalProject_libgpg-error.mk
+++ b/external/libgpg-error/ExternalProject_libgpg-error.mk
@@ -19,6 +19,7 @@ ifeq ($(COM),MSC)
 gb_ExternalProject_libgpg-error_host := $(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32)
 gb_ExternalProject_libgpg-error_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
 $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Executable_get_target,cpp)
+	$(call gb_Trace_StartRange,libgpg-error,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		MAKE=$(MAKE) ./configure \
 			--enable-static \
@@ -31,8 +32,10 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut
 			RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
 	    && $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libgpg-error,EXTERNAL)
 else
 $(call gb_ExternalProject_get_state_target,libgpg-error,build):
+	$(call gb_Trace_StartRange,libgpg-error,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		MAKE=$(MAKE) ./configure \
 			--disable-rpath \
@@ -45,6 +48,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build):
 	                $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
 	  && $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libgpg-error,EXTERNAL)
 
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
index 829d3dc0f53b..a6c8f0d77a2f 100644
--- a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
+++ b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
@@ -18,11 +18,14 @@ $(eval $(call gb_ExternalProject_register_targets,libjpeg-turbo,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libjpeg-turbo,build) : $(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure)
+	$(call gb_Trace_StartRange,libjpeg-turbo,EXTERNAL)
 	+$(call gb_ExternalProject_run,build,\
 		$(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libjpeg-turbo,EXTERNAL)
 
 $(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure) :
+	$(call gb_Trace_StartRange,libjpeg-turbo,EXTERNAL)
 	$(call gb_ExternalProject_run,configure,\
 		MAKE=$(MAKE) ./configure \
 			--build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \
@@ -35,5 +38,6 @@ $(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure) :
 			$(if $(NASM),,--without-simd) \
 			CFLAGS='$(if $(debug),$(gb_DEBUGINFO_FLAGS)) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(CFLAGS) $(gb_VISIBILITY_FLAGS)' \
 	)
+	$(call gb_Trace_EndRange,libjpeg-turbo,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liblangtag/ExternalProject_liblangtag.mk b/external/liblangtag/ExternalProject_liblangtag.mk
index 3fb5618f7fc1..060c6f3601a8 100644
--- a/external/liblangtag/ExternalProject_liblangtag.mk
+++ b/external/liblangtag/ExternalProject_liblangtag.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,liblangtag,\
 # liblangtag uses (-DBUILDDIR="\"$(abs_top_builddir)\"" and similar).
 # Results in "cl : Command line error D8003 : missing source filename"
 $(call gb_ExternalProject_get_state_target,liblangtag,build):
+	$(call gb_Trace_StartRange,liblangtrag,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		MAKE=$(MAKE) ./configure --disable-modules --disable-test --disable-introspection --with-pic \
 		$(if $(or $(DISABLE_DYNLOADING),$(filter MSC,$(COM))), \
@@ -49,4 +50,6 @@ $(call gb_ExternalProject_get_state_target,liblangtag,build):
 				$(EXTERNAL_WORKDIR)/liblangtag/.libs/liblangtag.1.dylib \
 		) \
 	)
+	$(call gb_Trace_EndRange,liblangtrag,EXTERNAL)
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk
index 271aaf78e4d3..21121f091279 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libmspub,build) :
+	$(call gb_Trace_StartRange,libmspub,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
@@ -40,5 +41,6 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libmspub,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk
index a30af23e9bed..067de69002bd 100644
--- a/external/libmwaw/ExternalProject_libmwaw.mk
+++ b/external/libmwaw/ExternalProject_libmwaw.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,libmwaw,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libmwaw,build) :
+	$(call gb_Trace_StartRange,libmwaw,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& ./configure \
@@ -48,5 +49,6 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
 				$(EXTERNAL_WORKDIR)/src/lib/.libs/libmwaw-0.3.3.dylib \
 		) \
 	)
+	$(call gb_Trace_EndRange,libmwaw,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk b/external/libnumbertext/ExternalProject_libnumbertext.mk
index c2bdaeebfba9..f4dbe5f655c3 100644
--- a/external/libnumbertext/ExternalProject_libnumbertext.mk
+++ b/external/libnumbertext/ExternalProject_libnumbertext.mk
@@ -25,6 +25,7 @@ endif
 endif
 
 $(call gb_ExternalProject_get_state_target,libnumbertext,build):
+	$(call gb_Trace_StartRange,libnumbertext,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		LIBS="$(gb_STDLIBS) $(LIBS)" \
 		$(SHELL) ./configure --disable-shared --with-pic \
@@ -36,5 +37,6 @@ $(call gb_ExternalProject_get_state_target,libnumbertext,build):
 			CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \
 		&& cd src && $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libnumbertext,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk
index c02b4f532d65..679598542b30 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,libodfgen,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libodfgen,build) :
+	$(call gb_Trace_StartRange,libodfgen,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& ./configure \
@@ -48,5 +49,6 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
 				$(EXTERNAL_WORKDIR)/src/.libs/libodfgen-0.1.1.dylib \
 		) \
 	)
+	$(call gb_Trace_EndRange,libodfgen,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index 0bd36c379d9b..38658cc81908 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -91,6 +91,7 @@ endif
 endif
 
 $(call gb_ExternalProject_get_state_target,liborcus,build) :
+	$(call gb_Trace_StartRange,liborcus,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(if $(liborcus_LIBS),LIBS='$(liborcus_LIBS)') \
 		$(if $(liborcus_CXXFLAGS),CXXFLAGS='$(liborcus_CXXFLAGS)') \
@@ -126,5 +127,6 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
 				$(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.15.0.dylib \
 		) \
 	)
+	$(call gb_Trace_EndRange,liborcus,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libpagemaker/ExternalProject_libpagemaker.mk b/external/libpagemaker/ExternalProject_libpagemaker.mk
index 91e494402cc1..34254b872713 100644
--- a/external/libpagemaker/ExternalProject_libpagemaker.mk
+++ b/external/libpagemaker/ExternalProject_libpagemaker.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,libpagemaker,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libpagemaker,build) :
+	$(call gb_Trace_StartRange,libpagemaker,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
@@ -38,5 +39,6 @@ $(call gb_ExternalProject_get_state_target,libpagemaker,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libpagemaker,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libqxp/ExternalProject_libqxp.mk b/external/libqxp/ExternalProject_libqxp.mk
index 04a34b57e4be..f1b63f6bfa38 100644
--- a/external/libqxp/ExternalProject_libqxp.mk
+++ b/external/libqxp/ExternalProject_libqxp.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_ExternalProject_use_externals,libqxp,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libqxp,build) :
+	$(call gb_Trace_StartRange,libqxp,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
@@ -41,5 +42,6 @@ $(call gb_ExternalProject_get_state_target,libqxp,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libqxp,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/librevenge/ExternalProject_librevenge.mk b/external/librevenge/ExternalProject_librevenge.mk
index 9575f50e3b27..7c3e36761e22 100644
--- a/external/librevenge/ExternalProject_librevenge.mk
+++ b/external/librevenge/ExternalProject_librevenge.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,librevenge,\
 ))
 
 $(call gb_ExternalProject_get_state_target,librevenge,build) :
+	$(call gb_Trace_StartRange,librevenge,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& ./configure \
@@ -44,5 +45,6 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) :
 				$(EXTERNAL_WORKDIR)/src/lib/.libs/librevenge-0.0.0.dylib \
 		) \
 	)
+	$(call gb_Trace_EndRange,librevenge,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libstaroffice/ExternalProject_libstaroffice.mk b/external/libstaroffice/ExternalProject_libstaroffice.mk
index 3f6c19e2879f..8aad471e5d24 100644
--- a/external/libstaroffice/ExternalProject_libstaroffice.mk
+++ b/external/libstaroffice/ExternalProject_libstaroffice.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,libstaroffice,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libstaroffice,build) :
+	$(call gb_Trace_StartRange,libstaroffice,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& ./configure \
@@ -48,5 +49,6 @@ $(call gb_ExternalProject_get_state_target,libstaroffice,build) :
 				$(EXTERNAL_WORKDIR)/src/lib/.libs/libstaroffice-0.0.0.dylib \
 		) \
 	)
+	$(call gb_Trace_EndRange,libstaroffice,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libtommath/ExternalProject_libtommath.mk b/external/libtommath/ExternalProject_libtommath.mk
index f534e62a126d..ba2089eb82a5 100644
--- a/external/libtommath/ExternalProject_libtommath.mk
+++ b/external/libtommath/ExternalProject_libtommath.mk
@@ -17,11 +17,14 @@ $(eval $(call gb_ExternalProject_use_nmake,libtommath,build))
 
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,libtommath,build):
+	$(call gb_Trace_StartRange,libtommath,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		nmake -nologo -f makefile.msvc \
 	)
+	$(call gb_Trace_EndRange,libtommath,EXTERNAL)
 else
 $(call gb_ExternalProject_get_state_target,libtommath,build) :
+	$(call gb_Trace_StartRange,libtommath,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		unset MAKEFLAGS \
 		&& export CFLAGS=" \
@@ -29,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,libtommath,build) :
 		" \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libtommath,EXTERNAL)
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index 8f34290a8e6e..0911fcd87c7c 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libvisio,build) :
+	$(call gb_Trace_StartRange,libvisio,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
@@ -41,5 +42,6 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libvisio,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk
index ddb8c2cd0147..c3b810c6acd7 100644
--- a/external/libwpd/ExternalProject_libwpd.mk
+++ b/external/libwpd/ExternalProject_libwpd.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,libwpd,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libwpd,build) :
+	$(call gb_Trace_StartRange,libwpd,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
@@ -47,5 +48,6 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) :
 				$(EXTERNAL_WORKDIR)/src/lib/.libs/libwpd-0.10.10.dylib \
 		) \
 	)
+	$(call gb_Trace_EndRange,libwpd,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk
index 2d2bc08aa126..01f31c55d771 100644
--- a/external/libwpg/ExternalProject_libwpg.mk
+++ b/external/libwpg/ExternalProject_libwpg.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,libwpg,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libwpg,build) :
+	$(call gb_Trace_StartRange,libwpg,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
@@ -45,5 +46,6 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) :
 				$(EXTERNAL_WORKDIR)/src/lib/.libs/libwpg-0.3.3.dylib \
 		) \
 	)
+	$(call gb_Trace_EndRange,libwpg,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk
index bb8a5d977b6e..a7c37aeddf7e 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -43,6 +43,7 @@ endif
 endif
 
 $(call gb_ExternalProject_get_state_target,libwps,build) :
+	$(call gb_Trace_StartRange,libwps,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& ./configure \
@@ -69,5 +70,6 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
 				$(EXTERNAL_WORKDIR)/src/lib/.libs/libwps-0.4.4.dylib \
 		) \
 	)
+	$(call gb_Trace_EndRange,libwps,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/ExternalProject_libxml2.mk b/external/libxml2/ExternalProject_libxml2.mk
index 0d8559dfb04f..778befade47f 100644
--- a/external/libxml2/ExternalProject_libxml2.mk
+++ b/external/libxml2/ExternalProject_libxml2.mk
@@ -19,14 +19,17 @@ $(call gb_ExternalProject_use_external_project,libxml2,icu)
 $(eval $(call gb_ExternalProject_use_nmake,libxml2,build))
 
 $(call gb_ExternalProject_get_state_target,libxml2,build):
+	$(call gb_Trace_StartRange,libxml2,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		cscript /e:javascript configure.js \
 			iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \
 			$(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
 		&& nmake \
 	,win32)
+	$(call gb_Trace_EndRange,libxml2,EXTERNAL)
 else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,libxml2,build):
+	$(call gb_Trace_StartRange,libxml2,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure --disable-ipv6 --without-python --without-zlib --with-sax1 \
 			--without-lzma \
@@ -38,6 +41,7 @@ $(call gb_ExternalProject_get_state_target,libxml2,build):
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libxml2,EXTERNAL)
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/ExternalProject_libxslt.mk b/external/libxslt/ExternalProject_libxslt.mk
index 16cc2a8b0d65..0602c320ea7d 100644
--- a/external/libxslt/ExternalProject_libxslt.mk
+++ b/external/libxslt/ExternalProject_libxslt.mk
@@ -18,6 +18,7 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_ExternalProject_use_nmake,libxslt,build))
 
 $(call gb_ExternalProject_get_state_target,libxslt,build):
+	$(call gb_Trace_StartRange,libxslt,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		cscript /e:javascript configure.js \
 			$(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
@@ -26,8 +27,10 @@ $(call gb_ExternalProject_get_state_target,libxslt,build):
 			lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
 		&& nmake \
 	,win32)
+	$(call gb_Trace_EndRange,libxslt,EXTERNAL)
 else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,libxslt,build):
+	$(call gb_Trace_StartRange,libxslt,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure --without-crypto --without-python \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
@@ -46,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,libxslt,build):
 				$(EXTERNAL_WORKDIR)/libxslt/.libs/libxslt.1.dylib \
 		) \
 	)
+	$(call gb_Trace_EndRange,libxslt,EXTERNAL)
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libzmf/ExternalProject_libzmf.mk b/external/libzmf/ExternalProject_libzmf.mk
index bb7d151c091c..c6593899f2c0 100644
--- a/external/libzmf/ExternalProject_libzmf.mk
+++ b/external/libzmf/ExternalProject_libzmf.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_ExternalProject_use_externals,libzmf,\
 ))
 
 $(call gb_ExternalProject_get_state_target,libzmf,build) :
+	$(call gb_Trace_StartRange,libzmf,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
@@ -42,5 +43,6 @@ $(call gb_ExternalProject_get_state_target,libzmf,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,libzmf,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/lpsolve/ExternalProject_lpsolve.mk b/external/lpsolve/ExternalProject_lpsolve.mk
index 37a5b7ac4a6e..b23dddf47a29 100644
--- a/external/lpsolve/ExternalProject_lpsolve.mk
+++ b/external/lpsolve/ExternalProject_lpsolve.mk
@@ -15,12 +15,15 @@ $(eval $(call gb_ExternalProject_register_targets,lpsolve,\
 
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,lpsolve,build):
+	$(call gb_Trace_StartRange,lpsolve,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		LIB="$(ILIB)" RUNTIME_FLAG="$(if $(MSVC_USE_DEBUG_RUNTIME),/MDd,/MD)" \
 		cmd /c cvc6.bat \
 	,lpsolve55)
+	$(call gb_Trace_EndRange,lpsolve,EXTERNAL)
 else # $(OS)!=WNT
 $(call gb_ExternalProject_get_state_target,lpsolve,build):
+	$(call gb_Trace_StartRange,lpsolve,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		CC="$(CC) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS))" \
 		$(if $(filter MACOSX,$(OS)),EXTRA_LINKFLAGS='-install_name @__________________________________________________OOO/liblpsolve55.dylib') \
@@ -29,5 +32,6 @@ $(call gb_ExternalProject_get_state_target,lpsolve,build):
 		$(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc, \
 		ccc))) \
 	,lpsolve55)
+	$(call gb_Trace_EndRange,lpsolve,EXTERNAL)
 endif # $(OS)
 # vim: set noet sw=4 ts=4:
diff --git a/external/lxml/ExternalProject_lxml.mk b/external/lxml/ExternalProject_lxml.mk
index aaadbd0a6974..371db12e1c8d 100644
--- a/external/lxml/ExternalProject_lxml.mk
+++ b/external/lxml/ExternalProject_lxml.mk
@@ -21,7 +21,8 @@ $(eval $(call gb_ExternalProject_register_targets,lxml,\
 lxml_PYTHON := $(call gb_ExternalExecutable_get_command,python)
 
 $(call gb_ExternalProject_get_state_target,lxml,build): \
-	$(call gb_ExternalExecutable_get_dependencies,python)
+    $(call gb_ExternalExecutable_get_dependencies,python)
+	$(call gb_Trace_StartRange,lxml,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		PYPATH=$${PYPATH:+$$PYPATH:}$(call gb_UnpackedTarball_get_dir,lxml)/install && \
 		$(if $(PYTHON_FOR_BUILD), \
@@ -39,5 +40,6 @@ $(call gb_ExternalProject_get_state_target,lxml,build): \
 		$(lxml_PYTHON) setup.py install \
 			--install-lib install \
 	)
+	$(call gb_Trace_EndRange,lxml,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/mythes/ExternalProject_mythes.mk b/external/mythes/ExternalProject_mythes.mk
index 13ebb0aacc40..b352e9b594d3 100644
--- a/external/mythes/ExternalProject_mythes.mk
+++ b/external/mythes/ExternalProject_mythes.mk
@@ -16,10 +16,12 @@ $(eval $(call gb_ExternalProject_register_targets,mythes,\
 ))
 
 $(call gb_ExternalProject_get_state_target,mythes,build):
+	$(call gb_Trace_StartRange,mythes,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		LIBS="$(gb_STDLIBS) $(LIBS)" ./configure --disable-shared --with-pic \
 		$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,mythes,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index 57b0c961c611..acf418805772 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\
 
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python)
+	$(call gb_Trace_StartRange,nss,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
 		$(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED), \
@@ -31,11 +32,13 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta
 			NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
 			NSS_DISABLE_GTESTS=1 \
 	,nss)
+	$(call gb_Trace_EndRange,nss,EXTERNAL)
 
 else # OS!=WNT
 # make sure to specify NSPR_CONFIGURE_OPTS as env (before make command), so nss can append it's own defaults
 # OTOH specify e.g. CC and NSINSTALL as arguments (after make command), so they will overrule nss makefile values
 $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python)
+	$(call gb_Trace_StartRange,nss,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \
 		$(if $(filter ANDROID,$(OS)),$(if $(filter AARCH64,$(CPUNAME)),USE_64=1)) \
@@ -76,6 +79,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta
 				$(EXTERNAL_WORKDIR)/dist/out/lib/libsoftokn3.dylib \
 				$(EXTERNAL_WORKDIR)/dist/out/lib/libssl3.dylib) \
 	,nss)
+	$(call gb_Trace_EndRange,nss,EXTERNAL)
 
 endif
 
diff --git a/external/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk
index 0c7aaa6ae17d..46e9168f5a91 100644
--- a/external/openldap/ExternalProject_openldap.mk
+++ b/external/openldap/ExternalProject_openldap.mk
@@ -27,6 +27,7 @@ openldap_LDFLAGS += -pthread
 endif
 
 $(call gb_ExternalProject_get_state_target,openldap,build) :
+	$(call gb_Trace_StartRange,openldap,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure \
 			--disable-slapd \
@@ -49,6 +50,7 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
 			$(if $(openldap_LDFLAGS),LDFLAGS="$(LDFLAGS) $(openldap_LDFLAGS)") \
 		&& MAKEFLAGS= && $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,openldap,EXTERNAL)
 
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk
index 5f5fb42c5eef..c35b1b24bd0f 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -58,6 +58,7 @@ ifeq ($(COM),MSC)
 $(eval $(call gb_ExternalProject_use_nmake,openssl,build))
 
 $(call gb_ExternalProject_get_state_target,openssl,build):
+	$(call gb_Trace_StartRange,openssl,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		export PERL="$(shell cygpath -w $(PERL))" \
 		&& $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \
@@ -65,9 +66,11 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
 		&& nmake -f "ms\ntdll.mak" \
 		&& mv inc32/* include/ \
 	)
+	$(call gb_Trace_EndRange,openssl,EXTERNAL)
 
 else
 $(call gb_ExternalProject_get_state_target,openssl,build):
+	$(call gb_Trace_StartRange,openssl,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		unset MAKEFLAGS && \
 		$(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS iOS,$(OS)), \
@@ -86,6 +89,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
 				$(if $(filter-out WNT MACOSX,$(OS)),-fvisibility=hidden)" \
 		&& ln -s . lib \
 	)
+	$(call gb_Trace_EndRange,openssl,EXTERNAL)
 # symlink lib dir for python3
 endif
 
diff --git a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk
index a9d7591c1190..149becee9209 100644
--- a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk
+++ b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk
@@ -14,8 +14,10 @@ $(eval $(call gb_ExternalProject_register_targets,owncloud_android_lib,\
 ))
 
 $(call gb_ExternalProject_get_state_target,owncloud_android_lib,build) :
+	$(call gb_Trace_StartRange,owncloud_android_lib,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 	ANDROID_HOME=$(ANDROID_SDK_HOME) $(SRCDIR)/android/source/gradlew assemble \
 	)
+	$(call gb_Trace_EndRange,owncloud_android_lib,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk
index ba462a34a1a1..c437bb29a0a0 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -24,9 +24,11 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
 
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
+	$(call gb_Trace_StartRange,postgresql,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		nmake -f win32.mak USE_SSL=1 USE_LDAP=1 \
 	,src)
+	$(call gb_Trace_EndRange,postgresql,EXTERNAL)
 
 else
 
@@ -57,6 +59,7 @@ endif
 
 
 $(call gb_ExternalProject_get_state_target,postgresql,build) :
+	$(call gb_Trace_StartRange,postgresql,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		./configure \
 			--without-readline --disable-shared --with-ldap \
@@ -70,6 +73,7 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) :
 			$(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \
 		&& cd src/interfaces/libpq \
 		&& MAKEFLAGS= && $(MAKE) all-static-lib)
+	$(call gb_Trace_EndRange,postgresql,EXTERNAL)
 
 endif
 
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
index 6c958431cd97..65023da61756 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -33,6 +33,7 @@ ifeq ($(OS),WNT)
 # at least for MSVC 2008 it is necessary to clear MAKEFLAGS because
 # nmake is invoked
 $(call gb_ExternalProject_get_state_target,python3,build) :
+	$(call gb_Trace_StartRange,python3,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build \
 			/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
@@ -45,6 +46,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 			$(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
 			$(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
 	,PCBuild)
+	$(call gb_Trace_EndRange,python3,EXTERNAL)
 
 else
 
@@ -69,6 +71,7 @@ ifneq (,$(ENABLE_VALGRIND))
 endif
 
 $(call gb_ExternalProject_get_state_target,python3,build) :
+	$(call gb_Trace_StartRange,python3,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(if $(filter MACOSX,$(OS)), \
 			$(if $(filter 10.8 10.9 10.10 10.11,$(MACOSX_DEPLOYMENT_TARGET)), \
@@ -117,6 +120,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 			$(if $(SYSTEM_ZLIB),,ZLIB_INCDIR=$(WORKDIR)/UnpackedTarball/zlib) \
 		&& ln -s build/lib.* LO_lib \
 	)
+	$(call gb_Trace_EndRange,python3,EXTERNAL)
 
 endif
 
diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk
index 4309df17b246..4bc91c375b85 100644
--- a/external/redland/ExternalProject_raptor.mk
+++ b/external/redland/ExternalProject_raptor.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,raptor,\
 ))
 
 $(call gb_ExternalProject_get_state_target,raptor,build):
+	$(call gb_Trace_StartRange,raptor,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(if $(filter iOS,$(OS)),LIBS="-liconv") \
 		CFLAGS="$(CFLAGS) $(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \
@@ -39,5 +40,6 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
 			$(if $(SYSTEM_LIBXML),$(if $(filter-out MACOSX,$(OS)),--without-xml2-config),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,raptor,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk
index 92e7adce08ff..0e765e098eb9 100644
--- a/external/redland/ExternalProject_rasqal.mk
+++ b/external/redland/ExternalProject_rasqal.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_register_targets,rasqal,\
 # note: this can intentionally only build against internal raptor (not system)
 
 $(call gb_ExternalProject_get_state_target,rasqal,build):
+	$(call gb_Trace_StartRange,rasqal,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
 		LDFLAGS=" \
@@ -48,5 +49,6 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 			$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
 			$(EXTERNAL_WORKDIR)/src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib) \
 	)
+	$(call gb_Trace_EndRange,rasqal,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk
index 166b31cfe08a..f6101f0d288e 100644
--- a/external/redland/ExternalProject_redland.mk
+++ b/external/redland/ExternalProject_redland.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,redland,\
 # note: this can intentionally only build against internal raptor/rasqal
 
 $(call gb_ExternalProject_get_state_target,redland,build):
+	$(call gb_Trace_StartRange,redland,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
 		LDFLAGS=" \
@@ -51,5 +52,6 @@ $(call gb_ExternalProject_get_state_target,redland,build):
 			$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
 			$(EXTERNAL_WORKDIR)/src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib) \
 	)
+	$(call gb_Trace_EndRange,redland,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/rhino/ExternalProject_rhino.mk b/external/rhino/ExternalProject_rhino.mk
index 133b04f89e22..4d1b3e54409c 100644
--- a/external/rhino/ExternalProject_rhino.mk
+++ b/external/rhino/ExternalProject_rhino.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,rhino,\
 ))
 
 $(call gb_ExternalProject_get_state_target,rhino,build) :
+	$(call gb_Trace_StartRange,rhino,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(ICECREAM_RUN) "$(ANT)" \
 			$(if $(verbose),-v,-q) \
@@ -25,5 +26,6 @@ $(call gb_ExternalProject_get_state_target,rhino,build) :
 			$(if $(debug),-Dbuild.debug="on") \
 			jar \
 	)
+	$(call gb_Trace_EndRange,rhino,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/serf/ExternalProject_serf.mk b/external/serf/ExternalProject_serf.mk
index afa2018a73fa..043045654956 100644
--- a/external/serf/ExternalProject_serf.mk
+++ b/external/serf/ExternalProject_serf.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_nmake,serf,build))
 
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,serf,build):
+	$(call gb_Trace_StartRange,serf,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		APR_SRC="..\apr" \
 		APRUTIL_SRC="..\apr_util" \
@@ -29,10 +30,12 @@ $(call gb_ExternalProject_get_state_target,serf,build):
 		nmake -nologo -f serf.mak \
 			$(if $(MSVC_USE_DEBUG_RUNTIME),DEBUG_BUILD=T Debug,Release)/serf-1.lib \
 	)
+	$(call gb_Trace_EndRange,serf,EXTERNAL)
 
 else
 # serf is using SERF_LIBS variable, so pass it empty
 $(call gb_ExternalProject_get_state_target,serf,build):
+	$(call gb_Trace_StartRange,serf,EXTERNAL)
 	+$(call gb_ExternalProject_run,build,\
 		./configure SERF_LIBS= \
 			--enable-option-checking=fatal \
@@ -42,6 +45,7 @@ $(call gb_ExternalProject_get_state_target,serf,build):
 			$(if $(SYSTEM_OPENSSL),,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl)) \
 		&& $(MAKE) libserf-1.la \
 	)
+	$(call gb_Trace_EndRange,serf,EXTERNAL)
 
 endif
 
diff --git a/external/xmlsec/ExternalProject_xmlsec.mk b/external/xmlsec/ExternalProject_xmlsec.mk
index 9e8cb75f0a68..aca7a2072057 100644
--- a/external/xmlsec/ExternalProject_xmlsec.mk
+++ b/external/xmlsec/ExternalProject_xmlsec.mk
@@ -22,6 +22,7 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_ExternalProject_use_nmake,xmlsec,build))
 
 $(call gb_ExternalProject_get_state_target,xmlsec,build) :
+	$(call gb_Trace_StartRange,xmlsec,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		cscript /e:javascript configure.js crypto=mscng xslt=no iconv=no static=no \
 			lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
@@ -29,10 +30,12 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 			cflags="-arch:SSE $(SOLARINC) -I$(WORKDIR)/UnpackedTarball/libxml2/include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common" \
 		&& nmake \
 	,win32)
+	$(call gb_Trace_EndRange,xmlsec,EXTERNAL)
 
 else
 
 $(call gb_ExternalProject_get_state_target,xmlsec,build) :
+	$(call gb_Trace_StartRange,xmlsec,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
 		$(if $(filter iOS MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \
 		$(if $(filter AIX,$(OS)),ACLOCAL="aclocal -I /opt/freeware/share/aclocal") \
@@ -51,6 +54,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 			LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),",-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN)) \
 		&& $(MAKE) \
 	)
+	$(call gb_Trace_EndRange,xmlsec,EXTERNAL)
 
 endif
 
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index 41868dee54bf..63165f267f52 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -240,20 +240,26 @@ $(call gb_CustomTarget_get_target,extras/source/autocorr) : \
 
 $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%/mimetype : $(SRCDIR)/extras/source/autocorr/lang/%/mimetype
 	$(call gb_Output_announce,autocorr/$*/mimetype,$(true),CPY,1)
+	$(call gb_Trace_StartRange,autocorr/$*/mimetype,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,autocorr/$*/mimetype,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%.xml : $(SRCDIR)/extras/source/autocorr/lang/%.xml \
 		| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
 	$(call gb_Output_announce,autocorr/$*.xml,$(true),XSL,1)
+	$(call gb_Trace_StartRange,autocorr/$*.xml,XSL)
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
+	$(call gb_Trace_EndRange,autocorr/$*.xml,XSL)
 
 $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%.dat :
 	$(call gb_Output_announce,autocorr/$*.dat,$(true),ZIP,2)
+	$(call gb_Trace_StartRange,autocorr/$*.dat,ZIP)
 	$(call gb_Helper_abbreviate_dirs,\
 		cd $(EXTRAS_AUTOCORR_DIR) && \
 		zip -q0X --filesync --must-match $@ $(EXTRAS_AUTOCORR_MIMEFILES_FILTER) && \
 		zip -qrX --must-match $@ $(EXTRAS_AUTOCORR_XMLFILES_FILTER) \
 	)
+	$(call gb_Trace_EndRange,autocorr/$*.dat,ZIP)
 
 define extras_Autocorr_make_file_deps
 $(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/lang/$(2) \
diff --git a/extras/CustomTarget_autotextshare.mk b/extras/CustomTarget_autotextshare.mk
index da2d364b366d..c7509f004b81 100644
--- a/extras/CustomTarget_autotextshare.mk
+++ b/extras/CustomTarget_autotextshare.mk
@@ -4463,32 +4463,44 @@ $(call gb_CustomTarget_get_target,extras/source/autotext) : \
 
 $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%/mimetype : $(SRCDIR)/extras/source/autotext/lang/%/mimetype
 	$(call gb_Output_announce,autotext/$*/mimetype,$(true),CPY,1)
+	$(call gb_Trace_StartRange,autotext/$*/mimetype,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,autotext/$*/mimetype,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.rdf : $(SRCDIR)/extras/source/autotext/lang/%.rdf
 	$(call gb_Output_announce,autotext/$*.rdf,$(true),CPY,1)
+	$(call gb_Trace_StartRange,autotext/$*.rdf,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,autotext/$*.rdf,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.svm : $(SRCDIR)/extras/source/autotext/lang/%.svm
 	$(call gb_Output_announce,autotext/$*.svm,$(true),CPY,1)
+	$(call gb_Trace_StartRange,autotext/$*.svm,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,autotext/$*.svm,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.png : $(SRCDIR)/extras/source/autotext/lang/%.png
 	$(call gb_Output_announce,autotext/$*.png,$(true),CPY,1)
+	$(call gb_Trace_StartRange,autotext/$*.png,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,autotext/$*.png,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.xml : $(SRCDIR)/extras/source/autotext/lang/%.xml \
 		| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
 	$(call gb_Output_announce,autotext/$*.xml,$(true),XSL,1)
+	$(call gb_Trace_StartRange,autotext/$*.xml,XSL)
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
+	$(call gb_Trace_EndRange,autotext/$*.xml,XSL)
 
 $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.bau :
 	$(call gb_Output_announce,autotext/$*.bau,$(true),ZIP,2)
+	$(call gb_Trace_StartRange,autotext/$*.bau,ZIP)
 	$(call gb_Helper_abbreviate_dirs,\
 		cd $(EXTRAS_AUTOTEXTSHARE_DIR) && \
 		zip -q0X --filesync --must-match $@ $(EXTRAS_AUTOTEXTSHARE_MIMEFILES_FILTER) && \
 		zip -qrX --must-match $@ $(EXTRAS_AUTOTEXTSHARE_XMLFILES_FILTER) \
 	)
+	$(call gb_Trace_EndRange,autotext/$*.bau,ZIP)
 
 define extras_Autotextshare_make_file_deps
 $(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/lang/$(2) \
diff --git a/extras/CustomTarget_autotextuser.mk b/extras/CustomTarget_autotextuser.mk
index 95d0bf080340..d4f662db9a12 100644
--- a/extras/CustomTarget_autotextuser.mk
+++ b/extras/CustomTarget_autotextuser.mk
@@ -27,20 +27,26 @@ $(call gb_CustomTarget_get_target,extras/source/autotext/user) : \
 
 $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%/mimetype : $(SRCDIR)/extras/source/autotext/%/mimetype
 	$(call gb_Output_announce,autotext/user/$*/mimetype,$(true),CPY,1)
+	$(call gb_Trace_StartRange,autotext/user/$*/mimetype,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,autotext/user/$*/mimetype,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.xml : $(SRCDIR)/extras/source/autotext/%.xml \
 		| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
 	$(call gb_Output_announce,autotext/user/$*.xml,$(true),XSL,1)
+	$(call gb_Trace_StartRange,autotext/user/$*.xml,XSL)
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
+	$(call gb_Trace_EndRange,autotext/user/$*.xml,XSL)
 
 $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.bau :
 	$(call gb_Output_announce,autotext/user/$*.bau,$(true),ZIP,2)
+	$(call gb_Trace_StartRange,autotext/user/$*.bau,ZIP)
 	$(call gb_Helper_abbreviate_dirs,\
 		cd $(EXTRAS_AUTOTEXTUSER_DIR) && \
 		zip -q0X --filesync --must-match $@ $(EXTRAS_AUTOTEXTUSER_MIMEFILES_FILTER) && \
 		zip -qrX --must-match $@ $(EXTRAS_AUTOTEXTUSER_XMLFILES_FILTER) \
 	)
+	$(call gb_Trace_EndRange,autotext/user/$*.bau,ZIP)
 
 define extras_Autotextuser_make_file_deps
 $(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : $(SRCDIR)/$(1)/$(2) \
diff --git a/extras/CustomTarget_glade.mk b/extras/CustomTarget_glade.mk
index fbd8c1606e2a..b25e095c532b 100644
--- a/extras/CustomTarget_glade.mk
+++ b/extras/CustomTarget_glade.mk
@@ -18,10 +18,12 @@ $(call gb_CustomTarget_get_workdir,extras/source/glade)/libreoffice-catalog.xml
         $(SRCDIR)/extras/source/glade/makewidgetgroup.xslt \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,4)
+	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),XSL)
 	$(call gb_Helper_abbreviate_dirs, \
 	mkdir -p $(dir $@) && \
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
 		-o $@ $(SRCDIR)/extras/source/glade/makewidgetgroup.xslt $< \
 	)
+	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),XSL)
 
 # vim: set noet sw=4 ts=4:
diff --git a/extras/CustomTarget_opensymbol.mk b/extras/CustomTarget_opensymbol.mk
index a27718feb377..c68480931044 100644
--- a/extras/CustomTarget_opensymbol.mk
+++ b/extras/CustomTarget_opensymbol.mk
@@ -15,7 +15,9 @@ ifneq (,$(FONTFORGE))
 $(call gb_CustomTarget_get_workdir,extras/fonts)/opens___.ttf : \
 		$(SRCDIR)/extras/source/truetype/symbol/OpenSymbol.sfd
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),FNT,1)
+	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),FNT)
 	$(FONTFORGE) -lang=ff -c 'Open($$1); Generate($$2)' $< $@
+	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),FNT)
 else
 $(call gb_CustomTarget_get_workdir,extras/fonts)/opens___.ttf : \
 		$(TARFILE_LOCATION)/$(OPENSYMBOL_TTF)
diff --git a/extras/CustomTarget_tpl_styles.mk b/extras/CustomTarget_tpl_styles.mk
index 11a66332e6a4..107cc11d478f 100644
--- a/extras/CustomTarget_tpl_styles.mk
+++ b/extras/CustomTarget_tpl_styles.mk
@@ -33,40 +33,56 @@ $(call gb_CustomTarget_get_target,extras/source/templates/styles) : \
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%/mimetype : $(SRCDIR)/extras/source/templates/styles/%/mimetype
 	$(call gb_Output_announce,templates/styles/$*/mimetype,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/styles/$*/mimetype,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/styles/$*/mimetype,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.jpg : $(SRCDIR)/extras/source/templates/styles/%.jpg
 	$(call gb_Output_announce,templates/styles/$*.jpg,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/styles/$*.jpg,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/styles/$*.jpg,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.png : $(SRCDIR)/extras/source/templates/styles/%.png
 	$(call gb_Output_announce,templates/styles/$*.png,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/styles/$*.png,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/styles/$*.png,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.rdf : $(SRCDIR)/extras/source/templates/styles/%.rdf
 	$(call gb_Output_announce,templates/styles/$*.rdf,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/styles/$*.rdf,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/styles/$*.rdf,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.svg : $(SRCDIR)/extras/source/templates/styles/%.svg
 	$(call gb_Output_announce,templates/styles/$*.svg,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/styles/$*.svg,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/styles/$*.svg,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.svm : $(SRCDIR)/extras/source/templates/styles/%.svm
 	$(call gb_Output_announce,templates/styles/$*.svm,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/styles/$*.svm,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/styles/$*.svm,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.xml : $(SRCDIR)/extras/source/templates/styles/%.xml \
 		| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
 	$(call gb_Output_announce,templates/styles/$*.xml,$(true),XSL,1)
+	$(call gb_Trace_StartRange,templates/styles/$*.xml,XSL)
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
+	$(call gb_Trace_EndRange,templates/styles/$*.xml,XSL)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.ott :
 	$(call gb_Output_announce,templates/styles/$*.ott,$(true),ZIP,2)
+	$(call gb_Trace_StartRange,templates/styles/$*.ott,ZIP)
 	$(call gb_Helper_abbreviate_dirs,\
 		cd $(EXTRAS_STYLES_DIR) && \
 		zip -q0X --filesync --must-match $@ $(EXTRAS_STYLES_MIMEFILES_FILTER) && \
 		zip -qrX --must-match $@ $(EXTRAS_STYLES_XMLFILES_FILTER) \
 	)
+	$(call gb_Trace_EndRange,templates/styles/$*.ott,ZIP)
 
 define extras_Tplstyles_make_file_deps
 $(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/$(2) \
diff --git a/extras/CustomTarget_tplofficorr.mk b/extras/CustomTarget_tplofficorr.mk
index cc43e22c26aa..e6337b7f03b6 100644
--- a/extras/CustomTarget_tplofficorr.mk
+++ b/extras/CustomTarget_tplofficorr.mk
@@ -37,40 +37,56 @@ $(call gb_CustomTarget_get_target,extras/source/templates/officorr) : \
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%/mimetype : $(SRCDIR)/extras/source/templates/officorr/%/mimetype
 	$(call gb_Output_announce,templates/officorr/$*/mimetype,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/officorr/$*/mimetype,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/officorr/$*/mimetype,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.jpg : $(SRCDIR)/extras/source/templates/officorr/%.jpg
 	$(call gb_Output_announce,templates/officorr/$*.jpg,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/officorr/$*.jpg,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/officorr/$*.jpg,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.rdf : $(SRCDIR)/extras/source/templates/officorr/%.rdf
 	$(call gb_Output_announce,templates/officorr/$*.rdf,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/officorr/$*.rdf,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/officorr/$*.rdf,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.png : $(SRCDIR)/extras/source/templates/officorr/%.png
 	$(call gb_Output_announce,templates/officorr/$*.png,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/officorr/$*.png,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/officorr/$*.png,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.svg : $(SRCDIR)/extras/source/templates/officorr/%.svg
 	$(call gb_Output_announce,templates/officorr/$*.svg,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/officorr/$*.svg,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/officorr/$*.svg,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.svm : $(SRCDIR)/extras/source/templates/officorr/%.svm
 	$(call gb_Output_announce,templates/officorr/$*.svm,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/officorr/$*.svm,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/officorr/$*.svm,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.xml : $(SRCDIR)/extras/source/templates/officorr/%.xml \
 		| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
 	$(call gb_Output_announce,templates/officorr/$*.xml,$(true),XSL,1)
+	$(call gb_Trace_StartRange,templates/officorr/$*.xml,XSL)
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
+	$(call gb_Trace_EndRange,templates/officorr/$*.xml,XSL)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.ott :
 	$(call gb_Output_announce,templates/officorr/$*.ott,$(true),ZIP,2)
+	$(call gb_Trace_StartRange,templates/officorr/$*.ott,ZIP)
 	$(call gb_Helper_abbreviate_dirs,\
 		cd $(EXTRAS_OFFICORR_DIR) && \
 		zip -q0X --filesync --must-match $@ $(EXTRAS_OFFICORR_MIMEFILES_FILTER) && \
 		zip -qrX --must-match $@ $(EXTRAS_OFFICORR_XMLFILES_FILTER) \
 	)
+	$(call gb_Trace_EndRange,templates/officorr/$*.ott,ZIP)
 
 define extras_Tplofficorr_make_file_deps
 $(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/$(2) \
diff --git a/extras/CustomTarget_tploffimisc.mk b/extras/CustomTarget_tploffimisc.mk
index 4a1fc666e31f..a4582eb2686b 100644
--- a/extras/CustomTarget_tploffimisc.mk
+++ b/extras/CustomTarget_tploffimisc.mk
@@ -32,40 +32,56 @@ $(call gb_CustomTarget_get_target,extras/source/templates/offimisc) : \
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%/mimetype : $(SRCDIR)/extras/source/templates/offimisc/%/mimetype
 	$(call gb_Output_announce,templates/offimisc/$*/mimetype,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/offimisc/$*/mimetype,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/offimisc/$*/mimetype,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.jpg : $(SRCDIR)/extras/source/templates/offimisc/%.jpg
 	$(call gb_Output_announce,templates/offimisc/$*.jpg,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/offimisc/$*.jpg,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/offimisc/$*.jpg,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.png : $(SRCDIR)/extras/source/templates/offimisc/%.png
 	$(call gb_Output_announce,templates/offimisc/$*.png,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/offimisc/$*.png,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/offimisc/$*.png,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.rdf : $(SRCDIR)/extras/source/templates/offimisc/%.rdf
 	$(call gb_Output_announce,templates/offimisc/$*.rdf,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/offimisc/$*.rdf,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/offimisc/$*.rdf,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.svg : $(SRCDIR)/extras/source/templates/offimisc/%.svg
 	$(call gb_Output_announce,templates/offimisc/$*.svg,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/offimisc/$*.svg,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/offimisc/$*.svg,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.svm : $(SRCDIR)/extras/source/templates/offimisc/%.svm
 	$(call gb_Output_announce,templates/offimisc/$*.svm,$(true),CPY,1)
+	$(call gb_Trace_StartRange,templates/offimisc/$*.svm,CPY)
 	cp $< $@
+	$(call gb_Trace_EndRange,templates/offimisc/$*.svm,CPY)
 
 $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.xml : $(SRCDIR)/extras/source/templates/offimisc/%.xml \
 		| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
 	$(call gb_Output_announce,templates/offimisc/$*.xml,$(true),XSL,1)
+	$(call gb_Trace_StartRange,templates/offimisc/$*.xml,XSL)
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
+	$(call gb_Trace_EndRange,templates/offimisc/$*.xml,XSL)
 

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list