makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)HEADmaster

helpcontent2 portion

Change-Id: I2e10bf8bf4cb39fa3a8f9a2c3eb8f22d8636560c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/167007
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

6 files changed, 43 insertions, 43 deletions

diff --git a/AllLangPackage_html_lang.mk b/AllLangPackage_html_lang.mk
index 63fe21ba65..a0ae5f5a7b 100644
--- a/AllLangPackage_html_lang.mk
+++ b/AllLangPackage_html_lang.mk
@@ -7,7 +7,7 @@
 # # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 # #
 #
-$(eval $(call gb_AllLangPackage_AllLangPackage,helpcontent2_html_lang,$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)))
+$(eval $(call gb_AllLangPackage_AllLangPackage,helpcontent2_html_lang,$(gb_CustomTarget_workdir)/helpcontent2/help3xsl))
 
 $(eval $(call gb_AllLangPackage_use_customtarget,helpcontent2_html_lang,helpcontent2/help3xsl))
 
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index a3a9cec55f..9b583f68c7 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_CustomTarget_register_targets,helpcontent2/help3xsl,\
 
 # trailing space for Windows so that xargs doesn't interpret the final CR (that
 # win-make adds as the newline character) as part of the last filename
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/hid2file.js : \
         $(SRCDIR)/helpcontent2/help3xsl/generate_hid2file.xsl \
         $(foreach module,$(html_TEXT_MODULES),$(call gb_AllLangHelp_get_helpfiles_target,$(module))) \
         $(SRCDIR)/helpcontent2/CustomTarget_html.mk \
@@ -64,14 +64,14 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
 ifeq ($(HELP_OMINDEX_PAGE),TRUE)
 
 define html_gen_xaptpl_dep
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/xap_tpl : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/xap_tpl : \
 	$(if $(filter en-US,$(1)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp
 
 endef
 	
 $(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_xaptpl_dep,$(lang))))
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/xap_tpl : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/xap_tpl : \
         $(SRCDIR)/helpcontent2/help3xsl/xap_templ_query.xsl \
         $(SRCDIR)/helpcontent2/CustomTarget_html.mk \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
@@ -93,14 +93,14 @@ endif
 # Create noscript.html, when browser has no javascript enabled
 
 define html_gen_noscript_dep
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/noscript.html : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/noscript.html : \
 	$(if $(filter en-US,$(1)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp
 
 endef
 
 $(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_noscript_dep,$(lang))))
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/noscript.html : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/noscript.html : \
         $(SRCDIR)/helpcontent2/help3xsl/noscript.xsl \
         $(SRCDIR)/helpcontent2/help3xsl/brand.xsl \
         $(SRCDIR)/helpcontent2/CustomTarget_html.mk \
@@ -120,12 +120,12 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/noscript.html : \
 
 
 # set of installed languages - has to be language independent
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/languages.js : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/languages.js : \
         $(SRCDIR)/helpcontent2/CustomTarget_html.mk
 	printf 'var languagesSet = new Set([%s]);\n' "$(subst $(WHITESPACE),$(COMMA) ,$(patsubst %,'%',$(gb_HELP_LANGS)))" > $@
 
 define html_gen_langnames_js_dep
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/langnames.js : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/langnames.js : \
 	$(if $(filter en-US,$(1)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp
 
 endef
@@ -133,7 +133,7 @@ endef
 $(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_langnames_js_dep,$(lang))))
 
 # names of the languages - has to be translated, ie. per language
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/langnames.js : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/langnames.js : \
         $(SRCDIR)/helpcontent2/CustomTarget_html.mk
 	( \
 		echo 'var languageNames = {' ; \
@@ -142,24 +142,24 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/langnames.js : \
 	) > $@
 
 define html_gen_contents_html_dep
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : $(call gb_HelpTarget__get_treefile,$(1),$(3))
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : TREE_FILE := $(call gb_HelpTarget__get_treefile,$(1),$(3))
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : LANGUAGE := $(2)
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part : MODULE := $(lastword $(subst :, ,$(filter $(module):%, $(html_BMARK_MODULES))))
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/contents.part : $(call gb_HelpTarget__get_treefile,$(1),$(3))
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/contents.part : TREE_FILE := $(call gb_HelpTarget__get_treefile,$(1),$(3))
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/contents.part : LANGUAGE := $(2)
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/contents.part : MODULE := $(lastword $(subst :, ,$(filter $(module):%, $(html_BMARK_MODULES))))
 
 endef
 
 define html_gen_contents_dep
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.js : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/contents.js : \
 	$(foreach module,$(html_TREE_MODULES),\
-		$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(module)/$(1)/contents.part)
+		$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(module)/$(1)/contents.part)
 $(foreach module,$(html_TREE_MODULES),$(call html_gen_contents_html_dep,$(module)/$(1),$(1),helpcontent2/source/auxiliary/$(module)))
 
 endef
 
 $(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_contents_dep,$(lang))))
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/contents.js :
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/contents.js :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,2)
 	$(call gb_Helper_abbreviate_dirs,\
 		( \
@@ -169,7 +169,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/contents.js :
 		) > $@ \
 	)
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/contents.part : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/contents.part : \
         $(SRCDIR)/helpcontent2/help3xsl/get_tree.xsl \
         $(SRCDIR)/helpcontent2/help3xsl/brand.xsl \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
@@ -190,13 +190,13 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/contents.part : \
 
 # link txt file for icon replacement table - tdf#128519
 # copy online_transform.xsl to workdir and build links.txt.xsl
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/online_transform.xsl : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/online_transform.xsl : \
 		$(SRCDIR)/helpcontent2/help3xsl/online_transform.xsl
 	mkdir -p $(dir $@)
 	cp $(SRCDIR)/helpcontent2/help3xsl/online_transform.xsl $@
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/links.txt.xsl : \
-        $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/online_transform.xsl \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/links.txt.xsl : \
+        $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/online_transform.xsl \
         $(SRCDIR)/icon-themes/colibre/links.txt \
         $(SRCDIR)/helpcontent2/helpers/make_icon_link.txt.py \
         | $(call gb_ExternalExecutable_get_dependencies,python)
@@ -205,8 +205,8 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/links.txt.xsl : \
 	$(call gb_Trace_EndRange,$(@F),PY)
 
 define html_gen_html_dep
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/html.text : \
-		$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/links.txt.xsl \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/html.text : \
+		$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/links.txt.xsl \
 	$(foreach module,$(html_TEXT_MODULES), \
 		$(if $(filter en-US,$(1)), \
 			$(call gb_AllLangHelp_get_helpfiles_target,$(module)), \
@@ -216,8 +216,8 @@ endef
 
 $(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_html_dep,$(lang))))
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/html.text : \
-        $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/links.txt.xsl \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/html.text : \
+        $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/links.txt.xsl \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1)
 	$(call gb_Trace_StartRange,$*/$(@F),XSL)
@@ -233,7 +233,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/html.text : \
 	        --stringparam productversion "$(PRODUCTVERSION)" \
 	        --stringparam xapian $(if $(filter TRUE, $(HELP_OMINDEX_PAGE)),'yes','no') \
 	        -o $(dir $@)$${xhp%.xhp}.html \
-	        $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/online_transform.xsl \
+	        $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/online_transform.xsl \
 	        helpcontent2/source/$$xhp \
 	    || exit \
 	; done <"$$RESPONSEFILE" \
@@ -241,7 +241,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/html.text : \
 	&& touch $@
 	$(call gb_Trace_EndRange,$*/$(@F),XSL)
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.js :
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/bookmarks.js :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,2)
 	$(call gb_Helper_abbreviate_dirs,\
 		( \
@@ -252,7 +252,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.js :
 	)
 
 define html__gen_bookmarks_lang_dep
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(2)/$(1)/bookmarks.part : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(2)/$(1)/bookmarks.part : \
     $(if $(filter en-US,$(1)), \
         $(call gb_AllLangHelp_get_helpfiles_target,$(firstword $(subst /, ,$(2)))), \
         $(call gb_HelpTranslateTarget_get_target,$(firstword $(subst /, ,$(2)))/$(1)))
@@ -260,17 +260,17 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(2)/$(1)/bookmarks.pa
 endef
 
 define html__gen_bookmarks_lang_deps
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/bookmarks.js : \
-	$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(2)/$(1)/bookmarks.part
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/bookmarks.js : \
+	$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(2)/$(1)/bookmarks.part
 $(call html__gen_bookmarks_lang_dep,$(1),$(2))
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(2)/$(1)/bookmarks.part : HELP_LANG := $(1)
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(2)/$(1)/bookmarks.part : HELP_LANG := $(1)
 
 endef
 
 define html__gen_bookmarks_deps
 $(foreach lang,$(gb_HELP_LANGS),$(call html__gen_bookmarks_lang_deps,$(lang),$(1)))
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/%/bookmarks.part : APP := $(2)
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/%/bookmarks.part : APPDIR := $(1)
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/%/bookmarks.part : APP := $(2)
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/%/bookmarks.part : APPDIR := $(1)
 
 endef
 
@@ -280,7 +280,7 @@ $(eval $(foreach module,$(html_BMARK_MODULES),$(call html_gen_bookmarks_deps,$(s
 
 # strip the helpcontent2/source/text prefix and cd to the corresponding directory to maximize
 # the number of files that xargs can squeeze into a single invocation of xsltproc
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/bookmarks.part : \
         $(SRCDIR)/helpcontent2/help3xsl/get_bookmark.xsl \
         $(SRCDIR)/helpcontent2/help3xsl/brand.xsl \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
@@ -309,7 +309,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
 
 # html__filelist,lang,module
 define html__filelist
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/filelists/html-help/$(2)/$(1).filelist: \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/filelists/html-help/$(2)/$(1).filelist: \
         $(call gb_HelpTarget_get_filelist,$(2)/$(1)) \
         $(if $(filter $(2),shared), \
             $(call gb_Package_get_target,helpcontent2_html_lang_$(1)) \
@@ -322,17 +322,17 @@ endef
 
 $(eval $(foreach lang,$(gb_HELP_LANGS),$(foreach module,$(html_TEXT_MODULES),$(call html__filelist,$(lang),$(module)))))
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/default.css : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/default.css : \
                 $(SRCDIR)/helpcontent2/help3xsl/default.css \
                 $(BUILDDIR)/config_host.mk
 	sed -e "s/%PRODUCTNAME/$(gb_PRODUCTNAME_CSS)/g" $< > $@
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/help2.js : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/help2.js : \
                 $(SRCDIR)/helpcontent2/help3xsl/help2.js \
                 $(BUILDDIR)/config_host.mk
 	sed -e "s/%PRODUCTNAME/$(gb_PRODUCTNAME_JS)/g" $< > $@
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/tdf_matomo.js : \
+$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/tdf_matomo.js : \
                 $(SRCDIR)/helpcontent2/help3xsl/tdf_matomo.js 
 	mkdir -p $(dir $@)
 	cp $(SRCDIR)/helpcontent2/help3xsl/tdf_matomo.js $@
diff --git a/CustomTarget_imagelist.mk b/CustomTarget_imagelist.mk
index d325a46659..095642ddf1 100644
--- a/CustomTarget_imagelist.mk
+++ b/CustomTarget_imagelist.mk
@@ -16,8 +16,8 @@ $(eval $(call gb_CustomTarget_register_targets,helpcontent2/source/auxiliary,\
 	images_helpimg.zip \
 ))
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/images_helpimg.zip : \
-		$(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst \
+$(gb_CustomTarget_workdir)/helpcontent2/source/auxiliary/images_helpimg.zip : \
+		$(gb_CustomTarget_workdir)/helpcontent2/source/auxiliary/helpimg.ilst \
 		| $(call gb_ExternalExecutable_get_dependencies,python)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
 	$(call gb_Helper_abbreviate_dirs, \
@@ -34,7 +34,7 @@ helpmedia_allMedia:=$(shell $(FIND) $(helpmedia_DIR)/media/helpimg)
 # but we're only interested in the png images
 helpmedia_images = $(filter %.png,$(helpmedia_allMedia))
 
-$(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)/helpimg.ilst: $(helpmedia_allMedia)
+$(gb_CustomTarget_workdir)/helpcontent2/source/auxiliary/helpimg.ilst: $(helpmedia_allMedia)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LST,1)
 	$(file >$@,$(subst $(WHITESPACE),$(NEWLINE),$(sort $(subst $(helpmedia_DIR)/,%MODULE%/,$(helpmedia_images)))))
 
diff --git a/GeneratedPackage_html_lang_generated.mk b/GeneratedPackage_html_lang_generated.mk
index 63b5cef82b..5986eccb88 100644
--- a/GeneratedPackage_html_lang_generated.mk
+++ b/GeneratedPackage_html_lang_generated.mk
@@ -7,7 +7,7 @@
 # # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 # #
 #
-$(eval $(call gb_GeneratedPackage_GeneratedPackage,helpcontent2_html_lang_generated,$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)))
+$(eval $(call gb_GeneratedPackage_GeneratedPackage,helpcontent2_html_lang_generated,$(gb_CustomTarget_workdir)/helpcontent2/help3xsl))
 
 $(eval $(call gb_GeneratedPackage_use_customtarget,helpcontent2_html_lang_generated,helpcontent2/help3xsl))
 
diff --git a/Package_helpimages.mk b/Package_helpimages.mk
index 8a717fca39..a8b59f83a1 100644
--- a/Package_helpimages.mk
+++ b/Package_helpimages.mk
@@ -7,7 +7,7 @@
 # # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 # #
 #
-$(eval $(call gb_Package_Package,helpcontent2_helpimages,$(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary)))
+$(eval $(call gb_Package_Package,helpcontent2_helpimages,$(gb_CustomTarget_workdir)/helpcontent2/source/auxiliary))
 
 $(eval $(call gb_Package_add_files,helpcontent2_helpimages,$(LIBO_SHARE_FOLDER)/config,\
 	images_helpimg.zip \
diff --git a/Package_html_dynamic.mk b/Package_html_dynamic.mk
index b7d3e8082f..98874fcf47 100644
--- a/Package_html_dynamic.mk
+++ b/Package_html_dynamic.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,helpcontent2_html_dynamic,$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)))
+$(eval $(call gb_Package_Package,helpcontent2_html_dynamic,$(gb_CustomTarget_workdir)/helpcontent2/help3xsl))
 
 $(eval $(call gb_Package_use_customtarget,helpcontent2_html_dynamic,helpcontent2/help3xsl))