summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android/CustomTarget_lo_android.mk2
-rw-r--r--bridges/CustomTarget_gcc3_linux_arm.mk12
-rw-r--r--bridges/Library_cpp_uno.mk4
-rw-r--r--cli_ure/CustomTarget_cli_ure_assemblies.mk18
-rw-r--r--desktop/CustomTarget_desktop_unopackages_install.mk6
-rw-r--r--desktop/CustomTarget_soffice.mk6
-rw-r--r--desktop/Executable_soffice_bin.mk8
-rw-r--r--desktop/GeneratedPackage_desktop_unopackages_install.mk2
-rw-r--r--desktop/Package_soffice_sh.mk2
-rw-r--r--editeng/CustomTarget_generated.mk2
-rw-r--r--extensions/CustomTarget_automationtest.mk2
-rw-r--r--extensions/CustomTarget_so_activex_idl.mk2
-rw-r--r--extensions/CustomTarget_so_activex_x64.mk16
-rw-r--r--external/onlineupdate/CustomTarget_generated.mk2
-rw-r--r--extras/AllLangPackage_autotextshare.mk2
-rw-r--r--extras/CustomTarget_autocorr.mk12
-rw-r--r--extras/CustomTarget_autotextshare.mk16
-rw-r--r--extras/CustomTarget_autotextuser.mk12
-rw-r--r--extras/CustomTarget_gallsystem.mk6
-rw-r--r--extras/CustomTarget_glade.mk2
-rw-r--r--extras/CustomTarget_opensymbol.mk4
-rw-r--r--extras/CustomTarget_templates.mk30
-rw-r--r--extras/CustomTarget_tplpresnt.mk20
-rw-r--r--extras/CustomTarget_tplwizard.mk32
-rw-r--r--extras/Package_autocorr.mk2
-rw-r--r--extras/Package_autotextuser.mk2
-rw-r--r--extras/Package_fonts.mk2
-rw-r--r--extras/Package_gallsystemstr.mk2
-rw-r--r--extras/Package_glade.mk2
-rw-r--r--extras/Package_resource_fonts.mk2
-rw-r--r--extras/Package_templates.mk2
-rw-r--r--extras/Package_tplpresnt.mk2
-rw-r--r--extras/Package_tplwizard.mk2
-rw-r--r--filter/CustomTarget_svg.mk2
-rw-r--r--i18npool/CustomTarget_breakiterator.mk2
-rw-r--r--i18npool/CustomTarget_collator.mk2
-rw-r--r--i18npool/CustomTarget_indexentry.mk6
-rw-r--r--i18npool/CustomTarget_localedata.mk8
-rw-r--r--i18npool/CustomTarget_textconversion.mk6
-rw-r--r--i18npool/Library_i18npool.mk12
-rw-r--r--instsetoo_native/CustomTarget_install.mk46
-rw-r--r--instsetoo_native/CustomTarget_setup.mk38
-rw-r--r--instsetoo_native/Package_setup.mk2
-rw-r--r--instsetoo_native/Package_setup_ure.mk2
-rw-r--r--jvmfwk/CustomTarget_jreproperties.mk6
-rw-r--r--jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk2
-rw-r--r--jvmfwk/Package_jreproperties.mk2
-rw-r--r--jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk2
-rw-r--r--librelogo/CustomTarget_librelogo.mk2
-rw-r--r--librelogo/Package_librelogo_properties.mk2
-rw-r--r--odk/CustomTarget_allheaders.mk2
-rw-r--r--odk/CustomTarget_check.mk4
-rw-r--r--odk/CustomTarget_classes.mk2
-rw-r--r--odk/CustomTarget_config_win.mk2
-rw-r--r--odk/CustomTarget_doxygen.mk16
-rw-r--r--odk/CustomTarget_html.mk2
-rw-r--r--odk/CustomTarget_javadoc.mk12
-rw-r--r--odk/CustomTarget_settings.mk2
-rw-r--r--odk/GeneratedPackage_odk_doxygen.mk2
-rw-r--r--odk/GeneratedPackage_odk_javadoc.mk2
-rw-r--r--odk/GeneratedPackage_uno_loader_classes.mk2
-rw-r--r--odk/Package_config_win.mk2
-rw-r--r--odk/Package_html.mk2
-rw-r--r--odk/Package_settings_generated.mk2
-rw-r--r--odk/Package_share_readme.mk2
-rw-r--r--odk/build-examples_common.mk16
-rw-r--r--officecfg/CustomTarget_registry.mk6
-rw-r--r--oox/CustomTarget_generated.mk2
-rw-r--r--oox/Package_generated.mk2
-rw-r--r--postprocess/CustomTarget_check_dynamic_objects.mk2
-rw-r--r--postprocess/CustomTarget_components.mk2
-rw-r--r--postprocess/CustomTarget_fontconfig.mk8
-rw-r--r--postprocess/CustomTarget_images.mk2
-rw-r--r--postprocess/CustomTarget_registry.mk36
-rw-r--r--postprocess/CustomTarget_signing.mk4
-rw-r--r--postprocess/Package_fontconfig.mk2
-rw-r--r--postprocess/Package_images.mk2
-rw-r--r--pyuno/CustomTarget_python_shell.mk6
-rw-r--r--pyuno/CustomTarget_pyuno_pythonloader_ini.mk2
-rw-r--r--pyuno/Package_python_shell.mk2
-rw-r--r--pyuno/Package_pyuno_pythonloader_ini.mk2
-rw-r--r--readlicense_oo/CustomTarget_license.mk2
-rw-r--r--readlicense_oo/CustomTarget_readme.mk2
-rw-r--r--readlicense_oo/Package_license.mk2
-rw-r--r--readlicense_oo/Package_readlicense_oo_readmes.mk2
-rw-r--r--ridljar/CustomTarget_javamaker.mk2
-rw-r--r--ridljar/CustomTarget_test_urp.mk2
-rw-r--r--ridljar/Jar_libreoffice.mk4
-rw-r--r--ridljar/JunitTest_bridgefactory.mk2
-rw-r--r--ridljar/JunitTest_connections.mk2
-rw-r--r--ridljar/JunitTest_java.mk2
-rw-r--r--ridljar/JunitTest_java_remote.mk2
-rw-r--r--ridljar/JunitTest_remote.mk2
-rw-r--r--ridljar/JunitTest_urp.mk2
-rw-r--r--scp2/CustomTarget_langmacros.mk6
-rw-r--r--sdext/CustomTarget_pdfimport.mk6
-rw-r--r--setup_native/CustomTarget_mac.mk2
-rw-r--r--setup_native/CustomTarget_scripts.mk2
-rw-r--r--setup_native/CustomTarget_spell.mk2
-rw-r--r--sfx2/CustomTarget_classification.mk2
-rw-r--r--shell/CustomTarget_shlxthdl_res.mk6
-rw-r--r--shell/CustomTarget_spsupp_idl.mk2
-rw-r--r--shell/CustomTarget_x64.mk6
-rw-r--r--shell/WinResTarget_spsupp.mk2
-rw-r--r--solenv/gbuild/CustomTarget.mk50
-rw-r--r--solenv/gbuild/Executable.mk4
-rw-r--r--solenv/gbuild/InstallModuleTarget.mk2
-rw-r--r--solenv/gbuild/JavaClassSet.mk2
-rw-r--r--solenv/gbuild/JunitTest.mk2
-rw-r--r--solenv/gbuild/LinkTarget.mk2
-rw-r--r--solenv/gbuild/Module.mk2
-rw-r--r--solenv/gbuild/PythonTest.mk2
-rw-r--r--solenv/gbuild/TargetLocations.mk1
-rw-r--r--solenv/gbuild/UITest.mk2
-rw-r--r--solenv/gbuild/WinResTarget.mk2
-rw-r--r--solenv/gbuild/extensions/post_GbuildToJson.mk2
-rw-r--r--solenv/gbuild/platform/unxgcc.mk4
-rw-r--r--static/CustomTarget_components.mk4
-rw-r--r--static/CustomTarget_emscripten_fs_image.mk2
-rw-r--r--static/CustomTarget_unoembind.mk12
-rw-r--r--static/CustomTarget_wasm-qt5-mandelbrot_moc.mk12
-rw-r--r--static/Package_unoembind.mk2
-rw-r--r--sw/CustomTarget_generated.mk2
-rw-r--r--sw/CustomTarget_source.mk4
-rw-r--r--sysui/CustomTarget_deb.mk6
-rw-r--r--sysui/CustomTarget_infoplist.mk2
-rw-r--r--sysui/CustomTarget_rpm.mk6
-rw-r--r--sysui/CustomTarget_share.mk2
-rw-r--r--sysui/CustomTarget_solaris.mk6
-rw-r--r--sysui/Package_infoplist.mk2
-rw-r--r--sysui/Package_osxicons.mk4
-rw-r--r--testtools/CustomTarget_bridgetest.mk2
-rw-r--r--testtools/CustomTarget_bridgetest_climaker.mk2
-rw-r--r--testtools/CustomTarget_bridgetest_javamaker.mk2
-rw-r--r--testtools/Jar_testComponent.mk2
-rw-r--r--tools/CustomTarget_reversemap.mk6
-rw-r--r--unoidl/CustomTarget_unoidl-check_test.mk148
-rw-r--r--unoidl/CustomTarget_unoidl-write_test.mk46
-rw-r--r--unoil/CustomTarget_javamaker.mk2
-rw-r--r--vcl/CustomTarget_gtk3_kde5_moc.mk8
-rw-r--r--vcl/CustomTarget_kf5_moc.mk6
-rw-r--r--vcl/CustomTarget_kf6_moc.mk6
-rw-r--r--vcl/CustomTarget_nativecalc.mk4
-rw-r--r--vcl/CustomTarget_nativecore.mk4
-rw-r--r--vcl/CustomTarget_nativedraw.mk4
-rw-r--r--vcl/CustomTarget_nativemath.mk4
-rw-r--r--vcl/CustomTarget_nativewriter.mk4
-rw-r--r--vcl/CustomTarget_qt5_moc.mk26
-rw-r--r--vcl/CustomTarget_qt6_moc.mk26
-rw-r--r--winaccessibility/CustomTarget_ia2_idl.mk2
-rw-r--r--wizards/CustomTarget_share.mk8
-rw-r--r--wizards/CustomTarget_wizards.mk2
-rw-r--r--wizards/Package_share.mk2
-rw-r--r--wizards/Package_wizards_properties.mk2
-rw-r--r--xmloff/CustomTarget_generated.mk4
155 files changed, 531 insertions, 530 deletions
diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk
index 93a434d11d16..815548cdf3a8 100644
--- a/android/CustomTarget_lo_android.mk
+++ b/android/CustomTarget_lo_android.mk
@@ -8,7 +8,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,android/loandroid3))
-loandroid3_DIR := $(call gb_CustomTarget_get_workdir,android/source)
+loandroid3_DIR := $(gb_CustomTarget_workdir)/android/source
$(call gb_CustomTarget_get_target,android/loandroid3) : \
$(loandroid3_DIR)/done
diff --git a/bridges/CustomTarget_gcc3_linux_arm.mk b/bridges/CustomTarget_gcc3_linux_arm.mk
index 327f1e06a54a..1cc5a6fcd4f9 100644
--- a/bridges/CustomTarget_gcc3_linux_arm.mk
+++ b/bridges/CustomTarget_gcc3_linux_arm.mk
@@ -10,16 +10,16 @@
$(eval $(call gb_CustomTarget_CustomTarget,bridges/source/cpp_uno/gcc3_linux_arm))
$(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_linux_arm) : \
- $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
+ $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.objectlist
-$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o : \
+$(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.o : \
$(SRCDIR)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S \
- | $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/.dir
+ | $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/.dir
$(gb_CXX) -c -o $@ $< -fPIC
-$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist : \
- $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o \
- | $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/.dir
+$(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.objectlist : \
+ $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.o \
+ | $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/.dir
echo $< > $@
# vim: set noet sw=4 ts=4:
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 7b10348e83b7..dcf83cf34e5b 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -16,9 +16,9 @@ bridges_SELECTED_BRIDGE := gcc3_linux_arm
bridge_noopt_objects := cpp2uno except uno2cpp
# HACK
$(call gb_Library_get_linktarget_target,gcc3_uno) : \
- $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
+ $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.objectlist
$(call gb_Library_get_linktarget_target,gcc3_uno) : \
- EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
+ EXTRAOBJECTLISTS += $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.objectlist
endif
else ifeq ($(CPUNAME),AARCH64)
diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index 266df95f2706..6dc26f852efe 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -14,29 +14,29 @@ include $(SRCDIR)/cli_ure/version/version.txt
$(eval $(call gb_CustomTarget_CustomTarget,cli_ure/source))
$(call gb_CustomTarget_get_target,cli_ure/source) : \
- $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs \
- $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx \
- $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs
+ $(gb_CustomTarget_workdir)/cli_ure/source/basetypes/assembly.cs \
+ $(gb_CustomTarget_workdir)/cli_ure/source/native/assembly.cxx \
+ $(gb_CustomTarget_workdir)/cli_ure/source/ure/assembly.cs
-$(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs : \
+$(gb_CustomTarget_workdir)/cli_ure/source/basetypes/assembly.cs : \
$(SRCDIR)/cli_ure/source/basetypes/assembly.cs \
$(SRCDIR)/cli_ure/version/version.txt \
$(cli_ure_source_MAKEFILE) \
- | $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/.dir
+ | $(gb_CustomTarget_workdir)/cli_ure/source/basetypes/.dir
sed -e "s/@CLI_BASETYPES_NEW_VERSION@/$(CLI_BASETYPES_NEW_VERSION)/g" $< > $@
-$(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx : \
+$(gb_CustomTarget_workdir)/cli_ure/source/native/assembly.cxx : \
$(SRCDIR)/cli_ure/source/native/assembly.cxx \
$(SRCDIR)/cli_ure/version/version.txt \
$(cli_ure_source_MAKEFILE) \
- | $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/.dir
+ | $(gb_CustomTarget_workdir)/cli_ure/source/native/.dir
sed -e "s/@CLI_CPPUHELPER_NEW_VERSION@/$(CLI_CPPUHELPER_NEW_VERSION)/g" $< > $@
-$(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \
+$(gb_CustomTarget_workdir)/cli_ure/source/ure/assembly.cs : \
$(SRCDIR)/cli_ure/source/ure/assembly.cs \
$(SRCDIR)/cli_ure/version/version.txt \
$(cli_ure_source_MAKEFILE) \
- | $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/.dir
+ | $(gb_CustomTarget_workdir)/cli_ure/source/ure/.dir
sed -e "s/@CLI_URE_NEW_VERSION@/$(CLI_URE_NEW_VERSION)/g" $< > $@
# vim: set noet sw=4 ts=4:
diff --git a/desktop/CustomTarget_desktop_unopackages_install.mk b/desktop/CustomTarget_desktop_unopackages_install.mk
index f16845fe1d7b..ba2d7041fc0d 100644
--- a/desktop/CustomTarget_desktop_unopackages_install.mk
+++ b/desktop/CustomTarget_desktop_unopackages_install.mk
@@ -10,10 +10,10 @@
$(eval $(call gb_CustomTarget_CustomTarget,desktop/unopackages_install))
$(call gb_CustomTarget_get_target,desktop/unopackages_install) : | \
- $(call gb_CustomTarget_get_workdir,desktop/unopackages_install)/uno_packages/cache/uno_packages
+ $(gb_CustomTarget_workdir)/desktop/unopackages_install/uno_packages/cache/uno_packages
-$(call gb_CustomTarget_get_workdir,desktop/unopackages_install)/uno_packages/cache/uno_packages : | \
- $(call gb_CustomTarget_get_workdir,desktop/unopackages_install)/.dir
+$(gb_CustomTarget_workdir)/desktop/unopackages_install/uno_packages/cache/uno_packages : | \
+ $(gb_CustomTarget_workdir)/desktop/unopackages_install/.dir
mkdir -p $@
# vim: set noet sw=4 ts=4:
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk
index 4df29fc3cae3..26e661ec39dc 100644
--- a/desktop/CustomTarget_soffice.mk
+++ b/desktop/CustomTarget_soffice.mk
@@ -27,12 +27,12 @@ endif
else
$(call gb_CustomTarget_get_target,desktop/soffice) : \
- $(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh
+ $(gb_CustomTarget_workdir)/desktop/soffice/soffice.sh
-$(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh : \
+$(gb_CustomTarget_workdir)/desktop/soffice/soffice.sh : \
$(SRCDIR)/desktop/scripts/soffice.sh \
$(BUILDDIR)/config_host.mk \
- | $(call gb_CustomTarget_get_workdir,desktop/soffice)/.dir
+ | $(gb_CustomTarget_workdir)/desktop/soffice/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED)
ifneq ($(JITC_PROCESSOR_TYPE),)
diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk
index 8ffd04ee1c24..0d3ac520c398 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -28,11 +28,11 @@ $(eval $(call gb_Executable_add_cobjects,soffice_bin,\
))
ifeq ($(OS),EMSCRIPTEN)
-$(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,soffice_bin)) : $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.link
+$(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,soffice_bin)) : $(gb_CustomTarget_workdir)/static/emscripten_fs_image/soffice.data.js.link
# don't sort; later can override previous settings!
$(eval $(call gb_Executable_add_prejs,soffice_bin,$(SRCDIR)/static/emscripten/environment.js))
-$(eval $(call gb_Executable_add_prejs,soffice_bin,$(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.link))
+$(eval $(call gb_Executable_add_prejs,soffice_bin,$(gb_CustomTarget_workdir)/static/emscripten_fs_image/soffice.data.js.link))
ifeq ($(ENABLE_QT5),TRUE)
$(eval $(call gb_Executable_add_prejs,soffice_bin,$(SRCDIR)/static/emscripten/soffice_args.js))
endif
@@ -74,11 +74,11 @@ endif
ifneq ($(ENABLE_DBGUTIL),)
$(call gb_Executable_get_linktarget_target,soffice_bin): \
- $(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.js \
+ $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \
$(SRCDIR)/unotest/source/embindtest/embindtest.js
$(eval $(call gb_Executable_add_ldflags,soffice_bin, \
- --post-js $(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.js \
+ --post-js $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \
--post-js $(SRCDIR)/unotest/source/embindtest/embindtest.js \
))
diff --git a/desktop/GeneratedPackage_desktop_unopackages_install.mk b/desktop/GeneratedPackage_desktop_unopackages_install.mk
index b3b3cc6fc1d8..6438b85eb870 100644
--- a/desktop/GeneratedPackage_desktop_unopackages_install.mk
+++ b/desktop/GeneratedPackage_desktop_unopackages_install.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_GeneratedPackage_GeneratedPackage,desktop_unopackages_install,$(call gb_CustomTarget_get_workdir,desktop/unopackages_install)))
+$(eval $(call gb_GeneratedPackage_GeneratedPackage,desktop_unopackages_install,$(gb_CustomTarget_workdir)/desktop/unopackages_install))
$(eval $(call gb_GeneratedPackage_use_customtarget,desktop_unopackages_install,desktop/unopackages_install))
diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk
index 046c95f45996..6a426b526629 100644
--- a/desktop/Package_soffice_sh.mk
+++ b/desktop/Package_soffice_sh.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,desktop_soffice_sh,$(call gb_CustomTarget_get_workdir,desktop/soffice)))
+$(eval $(call gb_Package_Package,desktop_soffice_sh,$(gb_CustomTarget_workdir)/desktop/soffice))
$(eval $(call gb_Package_add_file,desktop_soffice_sh,$(LIBO_BIN_FOLDER)/soffice,soffice.sh))
diff --git a/editeng/CustomTarget_generated.mk b/editeng/CustomTarget_generated.mk
index fe7aa10ae18a..bbdc75fcf53a 100644
--- a/editeng/CustomTarget_generated.mk
+++ b/editeng/CustomTarget_generated.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,editeng/generated))
editeng_SRC := $(SRCDIR)/editeng/source/misc
editeng_PY := $(SRCDIR)/solenv/bin/gentoken.py
-editeng_INC := $(call gb_CustomTarget_get_workdir,editeng/generated)
+editeng_INC := $(gb_CustomTarget_workdir)/editeng/generated
$(editeng_INC)/tokens.hxx $(editeng_INC)/tokens.gperf : $(editeng_SRC)/tokens.txt $(editeng_PY) \
$(call gb_ExternalExecutable_get_dependencies,python)
diff --git a/extensions/CustomTarget_automationtest.mk b/extensions/CustomTarget_automationtest.mk
index e895c0b2a337..b6de71b74211 100644
--- a/extensions/CustomTarget_automationtest.mk
+++ b/extensions/CustomTarget_automationtest.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,extensions/automationtest))
-extensions_AUTOMATIONTESTDIR := $(call gb_CustomTarget_get_workdir,extensions/automationtest)
+extensions_AUTOMATIONTESTDIR := $(gb_CustomTarget_workdir)/extensions/automationtest
extensions_AUTOMATIONTESTLOG1 := $(extensions_AUTOMATIONTESTDIR)/automationtest.1.log
extensions_AUTOMATIONTESTLOG2 := $(extensions_AUTOMATIONTESTDIR)/automationtest.2.log
diff --git a/extensions/CustomTarget_so_activex_idl.mk b/extensions/CustomTarget_so_activex_idl.mk
index b4d841aec524..d25e547e1690 100644
--- a/extensions/CustomTarget_so_activex_idl.mk
+++ b/extensions/CustomTarget_so_activex_idl.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex/idl))
-extensions_AXIDLDIR := $(call gb_CustomTarget_get_workdir,extensions/source/activex/idl)
+extensions_AXIDLDIR := $(gb_CustomTarget_workdir)/extensions/source/activex/idl
$(call gb_CustomTarget_get_target,extensions/source/activex/idl) : \
$(extensions_AXIDLDIR)/so_activex.tlb
diff --git a/extensions/CustomTarget_so_activex_x64.mk b/extensions/CustomTarget_so_activex_x64.mk
index 6b1b35d94bb7..a91a114b52ff 100644
--- a/extensions/CustomTarget_so_activex_x64.mk
+++ b/extensions/CustomTarget_so_activex_x64.mk
@@ -10,16 +10,16 @@
$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex))
$(call gb_CustomTarget_get_target,extensions/source/activex) : \
- $(call gb_CustomTarget_get_workdir,extensions/source/activex)/SOActionsApproval.cxx \
- $(call gb_CustomTarget_get_workdir,extensions/source/activex)/SOActiveX.cxx \
- $(call gb_CustomTarget_get_workdir,extensions/source/activex)/SOComWindowPeer.cxx \
- $(call gb_CustomTarget_get_workdir,extensions/source/activex)/SODispatchInterceptor.cxx \
- $(call gb_CustomTarget_get_workdir,extensions/source/activex)/StdAfx2.cxx \
- $(call gb_CustomTarget_get_workdir,extensions/source/activex)/so_activex.cxx \
+ $(gb_CustomTarget_workdir)/extensions/source/activex/SOActionsApproval.cxx \
+ $(gb_CustomTarget_workdir)/extensions/source/activex/SOActiveX.cxx \
+ $(gb_CustomTarget_workdir)/extensions/source/activex/SOComWindowPeer.cxx \
+ $(gb_CustomTarget_workdir)/extensions/source/activex/SODispatchInterceptor.cxx \
+ $(gb_CustomTarget_workdir)/extensions/source/activex/StdAfx2.cxx \
+ $(gb_CustomTarget_workdir)/extensions/source/activex/so_activex.cxx \
-$(call gb_CustomTarget_get_workdir,extensions/source/activex)/% : \
+$(gb_CustomTarget_workdir)/extensions/source/activex/% : \
$(SRCDIR)/extensions/source/activex/% \
- | $(call gb_CustomTarget_get_workdir,extensions/source/activex)/.dir
+ | $(gb_CustomTarget_workdir)/extensions/source/activex/.dir
cp $< $@
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/external/onlineupdate/CustomTarget_generated.mk b/external/onlineupdate/CustomTarget_generated.mk
index ffdfffd4312a..813394a2c6e1 100644
--- a/external/onlineupdate/CustomTarget_generated.mk
+++ b/external/onlineupdate/CustomTarget_generated.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,external/onlineupdate/generated))
-onlineupdate_INC := $(call gb_CustomTarget_get_workdir,external/onlineupdate/generated)
+onlineupdate_INC := $(gb_CustomTarget_workdir)/external/onlineupdate/generated
$(onlineupdate_INC)/primaryCert.h $(onlineupdate_INC)/secondaryCert.h : \
$(call gb_ExternalExecutable_get_dependencies,python) \
diff --git a/extras/AllLangPackage_autotextshare.mk b/extras/AllLangPackage_autotextshare.mk
index 4d2eee32884c..5c99540eef7f 100644
--- a/extras/AllLangPackage_autotextshare.mk
+++ b/extras/AllLangPackage_autotextshare.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_AllLangPackage_AllLangPackage,autotextshare,$(call gb_CustomTarget_get_workdir,extras/source/autotext)))
+$(eval $(call gb_AllLangPackage_AllLangPackage,autotextshare,$(gb_CustomTarget_workdir)/extras/source/autotext))
$(eval $(call gb_AllLangPackage_add_files,autotextshare,$(LIBO_SHARE_FOLDER)/autotext,\
af/standard.bau \
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index 201697952b19..6fcbc2c66481 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -245,8 +245,8 @@ extras_AUTOCORR_XMLFILES := \
# param: shortlang
extras_AUTOCORR_XMLFILES_LANG = $(subst $(1)/,,$(filter $(1)/%,$(extras_AUTOCORR_XMLFILES)))
-$(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%/mimetype : \
- | $(dir $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%/mimetype).dir
+$(gb_CustomTarget_workdir)/extras/source/autocorr/%/mimetype : \
+ | $(dir $(gb_CustomTarget_workdir)/extras/source/autocorr/%/mimetype).dir
$(call gb_Output_announce,autocorr/$*/mimetype,$(true),TCH,1)
$(call gb_Trace_StartRange,autocorr/$*/mimetype,TCH)
touch $@
@@ -256,9 +256,9 @@ $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%/mimetype : \
# secondexpansion since the pattern not just covers a file, but also a directory portion with
# different number of elements (just the lang or lang/META-INF) and thus the directory dependency
# needs the stem of the actual target to work as intended
-$(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%.xml : $(SRCDIR)/extras/source/autocorr/lang/%.xml \
+$(gb_CustomTarget_workdir)/extras/source/autocorr/%.xml : $(SRCDIR)/extras/source/autocorr/lang/%.xml \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
- $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/$$*.xml).dir
+ $$(dir $(gb_CustomTarget_workdir)/extras/source/autocorr/$$*.xml).dir
$(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 $<
@@ -269,9 +269,9 @@ $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%.xml : $(SRCDIR)/ext
# allows the actual stem from the target to be used in the macro calls
# there's no reason for the different directories though, so a janitorial cleanup would be
# TODO: get rid of the shortform:longform language names when assembling the autocorr files
-$(call gb_CustomTarget_get_workdir,extras/source/autocorr)/acor_%.dat : \
+$(gb_CustomTarget_workdir)/extras/source/autocorr/acor_%.dat : \
$$(addprefix \
- $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/$$(call extras_AUTOCORR_SHORTLANG,$$*)/,\
+ $(gb_CustomTarget_workdir)/extras/source/autocorr/$$(call extras_AUTOCORR_SHORTLANG,$$*)/,\
mimetype \
$$(call extras_AUTOCORR_XMLFILES_LANG,$$(call extras_AUTOCORR_SHORTLANG,$$*))) \
| $(call gb_ExternalExecutable_get_dependencies,python)
diff --git a/extras/CustomTarget_autotextshare.mk b/extras/CustomTarget_autotextshare.mk
index 318e05fe21fd..142ffafcbffe 100644
--- a/extras/CustomTarget_autotextshare.mk
+++ b/extras/CustomTarget_autotextshare.mk
@@ -3637,31 +3637,31 @@ extras_AUTOTEXTSHARE_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras
.SECONDEXPANSION:
# secondexpansion since the patterns not just cover a filename portion, but also include a
# directory portion withdifferent number of elements
-$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%/mimetype : \
- | $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext)/$$*/mimetype).dir
+$(gb_CustomTarget_workdir)/extras/source/autotext/%/mimetype : \
+ | $$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/$$*/mimetype).dir
$(call gb_Output_announce,autotext/$*/mimetype,$(true),TCH,1)
$(call gb_Trace_StartRange,autotext/$*/mimetype,TCH)
touch $@
$(call gb_Trace_EndRange,autotext/$*/mimetype,TCH)
# rule for *.rdf, *.svm, *.png, …
-$(call gb_CustomTarget_get_workdir,extras/source/autotext)/% : $(SRCDIR)/extras/source/autotext/lang/% \
- | $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext)/$$*).dir
+$(gb_CustomTarget_workdir)/extras/source/autotext/% : $(SRCDIR)/extras/source/autotext/lang/% \
+ | $$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/$$*).dir
$(call gb_Output_announce,autotext/$*,$(true),CPY,1)
$(call gb_Trace_StartRange,autotext/$*,CPY)
cp $< $@
$(call gb_Trace_EndRange,autotext/$*,CPY)
-$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.xml : $(SRCDIR)/extras/source/autotext/lang/%.xml \
+$(gb_CustomTarget_workdir)/extras/source/autotext/%.xml : $(SRCDIR)/extras/source/autotext/lang/%.xml \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
- $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext)/$$*.xml).dir
+ $$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/$$*.xml).dir
$(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 : \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/autotext)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/autotext/%.bau : \
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/autotext/$$*/,\
mimetype $$(call extras_AUTOTEXTSHARE_XMLFILES_RELATIVE,$$*))
$(call gb_Output_announce,autotext/$*.bau,$(true),ZIP,2)
$(call gb_Trace_StartRange,autotext/$*.bau,ZIP)
diff --git a/extras/CustomTarget_autotextuser.mk b/extras/CustomTarget_autotextuser.mk
index 5ac07ccb6c19..f81fb07250ad 100644
--- a/extras/CustomTarget_autotextuser.mk
+++ b/extras/CustomTarget_autotextuser.mk
@@ -19,23 +19,23 @@ extras_AUTOTEXTUSER_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_
.SECONDEXPANSION:
# secondexpansion since the patterns not just cover a filename portion, but also include a
# directory portion withdifferent number of elements
-$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%/mimetype : \
- | $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/$$*/mimetype).dir
+$(gb_CustomTarget_workdir)/extras/source/autotext/user/%/mimetype : \
+ | $$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/user/$$*/mimetype).dir
$(call gb_Output_announce,autotext/user/$*/mimetype,$(true),TCH,1)
$(call gb_Trace_StartRange,autotext/user/$*/mimetype,TCH)
touch $@
$(call gb_Trace_EndRange,autotext/user/$*/mimetype,TCH)
-$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.xml : $(SRCDIR)/extras/source/autotext/%.xml \
+$(gb_CustomTarget_workdir)/extras/source/autotext/user/%.xml : $(SRCDIR)/extras/source/autotext/%.xml \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
- $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/$$*.xml).dir
+ $$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/user/$$*.xml).dir
$(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 : \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/autotext/user/%.bau : \
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/autotext/user/$$*/,\
mimetype $$(call extras_AUTOTEXTUSER_XMLFILES_RELATIVE,$$*))
$(call gb_Output_announce,autotext/user/$*.bau,$(true),ZIP,2)
$(call gb_Trace_StartRange,autotext/user/$*.bau,ZIP)
diff --git a/extras/CustomTarget_gallsystem.mk b/extras/CustomTarget_gallsystem.mk
index 434cbb6e17dd..cab25d047f64 100644
--- a/extras/CustomTarget_gallsystem.mk
+++ b/extras/CustomTarget_gallsystem.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_CustomTarget_register_targets,extras/gallsysstr,\
))
$(eval $(call gb_CustomTarget_ulfex_rule,\
- $(call gb_CustomTarget_get_workdir,extras/gallsysstr)/extras_gallsystem.ulf,\
+ $(gb_CustomTarget_workdir)/extras/gallsysstr/extras_gallsystem.ulf,\
$(SRCDIR)/extras/source/gallery/share/gallery_names.ulf,\
$(foreach lang,$(gb_TRANS_LANGS),\
$(gb_POLOCATION)/$(lang)/extras/source/gallery/share.po)))
@@ -23,8 +23,8 @@ $(eval $(call gb_CustomTarget_ulfex_rule,\
# desktop-translate.py is ugly af/doesn't play nice with make dependencies.
# It expects the target filename to exist and modifies it, so do the hack with own
# temporary dir
-$(call gb_CustomTarget_get_workdir,extras/gallsysstr)/%.str : \
- $(call gb_CustomTarget_get_workdir,extras/gallsysstr)/extras_gallsystem.ulf \
+$(gb_CustomTarget_workdir)/extras/gallsysstr/%.str : \
+ $(gb_CustomTarget_workdir)/extras/gallsysstr/extras_gallsystem.ulf \
$(SRCDIR)/extras/source/gallery/gallery_system/dummy.str \
$(call gb_ExternalExecutable_get_dependencies,python) \
$(SRCDIR)/solenv/bin/desktop-translate.py
diff --git a/extras/CustomTarget_glade.mk b/extras/CustomTarget_glade.mk
index b25e095c532b..b4e718b0b56c 100644
--- a/extras/CustomTarget_glade.mk
+++ b/extras/CustomTarget_glade.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,extras/glade))
# Rules
#
-$(call gb_CustomTarget_get_workdir,extras/source/glade)/libreoffice-catalog.xml : \
+$(gb_CustomTarget_workdir)/extras/source/glade/libreoffice-catalog.xml : \
$(SRCDIR)/extras/source/glade/libreoffice-catalog.xml.in \
$(SRCDIR)/extras/source/glade/makewidgetgroup.xslt \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
diff --git a/extras/CustomTarget_opensymbol.mk b/extras/CustomTarget_opensymbol.mk
index c68480931044..b726dc7cc2bf 100644
--- a/extras/CustomTarget_opensymbol.mk
+++ b/extras/CustomTarget_opensymbol.mk
@@ -12,14 +12,14 @@ $(eval $(call gb_CustomTarget_CustomTarget,extras/fonts))
$(eval $(call gb_CustomTarget_register_targets,extras/fonts,opens___.ttf))
ifneq (,$(FONTFORGE))
-$(call gb_CustomTarget_get_workdir,extras/fonts)/opens___.ttf : \
+$(gb_CustomTarget_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 : \
+$(gb_CustomTarget_workdir)/extras/fonts/opens___.ttf : \
$(TARFILE_LOCATION)/$(OPENSYMBOL_TTF)
cp $< $@
endif
diff --git a/extras/CustomTarget_templates.mk b/extras/CustomTarget_templates.mk
index 5266a6917638..b17ce37df9eb 100644
--- a/extras/CustomTarget_templates.mk
+++ b/extras/CustomTarget_templates.mk
@@ -48,31 +48,31 @@ extras_TEMPLATES_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_TEM
# secondexpansion since the patterns not just cover a filename portion, but also include a
# directory portion with different number of elements
# copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(call gb_CustomTarget_get_workdir,extras/source/templates)/% : $(SRCDIR)/extras/source/templates/% \
- | $$(dir $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*).dir
+$(gb_CustomTarget_workdir)/extras/source/templates/% : $(SRCDIR)/extras/source/templates/% \
+ | $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/$$*).dir
$(call gb_Output_announce,templates/$*,$(true),CPY,1)
$(call gb_Trace_StartRange,templates/$*,CPY)
cp $< $@
$(call gb_Trace_EndRange,templates/$*,CPY)
# test and copy xml files
-$(call gb_CustomTarget_get_workdir,extras/source/templates)/%.xml : $(SRCDIR)/extras/source/templates/%.xml \
+$(gb_CustomTarget_workdir)/extras/source/templates/%.xml : $(SRCDIR)/extras/source/templates/%.xml \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
- $$(dir $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*.xml).dir
+ $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/$$*.xml).dir
$(call gb_Output_announce,templates/$*.xml,$(true),XSL,1)
$(call gb_Trace_StartRange,templates/$*.xml,XSL)
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
$(call gb_Trace_EndRange,templates/$*.xml,XSL)
# zip files to OTT
-$(call gb_CustomTarget_get_workdir,extras/source/templates)/%.ott : \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/templates/%.ott : \
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
mimetype $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
styles.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
META-INF/manifest.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
Thumbnails/thumbnail.png $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) )
$(call gb_Output_announce,templates/$*.ott,$(true),ZIP,2)
$(call gb_Trace_StartRange,templates/$*.ott,ZIP)
@@ -86,16 +86,16 @@ $(call gb_CustomTarget_get_workdir,extras/source/templates)/%.ott : \
$(call gb_Trace_EndRange,templates/$*.ott,ZIP)
# zip files to OTG
-$(call gb_CustomTarget_get_workdir,extras/source/templates)/%.otg : \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/templates/%.otg : \
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
mimetype $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
content.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
styles.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
META-INF/manifest.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
Thumbnails/thumbnail.png $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) )
$(call gb_Output_announce,templates/$*.otg,$(true),ZIP,2)
$(call gb_Trace_StartRange,templates/$*.otg,ZIP)
diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index 02b72b86f086..fd8053c42170 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -121,33 +121,33 @@ extras_PRESNT_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_PRESEN
# secondexpansion since the patterns not just cover a filename portion, but also include a
# directory portion withdifferent number of elements
# copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/% : $(SRCDIR)/extras/source/templates/presnt/% \
- | $$(dir $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*).dir
+$(gb_CustomTarget_workdir)/extras/source/templates/presnt/% : $(SRCDIR)/extras/source/templates/presnt/% \
+ | $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*).dir
$(call gb_Output_announce,templates/presnt/$*,$(true),CPY,1)
$(call gb_Trace_StartRange,templates/presnt/$*,CPY)
cp $< $@
$(call gb_Trace_EndRange,templates/presnt/$*,CPY)
# test and copy xml files
-$(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.xml : $(SRCDIR)/extras/source/templates/presnt/%.xml \
+$(gb_CustomTarget_workdir)/extras/source/templates/presnt/%.xml : $(SRCDIR)/extras/source/templates/presnt/%.xml \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
- $$(dir $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*.xml).dir
+ $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*.xml).dir
$(call gb_Output_announce,templates/presnt/$*.xml,$(true),XSL,1)
$(call gb_Trace_StartRange,templates/presnt/$*.xml,XSL)
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
$(call gb_Trace_EndRange,templates/presnt/$*.xml,XSL)
# zip files to OTP
-$(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.otp : \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/templates/presnt/%.otp : \
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
mimetype $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
content.xml $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
styles.xml $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
META-INF/manifest.xml $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
Thumbnails/thumbnail.png $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) )
$(call gb_Output_announce,templates/presnt/$*.otp,$(true),ZIP,2)
$(call gb_Trace_StartRange,templates/presnt/$*.otp,ZIP)
diff --git a/extras/CustomTarget_tplwizard.mk b/extras/CustomTarget_tplwizard.mk
index 617e56b007ad..3e54d0b5e99c 100644
--- a/extras/CustomTarget_tplwizard.mk
+++ b/extras/CustomTarget_tplwizard.mk
@@ -176,33 +176,33 @@ extras_WIZARD_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_WIZARD
# secondexpansion since the patterns not just cover a filename portion, but also include a
# directory portion with different number of elements
# copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/% : $(SRCDIR)/extras/source/templates/wizard/% \
- | $$(dir $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*).dir
+$(gb_CustomTarget_workdir)/extras/source/templates/wizard/% : $(SRCDIR)/extras/source/templates/wizard/% \
+ | $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*).dir
$(call gb_Output_announce,templates/wizard/$*,$(true),CPY,1)
$(call gb_Trace_StartRange,templates/wizard/$*,CPY)
cp $< $@
$(call gb_Trace_EndRange,templates/wizard/$*,CPY)
# test and copy xml files
-$(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/%.xml : $(SRCDIR)/extras/source/templates/wizard/%.xml \
+$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.xml : $(SRCDIR)/extras/source/templates/wizard/%.xml \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
- $$(dir $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*.xml).dir
+ $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*.xml).dir
$(call gb_Output_announce,templates/wizard/$*.xml,$(true),XSL,1)
$(call gb_Trace_StartRange,templates/wizard/$*.xml,XSL)
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
$(call gb_Trace_EndRange,templates/wizard/$*.xml,XSL)
# zip files to OTT
-$(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/%.ott : \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.ott : \
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
mimetype $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
content.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
settings.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
styles.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
META-INF/manifest.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) )
$(call gb_Output_announce,templates/wizard/$*.ott,$(true),ZIP,2)
$(call gb_Trace_StartRange,templates/wizard/$*.ott,ZIP)
@@ -216,16 +216,16 @@ $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/%.ott : \
$(call gb_Trace_EndRange,templates/wizard/$*.ott,ZIP)
# zip files to OTS
-$(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/%.ots : \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.ots : \
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
mimetype $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
content.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
settings.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
styles.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
- $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
META-INF/manifest.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) )
$(call gb_Output_announce,templates/wizard/$*.ots,$(true),ZIP,2)
$(call gb_Trace_StartRange,templates/wizard/$*.ots,ZIP)
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index b9a50b3ed230..db8b85c81309 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,extras_autocorr,$(call gb_CustomTarget_get_workdir,extras/source/autocorr)))
+$(eval $(call gb_Package_Package,extras_autocorr,$(gb_CustomTarget_workdir)/extras/source/autocorr))
$(eval $(call gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr,\
acor_af-ZA.dat \
diff --git a/extras/Package_autotextuser.mk b/extras/Package_autotextuser.mk
index bb398b335ed1..ba6c8a38ef2d 100644
--- a/extras/Package_autotextuser.mk
+++ b/extras/Package_autotextuser.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,extras_autotextuser,$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)))
+$(eval $(call gb_Package_Package,extras_autotextuser,$(gb_CustomTarget_workdir)/extras/source/autotext/user))
$(eval $(call gb_Package_add_files,extras_autotextuser,$(LIBO_SHARE_PRESETS_FOLDER)/autotext,\
mytexts.bau \
diff --git a/extras/Package_fonts.mk b/extras/Package_fonts.mk
index 8d2d23cbed6b..01ee89f429ec 100644
--- a/extras/Package_fonts.mk
+++ b/extras/Package_fonts.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,extras_fonts,$(call gb_CustomTarget_get_workdir,extras/fonts)))
+$(eval $(call gb_Package_Package,extras_fonts,$(gb_CustomTarget_workdir)/extras/fonts))
$(eval $(call gb_Package_use_customtarget,extras_fonts,extras/fonts))
diff --git a/extras/Package_gallsystemstr.mk b/extras/Package_gallsystemstr.mk
index bcae3f5aa8bc..a36c7ffadc39 100644
--- a/extras/Package_gallsystemstr.mk
+++ b/extras/Package_gallsystemstr.mk
@@ -8,7 +8,7 @@
#
# defining extra package for that is a little hacky - maybe use PackageSet instead?
-$(eval $(call gb_Package_Package,extras_gallsystemstr,$(call gb_CustomTarget_get_workdir,extras/gallsysstr)))
+$(eval $(call gb_Package_Package,extras_gallsystemstr,$(gb_CustomTarget_workdir)/extras/gallsysstr))
$(eval $(call gb_Package_use_customtarget,extras_gallsystemstr,extras/gallsysstr))
$(eval $(call gb_Package_add_files,extras_gallsystemstr,$(LIBO_SHARE_FOLDER)/gallery,\
diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk
index 1590550f3270..f58af81e902e 100644
--- a/extras/Package_glade.mk
+++ b/extras/Package_glade.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,extras_glade,$(call gb_CustomTarget_get_workdir,extras/source/glade)))
+$(eval $(call gb_Package_Package,extras_glade,$(gb_CustomTarget_workdir)/extras/source/glade))
$(eval $(call gb_Package_add_file,extras_glade,$(LIBO_SHARE_FOLDER)/glade/libreoffice-catalog.xml,libreoffice-catalog.xml))
diff --git a/extras/Package_resource_fonts.mk b/extras/Package_resource_fonts.mk
index e90e46dfddd4..15c0e897808d 100644
--- a/extras/Package_resource_fonts.mk
+++ b/extras/Package_resource_fonts.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,resource_fonts,$(call gb_CustomTarget_get_workdir,extras/fonts)))
+$(eval $(call gb_Package_Package,resource_fonts,$(gb_CustomTarget_workdir)/extras/fonts))
$(eval $(call gb_Package_use_customtarget,resource_fonts,extras/fonts))
diff --git a/extras/Package_templates.mk b/extras/Package_templates.mk
index 4ffdaa950d6a..fd637cd7578e 100644
--- a/extras/Package_templates.mk
+++ b/extras/Package_templates.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,extras_templates,$(call gb_CustomTarget_get_workdir,extras/source/templates)))
+$(eval $(call gb_Package_Package,extras_templates,$(gb_CustomTarget_workdir)/extras/source/templates))
$(eval $(call gb_Package_add_files_with_dir,extras_templates,$(LIBO_SHARE_FOLDER)/template/common,\
officorr/Modern_business_letter_sans_serif.ott \
diff --git a/extras/Package_tplpresnt.mk b/extras/Package_tplpresnt.mk
index 34f20f61fcf5..cb3cf2562245 100644
--- a/extras/Package_tplpresnt.mk
+++ b/extras/Package_tplpresnt.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,extras_tplpresnt,$(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)))
+$(eval $(call gb_Package_Package,extras_tplpresnt,$(gb_CustomTarget_workdir)/extras/source/templates/presnt))
$(eval $(call gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt,\
Candy.otp \
diff --git a/extras/Package_tplwizard.mk b/extras/Package_tplwizard.mk
index 432e6a91bb3c..61bf401f75d7 100644
--- a/extras/Package_tplwizard.mk
+++ b/extras/Package_tplwizard.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,extras_tplwizard,$(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)))
+$(eval $(call gb_Package_Package,extras_tplwizard,$(gb_CustomTarget_workdir)/extras/source/templates/wizard))
$(eval $(call gb_Package_add_files_with_dir,extras_tplwizard,$(LIBO_SHARE_FOLDER)/template/common/wizard,\
agenda/10grey.ott \
diff --git a/filter/CustomTarget_svg.mk b/filter/CustomTarget_svg.mk
index 7eb0d6178d52..cdc48cc21219 100644
--- a/filter/CustomTarget_svg.mk
+++ b/filter/CustomTarget_svg.mk
@@ -11,7 +11,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,filter/source/svg))
filter_SVGSRC := $(SRCDIR)/filter/source/svg
-filter_SVGWORK := $(call gb_CustomTarget_get_workdir,filter/source/svg)
+filter_SVGWORK := $(gb_CustomTarget_workdir)/filter/source/svg
filter_SRC_svg_Tokens := $(filter_SVGSRC)/tokens.txt
filter_SRC_svg_GenToken := $(filter_SVGSRC)/gentoken.py
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index 80ad2d99bd7b..177966f7952d 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator))
-i18npool_BIDIR := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator)
+i18npool_BIDIR := $(gb_CustomTarget_workdir)/i18npool/breakiterator
$(call gb_CustomTarget_get_target,i18npool/breakiterator) : \
$(i18npool_BIDIR)/OpenOffice_dat.c
diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk
index 6f8f91f1f6f0..0364d9291498 100644
--- a/i18npool/CustomTarget_collator.mk
+++ b/i18npool/CustomTarget_collator.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,i18npool/collator))
-i18npool_CODIR := $(call gb_CustomTarget_get_workdir,i18npool/collator)
+i18npool_CODIR := $(gb_CustomTarget_workdir)/i18npool/collator
i18npool_COTXTS := \
cu_charset.txt \
$(call gb_Helper_optional_locale,ca, \
diff --git a/i18npool/CustomTarget_indexentry.mk b/i18npool/CustomTarget_indexentry.mk
index 3a784a6f5e6d..e6c0785c44fd 100644
--- a/i18npool/CustomTarget_indexentry.mk
+++ b/i18npool/CustomTarget_indexentry.mk
@@ -22,12 +22,12 @@ i18npool_IDXTXTS := \
zh_zhuyin.txt
$(call gb_CustomTarget_get_target,i18npool/indexentry) : $(SRCDIR)/i18npool/CustomTarget_indexentry.mk \
- $(patsubst %.txt,$(call gb_CustomTarget_get_workdir,i18npool/indexentry)/%.cxx,$(i18npool_IDXTXTS))
+ $(patsubst %.txt,$(gb_CustomTarget_workdir)/i18npool/indexentry/%.cxx,$(i18npool_IDXTXTS))
-$(call gb_CustomTarget_get_workdir,i18npool/indexentry)/%.cxx : \
+$(gb_CustomTarget_workdir)/i18npool/indexentry/%.cxx : \
$(SRCDIR)/i18npool/source/indexentry/data/%.txt \
$(call gb_Executable_get_runtime_dependencies,genindex_data) \
- | $(call gb_CustomTarget_get_workdir,i18npool/indexentry)/.dir
+ | $(gb_CustomTarget_workdir)/i18npool/indexentry/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IND,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),IND)
$(call gb_Helper_abbreviate_dirs, \
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk
index 47eed3a6c197..5a6b677c8099 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_CustomTarget_register_targets,i18npool/localedata,\
$(foreach name,$(i18npool_LD_NAMES),localedata_$(name).cxx) \
))
-$(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_%_new.cxx : \
+$(gb_CustomTarget_workdir)/i18npool/localedata/localedata_%_new.cxx : \
$(SRCDIR)/i18npool/source/localedata/data/%.xml \
$(call gb_Executable_get_runtime_dependencies,saxparser)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
@@ -27,9 +27,9 @@ $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_%_new.cxx : \
-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,saxparser))))
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SAX)
-.PRECIOUS: $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_%_new.cxx
-$(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_%.cxx : \
- $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_%_new.cxx
+.PRECIOUS: $(gb_CustomTarget_workdir)/i18npool/localedata/localedata_%_new.cxx
+$(gb_CustomTarget_workdir)/i18npool/localedata/localedata_%.cxx : \
+ $(gb_CustomTarget_workdir)/i18npool/localedata/localedata_%_new.cxx
$(call gb_Helper_copy_if_different_and_touch,$<,$@)
# vim: set noet sw=4 ts=4:
diff --git a/i18npool/CustomTarget_textconversion.mk b/i18npool/CustomTarget_textconversion.mk
index d6669b06ce25..7bd13171035f 100644
--- a/i18npool/CustomTarget_textconversion.mk
+++ b/i18npool/CustomTarget_textconversion.mk
@@ -10,13 +10,13 @@
$(eval $(call gb_CustomTarget_CustomTarget,i18npool/textconversion))
$(call gb_CustomTarget_get_target,i18npool/textconversion) : \
- $(patsubst %.dic,$(call gb_CustomTarget_get_workdir,i18npool/textconversion)/%.cxx,$(notdir \
+ $(patsubst %.dic,$(gb_CustomTarget_workdir)/i18npool/textconversion/%.cxx,$(notdir \
$(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic)))
-$(call gb_CustomTarget_get_workdir,i18npool/textconversion)/%.cxx : \
+$(gb_CustomTarget_workdir)/i18npool/textconversion/%.cxx : \
$(SRCDIR)/i18npool/source/textconversion/data/%.dic \
$(call gb_Executable_get_runtime_dependencies,genconv_dict) \
- | $(call gb_CustomTarget_get_workdir,i18npool/textconversion)/.dir
+ | $(gb_CustomTarget_workdir)/i18npool/textconversion/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CDC,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CDC)
$(call gb_Helper_abbreviate_dirs, \
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 4d5c7a534ff0..0b72164bbf96 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -127,7 +127,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,i18npool,\
))
ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(call gb_CxxObject_get_target,i18npool/source/localedata/localedata): $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_static.hxx
+$(call gb_CxxObject_get_target,i18npool/source/localedata/localedata): $(gb_CustomTarget_workdir)/i18npool/localedata/localedata_static.hxx
ifeq ($(WITH_LOCALES),)
i18npool_locale_pattern=%
@@ -135,19 +135,19 @@ else
i18npool_locale_pattern=$(WITH_LOCALES) $(addsuffix _%,$(WITH_LOCALES))
endif
-$(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_static.hxx : $(SRCDIR)/i18npool/source/localedata/genstaticheader.pl
- mkdir -p $(call gb_CustomTarget_get_workdir,i18npool/localedata) && $(PERL) $(SRCDIR)/i18npool/source/localedata/genstaticheader.pl $(filter $(i18npool_locale_pattern),$(patsubst $(SRCDIR)/i18npool/source/localedata/data/%.xml,%,$(shell echo $(SRCDIR)/i18npool/source/localedata/data/*.xml))) >$@
+$(gb_CustomTarget_workdir)/i18npool/localedata/localedata_static.hxx : $(SRCDIR)/i18npool/source/localedata/genstaticheader.pl
+ mkdir -p $(gb_CustomTarget_workdir)/i18npool/localedata && $(PERL) $(SRCDIR)/i18npool/source/localedata/genstaticheader.pl $(filter $(i18npool_locale_pattern),$(patsubst $(SRCDIR)/i18npool/source/localedata/data/%.xml,%,$(shell echo $(SRCDIR)/i18npool/source/localedata/data/*.xml))) >$@
$(call gb_CxxObject_get_target,i18npool/source/localedata/localedata) : \
- INCLUDE += -I$(call gb_CustomTarget_get_workdir,i18npool/localedata)
+ INCLUDE += -I$(gb_CustomTarget_workdir)/i18npool/localedata
endif # DISABLE_DYNLOADING
# collator_unicode.cxx includes generated lrl_include.hxx
$(call gb_CxxObject_get_target,i18npool/source/collator/collator_unicode) : \
- INCLUDE += -I$(call gb_CustomTarget_get_workdir,i18npool/collator)
+ INCLUDE += -I$(gb_CustomTarget_workdir)/i18npool/collator
$(call gb_CxxObject_get_target,i18npool/source/collator/collator_unicode) :| \
- $(call gb_CustomTarget_get_workdir,i18npool/collator)/lrl_include.hxx
+ $(gb_CustomTarget_workdir)/i18npool/collator/lrl_include.hxx
$(eval $(call gb_Library_add_generated_cobjects,i18npool,\
CustomTarget/i18npool/breakiterator/OpenOffice_dat \
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index d3a6ad3a96a9..5c2bfd4ce462 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -27,17 +27,17 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\
$(foreach ulf,$(instsetoo_ULFLIST),win_ulffiles/$(ulf).ulf) \
))
-.PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony
+.PHONY: $(gb_CustomTarget_workdir)/instsetoo_native/install/install.phony
-$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%.sh: $(SRCDIR)/instsetoo_native/inc_openoffice/unix/find-requires-%.sh
+$(gb_CustomTarget_workdir)/instsetoo_native/install/bin/find-requires-%.sh: $(SRCDIR)/instsetoo_native/inc_openoffice/unix/find-requires-%.sh
cat $< | tr -d "\015" > $@
chmod a+x $@
-$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \
+$(gb_CustomTarget_workdir)/instsetoo_native/install/win_ulffiles/%.ulf: \
| $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(eval $(call gb_CustomTarget_ulfex_rule,\
- $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf,\
+ $(gb_CustomTarget_workdir)/instsetoo_native/install/win_ulffiles/%.ulf,\
$(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf,\
$(foreach lang,$(gb_TRANS_LANGS),\
$(gb_POLOCATION)/$(lang)/instsetoo_native/inc_openoffice/windows/msi_languages.po)))
@@ -83,15 +83,15 @@ instsetoo_wipe:
# list both as prerequisites so that make won't treat the $(template) one as intermediate /
# won't attempt to delete it after the $(template)/Binary and the rest of the chain was made
instsetoo_msi_templates: $(foreach template,openoffice ooohelppack sdkoo,$(addprefix \
- $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_templates/,$(template) $(template)/Binary))
+ $(gb_CustomTarget_workdir)/instsetoo_native/install/msi_templates/,$(template) $(template)/Binary))
# use awk instead of grep to not have to deal with grep exiting with error on files with no comments
-$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_templates/%: $(SRCDIR)/instsetoo_native/inc_%/windows/msi_templates/*.*
+$(gb_CustomTarget_workdir)/instsetoo_native/install/msi_templates/%: $(SRCDIR)/instsetoo_native/inc_%/windows/msi_templates/*.*
$(call gb_Output_announce,setting up msi templates for type $(@F),$(true),AWK,4)
rm -rf $@ && mkdir -p $@ && cd $@ $(foreach file,$(^F),&& awk '!/^#/{print}' $(<D)/$(file) > $(file))
-$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_templates/%/Binary: $(SRCDIR)/instsetoo_native/inc_common/windows/msi_templates/Binary/*.* \
- $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_templates/%
+$(gb_CustomTarget_workdir)/instsetoo_native/install/msi_templates/%/Binary: $(SRCDIR)/instsetoo_native/inc_common/windows/msi_templates/Binary/*.* \
+ $(gb_CustomTarget_workdir)/instsetoo_native/install/msi_templates/%
$(call gb_Output_announce,setting up msi templates for type $* - copying binary assets,$(true),CPY,4)
rm -rf $@ && mkdir -p $@ && cd $@ && cp $(SRCDIR)/instsetoo_native/inc_common/windows/msi_templates/Binary/*.* ./
@@ -109,9 +109,9 @@ $(gb_Make_JobLimiter): $(SRCDIR)/solenv/bin/job-limiter.cpp
# even with the reduced parallelism (the higher the parallelism, the higher the chance for random
# failures during the cscript call to WiLangId.vbs)
$(instsetoo_installer_targets): $(SRCDIR)/solenv/bin/make_installer.pl \
- $(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
+ $(foreach ulf,$(instsetoo_ULFLIST),$(gb_CustomTarget_workdir)/instsetoo_native/install/win_ulffiles/$(ulf).ulf) \
$(if $(filter-out WNT,$(OS)),\
- $(addprefix $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/,\
+ $(addprefix $(gb_CustomTarget_workdir)/instsetoo_native/install/,\
bin/find-requires-gnome.sh \
bin/find-requires-x11.sh) \
,instsetoo_msi_templates) \
@@ -123,11 +123,11 @@ $(instsetoo_installer_targets): $(SRCDIR)/solenv/bin/make_installer.pl \
$(call gb_Helper_print_on_error, \
$(if $(MSYSTEM),export PERLIO=:unix PERL=$(STRAWBERRY_PERL) &&) \
$(SRCDIR)/solenv/bin/call_installer.sh $(if $(verbose),-verbose,-quiet) $(subst ‧,:,$@),\
- $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/$(if $(filter en-US$(COMMA)%,$(instsetoo_installer_langs)),$(subst $(instsetoo_installer_langs),multilang,$@),$@).log)
+ $(gb_CustomTarget_workdir)/instsetoo_native/install/$(if $(filter en-US$(COMMA)%,$(instsetoo_installer_langs)),$(subst $(instsetoo_installer_langs),multilang,$@),$@).log)
$(if $(filter %msi‧nostrip,$@),$(gb_Make_JobLimiter) release)
$(call gb_Trace_EndRange,$@,INSTALLER)
-$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: $(instsetoo_installer_targets)
+$(gb_CustomTarget_workdir)/instsetoo_native/install/install.phony: $(instsetoo_installer_targets)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
$(if $(ENABLE_WIX),$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/msicreator/create_installer.py $(BUILDDIR) $(SRCDIR) $(LIBO_VERSION) $(PRODUCTNAME_WITHOUT_SPACES))
@@ -148,21 +148,21 @@ endif # LIBO_TEST_INSTALL
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
TIMESTAMPURL ?= "http://timestamp.globalsign.com/scripts/timestamp.dll"
-$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_signing.done: \
- $(if $(filter HELP,$(BUILD_TYPE)),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signing.done) \
- $(if $(filter ODK,$(BUILD_TYPE)),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.done) \
- $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.done
+$(gb_CustomTarget_workdir)/instsetoo_native/install/msi_signing.done: \
+ $(if $(filter HELP,$(BUILD_TYPE)),$(gb_CustomTarget_workdir)/instsetoo_native/install/msi_helppack_signing.done) \
+ $(if $(filter ODK,$(BUILD_TYPE)),$(gb_CustomTarget_workdir)/instsetoo_native/install/msi_sdk_signing.done) \
+ $(gb_CustomTarget_workdir)/instsetoo_native/install/msi_main_signing.done
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
touch $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
-$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signing.done \
-$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.done \
-$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.done \
- : $(SRCDIR)/postprocess/signing/signing.pl $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony
+$(gb_CustomTarget_workdir)/instsetoo_native/install/msi_helppack_signing.done \
+$(gb_CustomTarget_workdir)/instsetoo_native/install/msi_sdk_signing.done \
+$(gb_CustomTarget_workdir)/instsetoo_native/install/msi_main_signing.done \
+ : $(SRCDIR)/postprocess/signing/signing.pl $(gb_CustomTarget_workdir)/instsetoo_native/install/install.phony
-$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.done:
+$(gb_CustomTarget_workdir)/instsetoo_native/install/msi_main_signing.done:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
$(PERL) $(SRCDIR)/postprocess/signing/signing.pl \
@@ -176,7 +176,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.do
&& touch $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
-$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signing.done:
+$(gb_CustomTarget_workdir)/instsetoo_native/install/msi_helppack_signing.done:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
$(PERL) $(SRCDIR)/postprocess/signing/signing.pl \
@@ -190,7 +190,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signin
&& touch $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
-$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.done:
+$(gb_CustomTarget_workdir)/instsetoo_native/install/msi_sdk_signing.done:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
$(PERL) $(SRCDIR)/postprocess/signing/signing.pl \
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 48efab143c82..b78899a2c10b 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -22,18 +22,18 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(call gb_Helper_get_rcfile,crashreport) \
))
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,bootstrap) \
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) \
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,louno) \
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,redirect) \
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,setup) \
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,soffice) \
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) \
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version) \
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,crashreport) \
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,bootstrap) \
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,fundamental) \
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,louno) \
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,redirect) \
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,setup) \
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,soffice) \
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,uno) \
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,version) \
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,crashreport) \
: $(SRCDIR)/instsetoo_native/CustomTarget_setup.mk
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,bootstrap) :
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,bootstrap) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
( \
@@ -46,7 +46,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
) > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH)
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) :
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,fundamental) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
( \
@@ -83,7 +83,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
) > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH)
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,louno) :
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,louno) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
( \
@@ -103,7 +103,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
) > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH)
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,redirect) :
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,redirect) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
( \
@@ -112,8 +112,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
) > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH)
-.PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,setup)
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,setup) :
+.PHONY: $(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,setup)
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,setup) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
( \
@@ -133,7 +133,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
# 2 : everything in the user config directory
# SecureUserConfigExtensions: boolean - defines to also safe the extension configuration (which extensions
# are installed, which are activated) - default is true
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,soffice) :
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,soffice) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
( \
@@ -160,7 +160,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
) > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH)
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) :
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,uno) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
( \
@@ -192,8 +192,8 @@ endef
-.PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version)
-$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version) :
+.PHONY: $(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,version)
+$(gb_CustomTarget_workdir)/instsetoo_native/setup/$(call gb_Helper_get_rcfile,version) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
$(file > $@,$(call instsetoo_native_genversionini))
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index 5b1e42794532..8a37fd041134 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)))
+$(eval $(call gb_Package_Package,instsetoo_native_setup,$(gb_CustomTarget_workdir)/instsetoo_native/setup))
$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
$(call gb_Helper_get_rcfile,bootstrap) \
diff --git a/instsetoo_native/Package_setup_ure.mk b/instsetoo_native/Package_setup_ure.mk
index a0c7216fc1d0..8e080e58dfd5 100644
--- a/instsetoo_native/Package_setup_ure.mk
+++ b/instsetoo_native/Package_setup_ure.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,instsetoo_native_setup_ure,$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)))
+$(eval $(call gb_Package_Package,instsetoo_native_setup_ure,$(gb_CustomTarget_workdir)/instsetoo_native/setup))
$(eval $(call gb_Package_add_files,instsetoo_native_setup_ure,$(LIBO_URE_ETC_FOLDER), \
$(call gb_Helper_get_rcfile,uno) \
diff --git a/jvmfwk/CustomTarget_jreproperties.mk b/jvmfwk/CustomTarget_jreproperties.mk
index 0d6399a19369..3d3ea75e419a 100644
--- a/jvmfwk/CustomTarget_jreproperties.mk
+++ b/jvmfwk/CustomTarget_jreproperties.mk
@@ -9,11 +9,11 @@
$(eval $(call gb_CustomTarget_CustomTarget,jvmfwk/jreproperties))
-$(call gb_CustomTarget_get_target,jvmfwk/jreproperties) : $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)/JREProperties.class
+$(call gb_CustomTarget_get_target,jvmfwk/jreproperties) : $(gb_CustomTarget_workdir)/jvmfwk/jreproperties/JREProperties.class
-$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)/JREProperties.class : \
+$(gb_CustomTarget_workdir)/jvmfwk/jreproperties/JREProperties.class : \
$(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \
- | $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)/.dir
+ | $(gb_CustomTarget_workdir)/jvmfwk/jreproperties/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JCS,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JCS)
$(call gb_Helper_abbreviate_dirs, \
diff --git a/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk b/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk
index bd9621fd27e0..9444051e4989 100644
--- a/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk
+++ b/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_CustomTarget_register_targets,jvmfwk/jvmfwk3_ini, \
$(call gb_Helper_get_rcfile,jvmfwk3) \
))
-$(call gb_CustomTarget_get_workdir,jvmfwk/jvmfwk3_ini)/$(call gb_Helper_get_rcfile,jvmfwk3): \
+$(gb_CustomTarget_workdir)/jvmfwk/jvmfwk3_ini/$(call gb_Helper_get_rcfile,jvmfwk3): \
$(SRCDIR)/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk
index cd12402c6045..f149f8fb39f4 100644
--- a/jvmfwk/Package_jreproperties.mk
+++ b/jvmfwk/Package_jreproperties.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)))
+$(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(gb_CustomTarget_workdir)/jvmfwk/jreproperties))
$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,$(if $(filter MACOSX,$(OS)),$(LIBO_URE_SHARE_JAVA_FOLDER),$(LIBO_URE_LIB_FOLDER))/JREProperties.class,JREProperties.class))
diff --git a/jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk b/jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk
index 51a933cea172..7d600070c59e 100644
--- a/jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk
+++ b/jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,jvmfwk_jvmfwk3_ini,$(call gb_CustomTarget_get_workdir,jvmfwk/jvmfwk3_ini)))
+$(eval $(call gb_Package_Package,jvmfwk_jvmfwk3_ini,$(gb_CustomTarget_workdir)/jvmfwk/jvmfwk3_ini))
$(eval $(call gb_Package_add_files,jvmfwk_jvmfwk3_ini,$(LIBO_URE_ETC_FOLDER), \
$(call gb_Helper_get_rcfile,jvmfwk3) \
diff --git a/librelogo/CustomTarget_librelogo.mk b/librelogo/CustomTarget_librelogo.mk
index 461743b25d39..5aa2c3420f96 100644
--- a/librelogo/CustomTarget_librelogo.mk
+++ b/librelogo/CustomTarget_librelogo.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,librelogo/locproperties))
-librelogo_DIR := $(call gb_CustomTarget_get_workdir,librelogo/locproperties)
+librelogo_DIR := $(gb_CustomTarget_workdir)/librelogo/locproperties
define librelogo_Properties_Properties
$(call librelogo_Properties__Properties_impl,$(librelogo_DIR)/LibreLogo_$(1).properties,$(SRCDIR)/librelogo/source/pythonpath/LibreLogo_en_US.properties,$(gb_POLOCATION)/$(2)/librelogo/source/pythonpath.po,$(2))
diff --git a/librelogo/Package_librelogo_properties.mk b/librelogo/Package_librelogo_properties.mk
index a8a2b5fd8fe3..86b95326147a 100644
--- a/librelogo/Package_librelogo_properties.mk
+++ b/librelogo/Package_librelogo_properties.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,librelogo_properties,$(call gb_CustomTarget_get_workdir,librelogo/locproperties)))
+$(eval $(call gb_Package_Package,librelogo_properties,$(gb_CustomTarget_workdir)/librelogo/locproperties))
$(eval $(call gb_Package_add_files,librelogo_properties,$(LIBO_SHARE_FOLDER)/Scripts/python/LibreLogo,\
$(foreach lang,$(subst -,_,$(librelogo_LANGS)),LibreLogo_$(lang).properties) \
diff --git a/odk/CustomTarget_allheaders.mk b/odk/CustomTarget_allheaders.mk
index eb75ec7321bb..55961b64306b 100644
--- a/odk/CustomTarget_allheaders.mk
+++ b/odk/CustomTarget_allheaders.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,odk/allheaders))
-odk_allheaders_DIR := $(call gb_CustomTarget_get_workdir,odk/allheaders)
+odk_allheaders_DIR := $(gb_CustomTarget_workdir)/odk/allheaders
$(call gb_CustomTarget_get_target,odk/allheaders) : \
$(odk_allheaders_DIR)/allheaders.hxx
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0095619d50e..7354219968c4 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -23,8 +23,8 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),windows,\
$(if $(filter DRAGONFLY,$(OS)),dragonfly,\
$(if $(filter MACOSX,$(OS)),macosx)))))))
-.PHONY: $(call gb_CustomTarget_get_workdir,odk/check)/checkbin
-$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
+.PHONY: $(gb_CustomTarget_workdir)/odk/check/checkbin
+$(gb_CustomTarget_workdir)/odk/check/checkbin : \
$(SRCDIR)/odk/util/check.pl \
$(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_doxygen)) \
$(foreach exe,$(if $(filter WNT,$(OS)),$(if $(filter-out AARCH64_TRUE,$(CPUNAME)_$(CROSS_COMPILING)),climaker)) cppumaker \
diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk
index 68666b4cd651..5b476870d75a 100644
--- a/odk/CustomTarget_classes.mk
+++ b/odk/CustomTarget_classes.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\
odk/source/com/sun/star/lib/loader/WinRegKeyException \
))
-$(call gb_CustomTarget_get_workdir,odk/classes)/java.done: $(call gb_JavaClassSet_get_target,loader)
+$(gb_CustomTarget_workdir)/odk/classes/java.done: $(call gb_JavaClassSet_get_target,loader)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) && \
touch $@
diff --git a/odk/CustomTarget_config_win.mk b/odk/CustomTarget_config_win.mk
index 2a9fc1f2e80d..3aabc8db0359 100644
--- a/odk/CustomTarget_config_win.mk
+++ b/odk/CustomTarget_config_win.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_CustomTarget_register_targets,odk/config,\
setsdkenv_windows.bat \
))
-$(call gb_CustomTarget_get_workdir,odk/config)/setsdkenv_windows.bat : $(SRCDIR)/odk/config/setsdkenv_windows.bat
+$(gb_CustomTarget_workdir)/odk/config/setsdkenv_windows.bat : $(SRCDIR)/odk/config/setsdkenv_windows.bat
sed $< -e 's#__SDKNAME__#libreoffice$(PRODUCTVERSION)_sdk#' > $@
# vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index cc848699d73b..42132387457b 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -28,14 +28,14 @@ odk_cpp_PREFIX := $(call odk_cygwin_path,$(INSTDIR)/$(SDKDIRNAME)/include/)
odk_cpp_DOXY_INPUT := $(call odk_cygwin_path,$(SRCDIR)/odk/docs/cpp/main.dox \
$(SRCDIR)/include/sal/log-areas.dox \
$(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST) $(odk_cpp_INCFILELIST)))
-odk_cpp_DOXY_WORKDIR := $(call odk_cygwin_path,$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref)
+odk_cpp_DOXY_WORKDIR := $(call odk_cygwin_path,$(gb_CustomTarget_workdir)/odk/docs/cpp/ref)
$(eval $(call gb_CustomTarget_register_targets,odk/docs,\
cpp/Doxyfile \
cpp/doxygen.log \
))
-$(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile : \
+$(gb_CustomTarget_workdir)/odk/docs/cpp/Doxyfile : \
$(SRCDIR)/odk/docs/cpp/Doxyfile \
$(gb_Module_CURRENTMAKEFILE)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
@@ -49,8 +49,8 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile : \
$< > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED)
-$(call gb_CustomTarget_get_workdir,odk/docs)/cpp/doxygen.log : \
- $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile \
+$(gb_CustomTarget_workdir)/odk/docs/cpp/doxygen.log : \
+ $(gb_CustomTarget_workdir)/odk/docs/cpp/Doxyfile \
$(SRCDIR)/include/sal/log-areas.dox \
$(SRCDIR)/odk/docs/cpp/main.dox \
$(call gb_Package_get_target,odk_headers) \
@@ -72,11 +72,11 @@ odk_idl_DOXY_INPUT := $(call odk_cygwin_path,$(SRCDIR)/odk/docs/idl/main.dox \
$(addsuffix com,$(odk_idl_PREFIX)) \
$(addsuffix org,$(odk_idl_PREFIX)) \
$(SRCDIR)/odk/docs/idl/generated_idl_chapter_refs.idl)
-odk_idl_DOXY_WORKDIR := $(call odk_cygwin_path,$(call gb_CustomTarget_get_workdir,odk/docs/idl)/ref)
+odk_idl_DOXY_WORKDIR := $(call odk_cygwin_path,$(gb_CustomTarget_workdir)/odk/docs/idl/ref)
# don't depend on the IDL files directly but instead on the udkapi/offapi
# which will get rebuilt when any IDL file changes
-$(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile : \
+$(gb_CustomTarget_workdir)/odk/docs/idl/Doxyfile : \
$(SRCDIR)/odk/docs/idl/Doxyfile \
$(call gb_UnoApi_get_target,udkapi) \
$(call gb_UnoApi_get_target,offapi) \
@@ -93,8 +93,8 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile : \
$< > $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED)
-$(call gb_CustomTarget_get_workdir,odk/docs)/idl/doxygen.log : \
- $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile \
+$(gb_CustomTarget_workdir)/odk/docs/idl/doxygen.log : \
+ $(gb_CustomTarget_workdir)/odk/docs/idl/Doxyfile \
$(SRCDIR)/odk/docs/idl/main.dox
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),GEN)
diff --git a/odk/CustomTarget_html.mk b/odk/CustomTarget_html.mk
index 750b7777bef0..92367bb8b69b 100644
--- a/odk/CustomTarget_html.mk
+++ b/odk/CustomTarget_html.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_CustomTarget_register_targets,odk/html,\
index.html \
))
-$(call gb_CustomTarget_get_workdir,odk/html)/%.html : $(SRCDIR)/odk/%.html
+$(gb_CustomTarget_workdir)/odk/html/%.html : $(SRCDIR)/odk/%.html
$(call gb_Output_announce,$*.html,$(true),SED,1)
$(call gb_Trace_StartRange,$*.html,SED)
sed -e 's|%PRODUCT_RELEASE%|$(PRODUCTVERSION)|g' \
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index acb205610d5c..c23e3f00c293 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -19,16 +19,16 @@ $(eval $(call gb_CustomTarget_register_targets,odk/docs/java/ref,\
javadoc_log.txt \
))
-$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/package-list : $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt
+$(gb_CustomTarget_workdir)/odk/docs/java/ref/package-list : $(gb_CustomTarget_workdir)/odk/docs/java/ref/javadoc_log.txt
touch $@
-$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.css \
-$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.gif \
-$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.html : \
- $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt
+$(gb_CustomTarget_workdir)/odk/docs/java/ref/%.css \
+$(gb_CustomTarget_workdir)/odk/docs/java/ref/%.gif \
+$(gb_CustomTarget_workdir)/odk/docs/java/ref/%.html : \
+ $(gb_CustomTarget_workdir)/odk/docs/java/ref/javadoc_log.txt
touch $@
-$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \
+$(gb_CustomTarget_workdir)/odk/docs/java/ref/javadoc_log.txt : \
$(call gb_Jar_get_target,libreoffice)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JDC)
diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk
index c48a734623c9..72bacac52a50 100644
--- a/odk/CustomTarget_settings.mk
+++ b/odk/CustomTarget_settings.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/settings))
$(eval $(call gb_CustomTarget_register_target,odk/settings,dk.mk))
-$(call gb_CustomTarget_get_workdir,odk/settings)/dk.mk : $(SRCDIR)/odk/settings/dk.mk
+$(gb_CustomTarget_workdir)/odk/settings/dk.mk : $(SRCDIR)/odk/settings/dk.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1)
tr -d "\015" < $< | sed \
-e 's/@@PLATFORM@@/$(firstword $(subst _, ,$(PLATFORMID)))/' \
diff --git a/odk/GeneratedPackage_odk_doxygen.mk b/odk/GeneratedPackage_odk_doxygen.mk
index 869ac7fb9a97..1e2ebc9c2312 100644
--- a/odk/GeneratedPackage_odk_doxygen.mk
+++ b/odk/GeneratedPackage_odk_doxygen.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_doxygen,$(call gb_CustomTarget_get_workdir,odk/docs)))
+$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_doxygen,$(gb_CustomTarget_workdir)/odk/docs))
$(eval $(call gb_GeneratedPackage_use_customtarget,odk_doxygen,odk/docs))
diff --git a/odk/GeneratedPackage_odk_javadoc.mk b/odk/GeneratedPackage_odk_javadoc.mk
index 569377b426f5..87a9b66dbfed 100644
--- a/odk/GeneratedPackage_odk_javadoc.mk
+++ b/odk/GeneratedPackage_odk_javadoc.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_javadoc,$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)))
+$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_javadoc,$(gb_CustomTarget_workdir)/odk/docs/java/ref))
$(eval $(call gb_GeneratedPackage_add_dir,odk_javadoc,$(INSTDIR)/$(SDKDIRNAME)/docs/java/ref,.))
diff --git a/odk/GeneratedPackage_uno_loader_classes.mk b/odk/GeneratedPackage_uno_loader_classes.mk
index 42b5f5c31de0..bec7f305ef3c 100644
--- a/odk/GeneratedPackage_uno_loader_classes.mk
+++ b/odk/GeneratedPackage_uno_loader_classes.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_uno_loader_classes,$(call gb_CustomTarget_get_workdir,odk/classes)))
+$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_uno_loader_classes,$(gb_CustomTarget_workdir)/odk/classes))
$(eval $(call gb_GeneratedPackage_use_customtarget,odk_uno_loader_classes,odk/classes))
diff --git a/odk/Package_config_win.mk b/odk/Package_config_win.mk
index 8c7a007fdce5..d08b62d41203 100644
--- a/odk/Package_config_win.mk
+++ b/odk/Package_config_win.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,odk_config_win,$(call gb_CustomTarget_get_workdir,odk/config)))
+$(eval $(call gb_Package_Package,odk_config_win,$(gb_CustomTarget_workdir)/odk/config))
$(eval $(call gb_Package_set_outdir,odk_config_win,$(INSTDIR)))
diff --git a/odk/Package_html.mk b/odk/Package_html.mk
index fdac50654e44..a1a4cbbc5192 100644
--- a/odk/Package_html.mk
+++ b/odk/Package_html.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,odk_html,$(call gb_CustomTarget_get_workdir,odk/html)))
+$(eval $(call gb_Package_Package,odk_html,$(gb_CustomTarget_workdir)/odk/html))
$(eval $(call gb_Package_set_outdir,odk_html,$(INSTDIR)))
diff --git a/odk/Package_settings_generated.mk b/odk/Package_settings_generated.mk
index 6264a564b4ab..1eca48b590d7 100644
--- a/odk/Package_settings_generated.mk
+++ b/odk/Package_settings_generated.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,odk_settings_generated,$(call gb_CustomTarget_get_workdir,odk/settings)))
+$(eval $(call gb_Package_Package,odk_settings_generated,$(gb_CustomTarget_workdir)/odk/settings))
$(eval $(call gb_Package_set_outdir,odk_settings_generated,$(INSTDIR)))
diff --git a/odk/Package_share_readme.mk b/odk/Package_share_readme.mk
index bb97b83964c3..7af8cc9200f7 100644
--- a/odk/Package_share_readme.mk
+++ b/odk/Package_share_readme.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/license)
+readlicense_oo_DIR := $(gb_CustomTarget_workdir)/readlicense_oo/license
$(eval $(call gb_Package_Package,odk_share_readme,$(readlicense_oo_DIR)))
$(eval $(call gb_Package_set_outdir,odk_share_readme,$(INSTDIR)))
diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk
index b87958e9761c..546ef5e4bd46 100644
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -29,12 +29,12 @@ define odk_build-examples_test
$(eval $(call gb_CustomTarget_CustomTarget,$(1)))
$(call gb_CustomTarget_get_target,$(1)): \
- $(call gb_CustomTarget_get_workdir,$(1))/setsdkenv
+ $(gb_CustomTarget_workdir)/$(1)/setsdkenv
ifneq ($(gb_SUPPRESS_TESTS),)
@true
else
$$(call gb_Output_announce,$(subst $(WORKDIR)/,,$(1)),$(true),CHK,1)
- rm -fr $(call gb_CustomTarget_get_workdir,$(1))/{out,user}
+ rm -fr $(gb_CustomTarget_workdir)/$(1)/{out,user}
$(if $(MACOSX_SHELL_HACK), \
ODK_BUILD_SHELL=$$$$($(gb_MKTEMP)) && \
cp /bin/sh "$$$$ODK_BUILD_SHELL" && \
@@ -43,24 +43,24 @@ else
$(if $(filter MACOSX,$(OS)),, \
&& $(gb_Helper_LIBRARY_PATH_VAR)=$$$$saved_library_path) \
&& export \
- UserInstallation=$(call gb_Helper_make_url,$(call gb_CustomTarget_get_workdir,$(1))/user) \
+ UserInstallation=$(call gb_Helper_make_url,$(gb_CustomTarget_workdir)/$(1)/user) \
$(foreach my_dir,$(2), \
&& (cd $(INSTDIR)/$(SDKDIRNAME)/examples/$(my_dir) \
&& printf 'yes\n' | LANGUAGE= LC_ALL=C make -j1 \
CC="$(CXX) $(gb_CXX03FLAGS)" LINK="$(CXX)" LIB="$(CXX)" \
$(if $(MACOSX_SHELL_HACK), SHELL="$$$$ODK_BUILD_SHELL", ))) \
$(if $(MACOSX_SHELL_HACK),&& rm -f "$$$$ODK_BUILD_SHELL")) \
- >$(call gb_CustomTarget_get_workdir,$(1))/log 2>&1 \
+ >$(gb_CustomTarget_workdir)/$(1)/log 2>&1 \
|| (RET=$$$$? \
$(if $(MACOSX_SHELL_HACK), && rm -f "$$$$ODK_BUILD_SHELL" , ) \
- && cat $(call gb_CustomTarget_get_workdir,$(1))/log \
+ && cat $(gb_CustomTarget_workdir)/$(1)/log \
&& exit $$$$RET)
endif
-$(call gb_CustomTarget_get_workdir,$(1))/setsdkenv: \
+$(gb_CustomTarget_workdir)/$(1)/setsdkenv: \
$(SRCDIR)/odk/config/setsdkenv_unix.sh.in \
$(BUILDDIR)/config_$(gb_Side).mk | \
- $(call gb_CustomTarget_get_workdir,$(1))/.dir
+ $(gb_CustomTarget_workdir)/$(1)/.dir
$$(call gb_Output_announce,$(subst $(WORKDIR)/,,$(1)),$(true),SED,1)
sed -e 's!@OO_SDK_NAME@!sdk!' \
-e 's!@OO_SDK_HOME@!$(INSTDIR)/$(SDKDIRNAME)!' \
@@ -68,7 +68,7 @@ $(call gb_CustomTarget_get_workdir,$(1))/setsdkenv: \
-e 's!@OO_SDK_ZIP_HOME@!!' -e 's!@OO_SDK_CAT_HOME@!!' \
-e 's!@OO_SDK_SED_HOME@!!' -e 's!@OO_SDK_CPP_HOME@!!' \
-e 's!@OO_SDK_JAVA_HOME@!$(JAVA_HOME)!' \
- -e 's!@OO_SDK_OUTPUT_DIR@!$(call gb_CustomTarget_get_workdir,$(1))/out!' \
+ -e 's!@OO_SDK_OUTPUT_DIR@!$(gb_CustomTarget_workdir)/$(1)/out!' \
-e 's!@SDK_AUTO_DEPLOYMENT@!YES!' $$< > $$@
.PHONY: $(call gb_CustomTarget_get_target,$(1))
diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk
index 55548e1ffe89..f1583fb618cf 100644
--- a/officecfg/CustomTarget_registry.mk
+++ b/officecfg/CustomTarget_registry.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry))
$(call gb_CustomTarget_get_target,officecfg/registry) : \
$(foreach i,officecfg_qa_allheaders $(officecfg_XCSFILES),\
- $(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/$(i).hxx)
+ $(gb_CustomTarget_workdir)/officecfg/registry/officecfg/$(i).hxx)
# via define so it can end with a newline
define officecfg_geninclude
@@ -20,7 +20,7 @@ define officecfg_geninclude
endef
# auto generated header file for unit test qa/cppheader.cxx
-$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/officecfg_qa_allheaders.hxx: \
+$(gb_CustomTarget_workdir)/officecfg/registry/officecfg/officecfg_qa_allheaders.hxx: \
$(SRCDIR)/officecfg/files.mk
$(call gb_Output_announce,officecfg_qa_allheaders.hxx,$(true),CAT,1)
$(call gb_Trace_StartRange,officecfg_qa_allheaders.hxx,CAT)
@@ -31,7 +31,7 @@ $(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/officecfg_qa_al
# pass the stem as space separated path elements and get a set of --stringparam ns<level> <element> in return
officecfg_xsltparams=$(if $(filter-out $(lastword $1),$1),$(call officecfg_xsltparams,$(filter-out $(lastword $1),$1))) --stringparam ns$(words $1) $(lastword $1)
-$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/%.hxx: \
+$(gb_CustomTarget_workdir)/officecfg/registry/officecfg/%.hxx: \
$(SRCDIR)/officecfg/registry/schema/org/openoffice/%.xcs \
$(SRCDIR)/officecfg/registry/cppheader.xsl\
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
index 860ae447a576..ad8abadb5127 100644
--- a/oox/CustomTarget_generated.mk
+++ b/oox/CustomTarget_generated.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,oox/generated))
-oox_MISC := $(call gb_CustomTarget_get_workdir,oox/generated)/misc
+oox_MISC := $(gb_CustomTarget_workdir)/oox/generated/misc
$(oox_MISC)/vml-shape-types : \
$(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
index 6ed8f83e2a28..ca1f816baf6e 100644
--- a/oox/Package_generated.mk
+++ b/oox/Package_generated.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,oox_generated,$(call gb_CustomTarget_get_workdir,oox/generated)))
+$(eval $(call gb_Package_Package,oox_generated,$(gb_CustomTarget_workdir)/oox/generated))
$(eval $(call gb_Package_add_files,oox_generated,$(LIBO_SHARE_FOLDER)/filter,\
misc/oox-drawingml-adj-names \
diff --git a/postprocess/CustomTarget_check_dynamic_objects.mk b/postprocess/CustomTarget_check_dynamic_objects.mk
index d81321cad18a..f356e02590e8 100644
--- a/postprocess/CustomTarget_check_dynamic_objects.mk
+++ b/postprocess/CustomTarget_check_dynamic_objects.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_CustomTarget_register_targets,postprocess/check_dynamic_objects
check.done \
))
-$(call gb_CustomTarget_get_workdir,postprocess/check_dynamic_objects)/check.done: \
+$(gb_CustomTarget_workdir)/postprocess/check_dynamic_objects/check.done: \
$(call gb_Postprocess_get_target,AllLibraries) \
$(call gb_Postprocess_get_target,AllExecutables) \
$(call gb_Postprocess_get_target,AllPackages)
diff --git a/postprocess/CustomTarget_components.mk b/postprocess/CustomTarget_components.mk
index 67969396fe3d..9f9f24d2bdb6 100644
--- a/postprocess/CustomTarget_components.mk
+++ b/postprocess/CustomTarget_components.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,postprocess/components))
ifeq (,$(gb_PARTIAL_BUILD))
-postprocess_WORKDIR := $(call gb_CustomTarget_get_workdir,postprocess)
+postprocess_WORKDIR := $(gb_CustomTarget_workdir)/postprocess
$(call gb_CustomTarget_get_target,postprocess/components): \
$(postprocess_WORKDIR)/services_constructors.list \
diff --git a/postprocess/CustomTarget_fontconfig.mk b/postprocess/CustomTarget_fontconfig.mk
index 72ff3f3cf1b0..decc71f82cef 100644
--- a/postprocess/CustomTarget_fontconfig.mk
+++ b/postprocess/CustomTarget_fontconfig.mk
@@ -9,17 +9,17 @@
$(eval $(call gb_CustomTarget_CustomTarget,postprocess/fontconfig))
-$(call gb_CustomTarget_get_workdir,postprocess/fontconfig)/fc_local.conf: \
+$(gb_CustomTarget_workdir)/postprocess/fontconfig/fc_local.conf: \
$(SRCDIR)/extras/source/truetype/symbol/fc_local.snippet \
$(SRCDIR)/postprocess/CustomTarget_fontconfig.mk \
- | $(call gb_CustomTarget_get_workdir,postprocess/fontconfig)/.dir
+ | $(gb_CustomTarget_workdir)/postprocess/fontconfig/.dir
ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
-$(call gb_CustomTarget_get_workdir,postprocess/fontconfig)/fc_local.conf: \
+$(gb_CustomTarget_workdir)/postprocess/fontconfig/fc_local.conf: \
$(SRCDIR)/external/more_fonts/fc_local.snippet
endif
-$(call gb_CustomTarget_get_workdir,postprocess/fontconfig)/fc_local.conf:
+$(gb_CustomTarget_workdir)/postprocess/fontconfig/fc_local.conf:
printf '<?xml version="1.0"?>\n<!DOCTYPE fontconfig SYSTEM "/etc/fonts/conf.d/fonts.dtd">\n<fontconfig>\n' >$@
cat $(SRCDIR)/extras/source/truetype/symbol/fc_local.snippet >>$@
ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 0207cde533c8..74ca91a4b3e6 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,postprocess/images))
-packimages_DIR := $(call gb_CustomTarget_get_workdir,postprocess/images)
+packimages_DIR := $(gb_CustomTarget_workdir)/postprocess/images
$(eval $(call gb_CustomTarget_register_targets,postprocess/images,\
$(foreach theme,$(WITH_THEMES),images_$(theme).zip) \
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index f4ee8e4f2791..20d68d3bc7aa 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -524,42 +524,42 @@ $(call gb_CustomTarget_get_target,postprocess/registry) : \
define postprocess_xcd_deps
$(call gb_XcdTarget_get_target,$(1)).xcd : \
- $(call gb_CustomTarget_get_workdir,postprocess/registry)/$(1).list
+ $(gb_CustomTarget_workdir)/postprocess/registry/$(1).list
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/$(1).list : \
+$(gb_CustomTarget_workdir)/postprocess/registry/$(1).list : \
$(postprocess_FILES_$(1)) \
$(SRCDIR)/postprocess/CustomTarget_registry.mk \
- | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
+ | $(gb_CustomTarget_workdir)/postprocess/registry/.dir
endef
$(foreach xcd,$(postprocess_XCDS),$(eval $(call postprocess_xcd_deps,$(basename $(xcd)))))
define postprocess_lang_deps
$(call gb_XcdTarget_get_target,Langpack-$(1).xcd) : \
- $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list
+ $(gb_CustomTarget_workdir)/postprocess/registry/Langpack-$(1).list
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list : \
+$(gb_CustomTarget_workdir)/postprocess/registry/Langpack-$(1).list : \
$(call gb_XcuLangpackTarget_get_target,Langpack-$(1).xcu) \
- | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
+ | $(gb_CustomTarget_workdir)/postprocess/registry/.dir
$(call gb_XcdTarget_get_target,fcfg_langpack_$(1).xcd) : \
- $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list \
- | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
+ $(gb_CustomTarget_workdir)/postprocess/registry/fcfg_langpack_$(1).list \
+ | $(gb_CustomTarget_workdir)/postprocess/registry/.dir
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list : \
+$(gb_CustomTarget_workdir)/postprocess/registry/fcfg_langpack_$(1).list : \
$(call gb_Configuration_get_target,fcfg_langpack) \
- | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
+ | $(gb_CustomTarget_workdir)/postprocess/registry/.dir
$(call gb_XcdTarget_get_target,registry_$(1).xcd) : \
- $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list
+ $(gb_CustomTarget_workdir)/postprocess/registry/registry_$(1).list
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list : \
+$(gb_CustomTarget_workdir)/postprocess/registry/registry_$(1).list : \
$(call gb_Configuration_get_target,registry) \
$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
$(foreach driver,$(postprocess_DRIVERS),$(call gb_Configuration_get_target,$(driver))) \
) \
$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),$(call gb_Configuration_get_target,updchk)) \
- | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
+ | $(gb_CustomTarget_workdir)/postprocess/registry/.dir
endef
$(foreach lang,$(gb_Configuration_LANGS),$(eval $(call postprocess_lang_deps,$(lang))))
@@ -589,7 +589,7 @@ $(call gb_XcdTarget_get_target,main.xcd) \
mkdir -p $(dir $@) && \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
$(SRCDIR)/solenv/bin/packregistry.xslt \
- $(call gb_CustomTarget_get_workdir,postprocess/registry)/main.list \
+ $(gb_CustomTarget_workdir)/postprocess/registry/main.list \
| sed $(postprocess_main_SED) > $@ \
)
$(call gb_Trace_EndRange,main,XCD)
@@ -620,7 +620,7 @@ $(call gb_XcdTarget_get_target,%.xcd) : \
)
$(call gb_Trace_EndRange,$*,XCD)
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
+$(gb_CustomTarget_workdir)/postprocess/registry/Langpack-%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
echo '<list><dependency file="main"/><filename>$(call gb_XcuLangpackTarget_get_target,Langpack-$*.xcu)</filename></list>' > $@
@@ -629,7 +629,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
# It can happen that localized fcfg_langpack_*.zip contains
# zero-sized org/openoffice/TypeDetection/Filter.xcu; filter them out in the
# find shell command below (see issue 110041):
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
+$(gb_CustomTarget_workdir)/postprocess/registry/fcfg_langpack_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),AWK)
$(call gb_Helper_abbreviate_dirs,\
@@ -642,7 +642,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
)
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),AWK)
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
+$(gb_CustomTarget_workdir)/postprocess/registry/registry_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),AWK)
$(call gb_Helper_abbreviate_dirs,\
@@ -660,7 +660,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
)
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),AWK)
-$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list :
+$(gb_CustomTarget_workdir)/postprocess/registry/%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH)
$(file >$@,<list> $(foreach i,$(postprocess_DEPS_$*), <dependency file='$i'/>) \
diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk
index be032eb3d2ca..27e397031c1a 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_CustomTarget_register_targets,postprocess/signing,\
# PFXFILE and PFXPASSWORD should be set in environment
TIMESTAMPURL ?= "http://timestamp.globalsign.com/scripts/timestamp.dll"
-$(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \
+$(gb_CustomTarget_workdir)/postprocess/signing/signing.done: \
$(SRCDIR)/postprocess/signing/signing.pl \
$(SRCDIR)/postprocess/signing/no_signing.txt \
$(call gb_Module_get_target,extras) \
@@ -26,7 +26,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \
$(call gb_Postprocess_get_target,AllModuleTests) \
$(call gb_Postprocess_get_target,AllModuleSlowtests)
-$(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done:
+$(gb_CustomTarget_workdir)/postprocess/signing/signing.done:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
ifeq ($(COM),MSC)
diff --git a/postprocess/Package_fontconfig.mk b/postprocess/Package_fontconfig.mk
index 37f096e5028e..a5fbf3bed735 100644
--- a/postprocess/Package_fontconfig.mk
+++ b/postprocess/Package_fontconfig.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,postprocess_fontconfig,$(call gb_CustomTarget_get_workdir,postprocess/fontconfig)))
+$(eval $(call gb_Package_Package,postprocess_fontconfig,$(gb_CustomTarget_workdir)/postprocess/fontconfig))
$(eval $(call gb_Package_add_files,postprocess_fontconfig,$(LIBO_SHARE_FOLDER)/fonts/truetype, \
fc_local.conf \
diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk
index 54cb84eadb45..cee23b9fb31b 100644
--- a/postprocess/Package_images.mk
+++ b/postprocess/Package_images.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,postprocess_images,$(call gb_CustomTarget_get_workdir,postprocess/images)))
+$(eval $(call gb_Package_Package,postprocess_images,$(gb_CustomTarget_workdir)/postprocess/images))
$(eval $(call gb_Package_add_files,postprocess_images,$(LIBO_SHARE_FOLDER)/config,\
$(foreach theme,$(WITH_THEMES),images_$(theme).zip) \
diff --git a/pyuno/CustomTarget_python_shell.mk b/pyuno/CustomTarget_python_shell.mk
index 541620304d89..1a34501e59f2 100644
--- a/pyuno/CustomTarget_python_shell.mk
+++ b/pyuno/CustomTarget_python_shell.mk
@@ -20,15 +20,15 @@ else
pyuno_PYTHON_SHELL_VERSION:=$(PYTHON_VERSION)
endif
-$(call gb_CustomTarget_get_workdir,pyuno/python_shell)/python.sh : \
+$(gb_CustomTarget_workdir)/pyuno/python_shell/python.sh : \
$(SRCDIR)/pyuno/zipcore/python.sh \
- $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh
+ $(gb_CustomTarget_workdir)/pyuno/python_shell/os.sh
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CAT)
cat $^ > $@ && chmod +x $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CAT)
-$(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh : \
+$(gb_CustomTarget_workdir)/pyuno/python_shell/os.sh : \
$(SRCDIR)/pyuno/zipcore/$(if $(filter MACOSX,$(OS)),mac,nonmac).sh \
$(BUILDDIR)/config_$(gb_Side)/config_python.h
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
diff --git a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
index cc5a67f3cadb..2db26d99f362 100644
--- a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
+++ b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_CustomTarget_register_targets,pyuno/pythonloader_ini, \
$(call gb_Helper_get_rcfile,pythonloader.uno) \
))
-$(call gb_CustomTarget_get_workdir,pyuno/pythonloader_ini)/$(call gb_Helper_get_rcfile,pythonloader.uno): \
+$(gb_CustomTarget_workdir)/pyuno/pythonloader_ini/$(call gb_Helper_get_rcfile,pythonloader.uno): \
$(BUILDDIR)/config_$(gb_Side)/config_python.h \
$(SRCDIR)/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk
index f75cda39af31..0ecc42b886f7 100644
--- a/pyuno/Package_python_shell.mk
+++ b/pyuno/Package_python_shell.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,python_shell,$(call gb_CustomTarget_get_workdir,pyuno/python_shell)))
+$(eval $(call gb_Package_Package,python_shell,$(gb_CustomTarget_workdir)/pyuno/python_shell))
ifeq ($(OS),MACOSX)
$(eval $(call gb_Package_add_file,python_shell,$(LIBO_ETC_FOLDER)/python,python.sh))
diff --git a/pyuno/Package_pyuno_pythonloader_ini.mk b/pyuno/Package_pyuno_pythonloader_ini.mk
index 0fae14618695..024f3635d89d 100644
--- a/pyuno/Package_pyuno_pythonloader_ini.mk
+++ b/pyuno/Package_pyuno_pythonloader_ini.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,pyuno_pythonloader_ini,$(call gb_CustomTarget_get_workdir,pyuno/pythonloader_ini)))
+$(eval $(call gb_Package_Package,pyuno_pythonloader_ini,$(gb_CustomTarget_workdir)/pyuno/pythonloader_ini))
$(eval $(call gb_Package_add_files,pyuno_pythonloader_ini,$(LIBO_ETC_FOLDER), \
$(call gb_Helper_get_rcfile,pythonloader.uno) \
diff --git a/readlicense_oo/CustomTarget_license.mk b/readlicense_oo/CustomTarget_license.mk
index b4baf7a8f026..dedb2ccb3f37 100644
--- a/readlicense_oo/CustomTarget_license.mk
+++ b/readlicense_oo/CustomTarget_license.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,readlicense_oo/license))
-readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/license)
+readlicense_oo_DIR := $(gb_CustomTarget_workdir)/readlicense_oo/license
readlicense_oo_LICENSE_xml := $(SRCDIR)/readlicense_oo/license/license.xml
$(call gb_CustomTarget_get_target,readlicense_oo/license) : $(readlicense_oo_DIR)/LICENSE.html
diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk
index bb3b41e768a8..14e6241ed72c 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,readlicense_oo/readme))
-readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/readme)
+readlicense_oo_DIR := $(gb_CustomTarget_workdir)/readlicense_oo/readme
# gb_WITH_LANG is empty if --with-lang is not set
# what we need here is: gb_WITH_LANG_OR_DEFAULT ;-)
diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk
index 67755904a007..bd6497b10296 100644
--- a/readlicense_oo/Package_license.mk
+++ b/readlicense_oo/Package_license.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_get_workdir,readlicense_oo/license)))
+$(eval $(call gb_Package_Package,readlicense_oo_license,$(gb_CustomTarget_workdir)/readlicense_oo/license))
ifeq ($(OS),WNT)
$(eval $(call gb_Package_add_file,readlicense_oo_license,license.txt,license.txt))
diff --git a/readlicense_oo/Package_readlicense_oo_readmes.mk b/readlicense_oo/Package_readlicense_oo_readmes.mk
index bce3c0c6295d..07786d728416 100644
--- a/readlicense_oo/Package_readlicense_oo_readmes.mk
+++ b/readlicense_oo/Package_readlicense_oo_readmes.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,readlicense_oo_readmes,$(call gb_CustomTarget_get_workdir,readlicense_oo/readme)))
+$(eval $(call gb_Package_Package,readlicense_oo_readmes,$(gb_CustomTarget_workdir)/readlicense_oo/readme))
$(eval $(call gb_Package_add_files,readlicense_oo_readmes,$(LIBO_SHARE_READMES_FOLDER), \
$(foreach lang,$(readlicense_oo_LANGS),$(call gb_README,$(lang))) \
diff --git a/ridljar/CustomTarget_javamaker.mk b/ridljar/CustomTarget_javamaker.mk
index cc5ab33f807e..345c72ed6552 100644
--- a/ridljar/CustomTarget_javamaker.mk
+++ b/ridljar/CustomTarget_javamaker.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,ridljar/javamaker))
-ridljar_DIR := $(call gb_CustomTarget_get_workdir,ridljar/javamaker)
+ridljar_DIR := $(gb_CustomTarget_workdir)/ridljar/javamaker
$(call gb_CustomTarget_get_target,ridljar/javamaker) : $(ridljar_DIR)/done
diff --git a/ridljar/CustomTarget_test_urp.mk b/ridljar/CustomTarget_test_urp.mk
index 88e87bf6d2bc..243cca03367b 100644
--- a/ridljar/CustomTarget_test_urp.mk
+++ b/ridljar/CustomTarget_test_urp.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,ridljar/test/com/sun/star/lib/uno/protocols/urp))
-ridljar_TESTURP := $(call gb_CustomTarget_get_workdir,ridljar/test/com/sun/star/lib/uno/protocols/urp)
+ridljar_TESTURP := $(gb_CustomTarget_workdir)/ridljar/test/com/sun/star/lib/uno/protocols/urp
$(call gb_CustomTarget_get_target,ridljar/test/com/sun/star/lib/uno/protocols/urp) : $(ridljar_TESTURP)/done
diff --git a/ridljar/Jar_libreoffice.mk b/ridljar/Jar_libreoffice.mk
index 77397bc246ee..2a4c8480846a 100644
--- a/ridljar/Jar_libreoffice.mk
+++ b/ridljar/Jar_libreoffice.mk
@@ -34,8 +34,8 @@ $(eval $(call gb_Jar_add_manifest_classpath,libreoffice, \
# ugly: the module-info.class is manually added here since it's not in "com" dir
$(eval $(call gb_Jar_add_packagedirs,libreoffice,\
- $(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \
- $(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \
+ $(gb_CustomTarget_workdir)/ridljar/javamaker/com \
+ $(gb_CustomTarget_workdir)/unoil/javamaker/com \
$(if $(MODULAR_JAVA),$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class) \
))
diff --git a/ridljar/JunitTest_bridgefactory.mk b/ridljar/JunitTest_bridgefactory.mk
index c50dbcf6d37d..6639ddfd44ee 100644
--- a/ridljar/JunitTest_bridgefactory.mk
+++ b/ridljar/JunitTest_bridgefactory.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Jar_use_customtargets,ridl_bridgefactory, \
$(eval $(call gb_JunitTest_use_jar_classset,ridl_bridgefactory,libreoffice))
-$(eval $(call gb_JunitTest_add_classpath,ridl_bridgefactory,$(call gb_CustomTarget_get_workdir,ridljar/javamaker)))
+$(eval $(call gb_JunitTest_add_classpath,ridl_bridgefactory,$(gb_CustomTarget_workdir)/ridljar/javamaker))
$(eval $(call gb_JunitTest_add_sourcefiles,ridl_bridgefactory,\
ridljar/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test \
diff --git a/ridljar/JunitTest_connections.mk b/ridljar/JunitTest_connections.mk
index 8c8496e35707..015a32afbb6d 100644
--- a/ridljar/JunitTest_connections.mk
+++ b/ridljar/JunitTest_connections.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Jar_use_customtargets,ridl_connections, \
$(eval $(call gb_JunitTest_use_jar_classset,ridl_connections,libreoffice))
-$(eval $(call gb_JunitTest_add_classpath,ridl_connections,$(call gb_CustomTarget_get_workdir,ridljar/javamaker)))
+$(eval $(call gb_JunitTest_add_classpath,ridl_connections,$(gb_CustomTarget_workdir)/ridljar/javamaker))
$(eval $(call gb_JunitTest_add_sourcefiles,ridl_connections,\
ridljar/test/com/sun/star/comp/connections/PipedConnection_Test \
diff --git a/ridljar/JunitTest_java.mk b/ridljar/JunitTest_java.mk
index be174cfe2805..d7eb547e49fd 100644
--- a/ridljar/JunitTest_java.mk
+++ b/ridljar/JunitTest_java.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Jar_use_customtargets,ridl_java, \
$(eval $(call gb_JunitTest_use_jar_classset,ridl_java,libreoffice))
-$(eval $(call gb_JunitTest_add_classpath,ridl_java,$(call gb_CustomTarget_get_workdir,ridljar/javamaker)))
+$(eval $(call gb_JunitTest_add_classpath,ridl_java,$(gb_CustomTarget_workdir)/ridljar/javamaker))
$(eval $(call gb_JunitTest_add_sourcefiles,ridl_java,\
ridljar/test/com/sun/star/lib/uno/environments/java/java_environment_Test \
diff --git a/ridljar/JunitTest_java_remote.mk b/ridljar/JunitTest_java_remote.mk
index 2039e1282885..3bdfd68bd248 100644
--- a/ridljar/JunitTest_java_remote.mk
+++ b/ridljar/JunitTest_java_remote.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Jar_use_customtargets,ridl_java_remote, \
$(eval $(call gb_JunitTest_use_jar_classset,ridl_java_remote,libreoffice))
-$(eval $(call gb_JunitTest_add_classpath,ridl_java_remote,$(call gb_CustomTarget_get_workdir,ridljar/javamaker)))
+$(eval $(call gb_JunitTest_add_classpath,ridl_java_remote,$(gb_CustomTarget_workdir)/ridljar/javamaker))
$(eval $(call gb_JunitTest_add_sourcefiles,ridl_java_remote,\
ridljar/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test \
diff --git a/ridljar/JunitTest_remote.mk b/ridljar/JunitTest_remote.mk
index 340618676163..cd15dff248ac 100644
--- a/ridljar/JunitTest_remote.mk
+++ b/ridljar/JunitTest_remote.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Jar_use_customtargets,ridl_remote, \
$(eval $(call gb_JunitTest_use_jar_classset,ridl_remote,libreoffice))
-$(eval $(call gb_JunitTest_add_classpath,ridl_remote,$(call gb_CustomTarget_get_workdir,ridljar/javamaker)))
+$(eval $(call gb_JunitTest_add_classpath,ridl_remote,$(gb_CustomTarget_workdir)/ridljar/javamaker))
$(eval $(call gb_JunitTest_add_sourcefiles,ridl_remote,\
ridljar/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test \
diff --git a/ridljar/JunitTest_urp.mk b/ridljar/JunitTest_urp.mk
index 3f5f76eae339..f5e62409fd50 100644
--- a/ridljar/JunitTest_urp.mk
+++ b/ridljar/JunitTest_urp.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_JunitTest_use_customtargets,ridl_urp,\
$(eval $(call gb_JunitTest_use_jar_classset,ridl_urp,libreoffice))
-$(eval $(call gb_JunitTest_add_classpath,ridl_urp,$(call gb_CustomTarget_get_workdir,ridljar/javamaker)))
+$(eval $(call gb_JunitTest_add_classpath,ridl_urp,$(gb_CustomTarget_workdir)/ridljar/javamaker))
$(eval $(call gb_JunitTest_add_sourcefiles,ridl_urp,\
ridljar/test/com/sun/star/lib/uno/protocols/urp/Cache_Test \
diff --git a/scp2/CustomTarget_langmacros.mk b/scp2/CustomTarget_langmacros.mk
index 48cb59633562..a373f292af67 100644
--- a/scp2/CustomTarget_langmacros.mk
+++ b/scp2/CustomTarget_langmacros.mk
@@ -9,11 +9,11 @@
$(eval $(call gb_CustomTarget_CustomTarget,scp2/macros))
-$(call gb_CustomTarget_get_target,scp2/macros) : $(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc
+$(call gb_CustomTarget_get_target,scp2/macros) : $(gb_CustomTarget_workdir)/scp2/macros/langmacros.inc
-$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc :| $(call gb_CustomTarget_get_workdir,scp2/macros)/.dir
+$(gb_CustomTarget_workdir)/scp2/macros/langmacros.inc :| $(gb_CustomTarget_workdir)/scp2/macros/.dir
-$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(BUILDDIR)/config_host.mk.stamp
+$(gb_CustomTarget_workdir)/scp2/macros/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(BUILDDIR)/config_host.mk.stamp
$(call gb_Helper_abbreviate_dirs,\
export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \
export HELP_LANGS='$(gb_HELP_LANGS)' && \
diff --git a/sdext/CustomTarget_pdfimport.mk b/sdext/CustomTarget_pdfimport.mk
index a337049c77ae..a32da2b94191 100644
--- a/sdext/CustomTarget_pdfimport.mk
+++ b/sdext/CustomTarget_pdfimport.mk
@@ -10,11 +10,11 @@
$(eval $(call gb_CustomTarget_CustomTarget,sdext/pdfimport))
$(call gb_CustomTarget_get_target,sdext/pdfimport) : \
- $(call gb_CustomTarget_get_workdir,sdext/pdfimport)/hash.cxx
+ $(gb_CustomTarget_workdir)/sdext/pdfimport/hash.cxx
-$(call gb_CustomTarget_get_workdir,sdext/pdfimport)/hash.cxx : \
+$(gb_CustomTarget_workdir)/sdext/pdfimport/hash.cxx : \
$(SRCDIR)/sdext/source/pdfimport/wrapper/keyword_list \
- | $(call gb_CustomTarget_get_workdir,sdext/pdfimport)/.dir
+ | $(gb_CustomTarget_workdir)/sdext/pdfimport/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),GPF)
$(call gb_Helper_wsl_path,$(GPERF) -C -t -l -L C++ -m 20 --switch=2 --readonly-tables -Z PdfKeywordHash -k'4-5$(COMMA)$$' $<) > $@
diff --git a/setup_native/CustomTarget_mac.mk b/setup_native/CustomTarget_mac.mk
index 2f35f23ccef1..f3072ee75923 100644
--- a/setup_native/CustomTarget_mac.mk
+++ b/setup_native/CustomTarget_mac.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,setup_native/mac))
$(eval $(call gb_CustomTarget_register_target,setup_native/mac,macinstall.ulf))
$(eval $(call gb_CustomTarget_ulfex_rule,\
- $(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf,\
+ $(gb_CustomTarget_workdir)/setup_native/mac/macinstall.ulf,\
$(SRCDIR)/setup_native/source/mac/macinstall.ulf,\
$(foreach lang,$(gb_TRANS_LANGS),\
$(gb_POLOCATION)/$(lang)/setup_native/source/mac.po)))
diff --git a/setup_native/CustomTarget_scripts.mk b/setup_native/CustomTarget_scripts.mk
index c7f8c5b0aec1..6b3981ebaf3e 100644
--- a/setup_native/CustomTarget_scripts.mk
+++ b/setup_native/CustomTarget_scripts.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-scripts_WORKDIR :=$(call gb_CustomTarget_get_workdir,setup_native/scripts)
+scripts_WORKDIR :=$(gb_CustomTarget_workdir)/setup_native/scripts
$(eval $(call gb_CustomTarget_CustomTarget,setup_native/scripts))
diff --git a/setup_native/CustomTarget_spell.mk b/setup_native/CustomTarget_spell.mk
index b18095658421..446f8ddb4008 100644
--- a/setup_native/CustomTarget_spell.mk
+++ b/setup_native/CustomTarget_spell.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,setup_native/spell))
$(eval $(call gb_CustomTarget_register_target,setup_native/spell,spellchecker_selection.hxx))
-$(call gb_CustomTarget_get_workdir,setup_native/spell)/spellchecker_selection.hxx: $(SRCDIR)/setup_native/source/packinfo/spellchecker_selection.txt $(SRCDIR)/setup_native/source/packinfo/spellchecker_selection.pl
+$(gb_CustomTarget_workdir)/setup_native/spell/spellchecker_selection.hxx: $(SRCDIR)/setup_native/source/packinfo/spellchecker_selection.txt $(SRCDIR)/setup_native/source/packinfo/spellchecker_selection.pl
$(PERL) -w $(SRCDIR)/setup_native/source/packinfo/spellchecker_selection.pl <$< >$@
# vim: set noet sw=4 ts=4:
diff --git a/sfx2/CustomTarget_classification.mk b/sfx2/CustomTarget_classification.mk
index 4ecc1e750126..7b62be0548d6 100644
--- a/sfx2/CustomTarget_classification.mk
+++ b/sfx2/CustomTarget_classification.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,sfx2/classification))
sfx2_classification_SRC := $(SRCDIR)/sfx2/classification
-sfx2_classification_WORK := $(call gb_CustomTarget_get_workdir,sfx2/classification)
+sfx2_classification_WORK := $(gb_CustomTarget_workdir)/sfx2/classification
sfx2_classification_GEN_example_validated=$(sfx2_classification_WORK)/example.validated
sfx2_classification_XMLLINTCOMMAND := $(call gb_ExternalExecutable_get_command,xmllint)
diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk
index 2780958cf0e2..26ffb3b4dc73 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -14,8 +14,8 @@ $(eval $(call gb_CustomTarget_register_targets,shell/source/win32/shlxthandler/r
shlxthdl_impl.rc \
))
-$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc : \
- $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
+$(gb_CustomTarget_workdir)/shell/source/win32/shlxthandler/res/shlxthdl_impl.rc : \
+ $(gb_CustomTarget_workdir)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),LCX)
$(eval $(call gb_CustomTarget_ulfex_rule,\
- $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf,\
+ $(gb_CustomTarget_workdir)/shell/source/win32/shlxthandler/res/shlxthdl.ulf,\
$(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf,\
$(foreach lang,$(gb_TRANS_LANGS),\
$(gb_POLOCATION)/$(lang)/shell/source/win32/shlxthandler/res.po)))
diff --git a/shell/CustomTarget_spsupp_idl.mk b/shell/CustomTarget_spsupp_idl.mk
index 2c860f6d81d1..7714c0586b65 100644
--- a/shell/CustomTarget_spsupp_idl.mk
+++ b/shell/CustomTarget_spsupp_idl.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,shell/source/win32/spsupp/idl))
-spsupp_IDLDIR := $(call gb_CustomTarget_get_workdir,shell/source/win32/spsupp/idl)
+spsupp_IDLDIR := $(gb_CustomTarget_workdir)/shell/source/win32/spsupp/idl
$(call gb_CustomTarget_get_target,shell/source/win32/spsupp/idl) : \
$(spsupp_IDLDIR)/spsupp.tlb
diff --git a/shell/CustomTarget_x64.mk b/shell/CustomTarget_x64.mk
index 79dcde80d0e3..b5aa0397ae4f 100644
--- a/shell/CustomTarget_x64.mk
+++ b/shell/CustomTarget_x64.mk
@@ -59,11 +59,11 @@ SHELL_HEADERS := \
$(call gb_CustomTarget_get_target,shell/source) : \
$(foreach source,$(SHELL_SHLXTHANDLER_COMMON_FILES) $(SHELL_SHLXTHDL_FILES) $(SHELL_OOOFILT_FILES) $(SHELL_PROPERTYHDL_FILES) $(SHELL_XMLPARSER_FILES),\
- $(call gb_CustomTarget_get_workdir,shell/source)/$(source).cxx) \
+ $(gb_CustomTarget_workdir)/shell/source/$(source).cxx) \
$(foreach header,$(SHELL_HEADERS),\
- $(call gb_CustomTarget_get_workdir,shell/source)/$(header).hxx)
+ $(gb_CustomTarget_workdir)/shell/source/$(header).hxx)
-$(call gb_CustomTarget_get_workdir,shell/source)/% : $(SRCDIR)/shell/source/%
+$(gb_CustomTarget_workdir)/shell/source/% : $(SRCDIR)/shell/source/%
mkdir -p $(dir $@) && $(call gb_Deliver_deliver,$<,$@)
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/WinResTarget_spsupp.mk b/shell/WinResTarget_spsupp.mk
index 77d9a41342a8..f601d3b5a082 100644
--- a/shell/WinResTarget_spsupp.mk
+++ b/shell/WinResTarget_spsupp.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_WinResTarget_use_custom_headers,spsupp,\
))
$(eval $(call gb_WinResTarget_add_defs,spsupp,\
- -DTLB_FILE=\"$(call gb_CustomTarget_get_workdir,shell/source/win32/spsupp/idl)/spsupp.tlb\" \
+ -DTLB_FILE=\"$(gb_CustomTarget_workdir)/shell/source/win32/spsupp/idl/spsupp.tlb\" \
))
$(eval $(call gb_WinResTarget_set_rcfile,spsupp,shell/source/win32/spsupp/res/spsupp))
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 4b1ad8f02ddc..e698a895baea 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -18,7 +18,7 @@
#
# the .dir is for make 3.81, which ignores trailing /
-$(call gb_CustomTarget_get_workdir,%)/.dir :
+$(gb_CustomTarget_workdir)/%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_CustomTarget_get_target,%) :
@@ -30,7 +30,7 @@ $(call gb_CustomTarget_get_target,%) :
$(call gb_CustomTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),CUS,3)
$(call gb_Helper_abbreviate_dirs,\
- rm -rf $(call gb_CustomTarget_get_workdir,$*) && \
+ rm -rf $(gb_CustomTarget_workdir)/$* && \
rm -f $(call gb_CustomTarget_get_target,$*))
define gb_CustomTarget_CustomTarget
@@ -41,8 +41,8 @@ $(call gb_CustomTarget_get_target,$(1)) :| $(dir $(call gb_CustomTarget_get_targ
endef
define gb_CustomTarget_register_target
-$(call gb_CustomTarget_get_target,$(1)) : $(call gb_CustomTarget_get_workdir,$(1))/$(2)
-$(call gb_CustomTarget_get_workdir,$(1))/$(2) :| $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir
+$(call gb_CustomTarget_get_target,$(1)) : $(gb_CustomTarget_workdir)/$(1)/$(2)
+$(gb_CustomTarget_workdir)/$(1)/$(2) :| $(dir $(gb_CustomTarget_workdir)/$(1)/$(2)).dir
endef
@@ -81,8 +81,8 @@ endef
#$(call gb_CustomTarget_token_hash,oox/generated,tokenhash.inc,tokenhash.gperf)
define gb_CustomTarget_token_hash
-$(call gb_CustomTarget_get_target,$(1)) : $(call gb_CustomTarget_get_workdir,$(1))/$(2)
-$(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(call gb_CustomTarget_get_workdir,$(1))/misc/$(3)
+$(call gb_CustomTarget_get_target,$(1)) : $(gb_CustomTarget_workdir)/$(1)/$(2)
+$(gb_CustomTarget_workdir)/$(1)/$(2) : $(gb_CustomTarget_workdir)/$(1)/misc/$(3)
$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,GPF,1)
$$(call gb_Helper_wsl_path,$(GPERF) --compare-strncmp --switch=2 --readonly-tables $$<) \
| sed -e '/^#line/d' -e 's/(char\*)0/(char\*)0, 0/g' > $$@
@@ -92,14 +92,14 @@ endef
#$(call gb_CustomTarget_generate_tokens,oox/generated,oox,oox/source/token,
#namespaces,namespace,namespaces.txt,namespaces-strict,namespaces.pl)
define gb_CustomTarget_generate_tokens
-$(call gb_CustomTarget_get_workdir,$(1))/misc/$(5)ids.inc \
-$(call gb_CustomTarget_get_workdir,$(1))/$(5)names.inc \
-$(if $(6),$(call gb_CustomTarget_get_workdir,$(1))/misc/$(6)) \
-$(if $(7),$(call gb_CustomTarget_get_workdir,$(1))/$(7)names.inc) : \
- $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx
+$(gb_CustomTarget_workdir)/$(1)/misc/$(5)ids.inc \
+$(gb_CustomTarget_workdir)/$(1)/$(5)names.inc \
+$(if $(6),$(gb_CustomTarget_workdir)/$(1)/misc/$(6)) \
+$(if $(7),$(gb_CustomTarget_workdir)/$(1)/$(7)names.inc) : \
+ $(gb_CustomTarget_workdir)/$(1)/$(2)/token/$(4).hxx
touch $$@
-$(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx : \
+$(gb_CustomTarget_workdir)/$(1)/$(2)/token/$(4).hxx : \
$(call gb_ExternalExecutable_get_dependencies,python) \
$(if $(7),$(SRCDIR)/$(3)/$(7).txt) \
$(if $(8),$(SRCDIR)/$(3)/$(8),$(SRCDIR)/solenv/bin/generate-tokens.py) \
@@ -108,28 +108,28 @@ $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx : \
$(SRCDIR)/$(3)/$(4).hxx.tail
$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,PRL,1)
$$(call gb_Trace_StartRange,$$(subst $(WORKDIR)/,,$$@),PRL)
- mkdir -p $(call gb_CustomTarget_get_workdir,$(1))/misc \
- $(call gb_CustomTarget_get_workdir,$(1)) \
- $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token
+ mkdir -p $(gb_CustomTarget_workdir)/$(1)/misc \
+ $(gb_CustomTarget_workdir)/$(1) \
+ $(gb_CustomTarget_workdir)/$(1)/$(2)/token
$(call gb_ExternalExecutable_get_command,python) $(if $(8),$(SRCDIR)/$(3)/$(8),$(SRCDIR)/solenv/bin/generate-tokens.py) \
$(SRCDIR)/$(3)/$(4).txt \
- $(call gb_CustomTarget_get_workdir,$(1))/misc/$(5)ids.inc \
- $(call gb_CustomTarget_get_workdir,$(1))/$(5)names.inc \
- $(if $(6), $(call gb_CustomTarget_get_workdir,$(1))/misc/$(6)) \
+ $(gb_CustomTarget_workdir)/$(1)/misc/$(5)ids.inc \
+ $(gb_CustomTarget_workdir)/$(1)/$(5)names.inc \
+ $(if $(6), $(gb_CustomTarget_workdir)/$(1)/misc/$(6)) \
$(if $(7), $(SRCDIR)/$(3)/$(7).txt \
- $(call gb_CustomTarget_get_workdir,$(1))/$(7)names.inc) \
+ $(gb_CustomTarget_workdir)/$(1)/$(7)names.inc) \
&& cat $(SRCDIR)/$(3)/$(4).hxx.head \
- $(call gb_CustomTarget_get_workdir,$(1))/misc/$(5)ids.inc \
+ $(gb_CustomTarget_workdir)/$(1)/misc/$(5)ids.inc \
$(SRCDIR)/$(3)/$(4).hxx.tail \
- > $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx \
+ > $(gb_CustomTarget_workdir)/$(1)/$(2)/token/$(4).hxx \
&& touch $$@
$$(call gb_Trace_EndRange,$$(subst $(WORKDIR)/,,$$@),PRL)
$(call gb_CustomTarget_get_target,$(1)) : \
- $(call gb_CustomTarget_get_workdir,$(1))/$(5)names.inc \
- $(if $(7),$(call gb_CustomTarget_get_workdir,$(1))/$(7)names.inc) \
- $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx \
- $(if $(6),$(call gb_CustomTarget_get_workdir,$(1))/misc/$(6)) \
+ $(gb_CustomTarget_workdir)/$(1)/$(5)names.inc \
+ $(if $(7),$(gb_CustomTarget_workdir)/$(1)/$(7)names.inc) \
+ $(gb_CustomTarget_workdir)/$(1)/$(2)/token/$(4).hxx \
+ $(if $(6),$(gb_CustomTarget_workdir)/$(1)/misc/$(6)) \
endef
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 3027b0de30fa..48d91258e1bb 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -77,8 +77,8 @@ $(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_Executable_Executable_platform,$(1),$(2),$(gb_Executable_BINDIR)/$(1).lib)
ifeq ($(OS),EMSCRIPTEN)
$(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,$(1))) : \
- $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data \
- $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata
+ $(gb_CustomTarget_workdir)/static/emscripten_fs_image/soffice.data \
+ $(gb_CustomTarget_workdir)/static/emscripten_fs_image/soffice.data.js.metadata
endif
$$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index 3ae5f67e0839..37a01b80ce83 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -261,7 +261,7 @@ endef
define gb_InstallModuleTarget_use_custom_header
$(call gb_InstallModuleTarget_get_external_target,$(1)) : $(call gb_CustomTarget_get_target,$(2))
-$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) \
+$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE += -I$(gb_CustomTarget_workdir)/$(2) \
endef
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 8b769624c12e..1dcc65fd8e8a 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -179,7 +179,7 @@ endef
define gb_JavaClassSet_use_customtarget
$(call gb_JavaClassSet_get_preparation_target,$(1)) : \
$(call gb_CustomTarget_get_target,$(2))
-$(call gb_JavaClassSet_add_classpath,$(1),$(call gb_CustomTarget_get_workdir,$(2)))
+$(call gb_JavaClassSet_add_classpath,$(1),$(gb_CustomTarget_workdir)/$(2))
endef
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 66f90a34f4c8..23f0a1fb0135 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -153,7 +153,7 @@ endef
define gb_JunitTest_use_customtarget
$(call gb_JavaClassSet_use_customtarget,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
-$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(call gb_CustomTarget_get_workdir,$(2))
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$$(gb_CLASSPATHSEP)$(gb_CustomTarget_workdir)/$(2)
endef
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e054cffb4c85..3004fbbf24de 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1940,7 +1940,7 @@ endef
define gb_LinkTarget__use_custom_headers
$(call gb_LinkTarget_get_headers_target,$(1)) :| \
$(call gb_CustomTarget_get_target,$(2))
-$(call gb_LinkTarget__add_include,$(1),$(call gb_CustomTarget_get_workdir,$(2)))
+$(call gb_LinkTarget__add_include,$(1),$(gb_CustomTarget_workdir)/$(2))
endef
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index f3224179fbe8..20d65400cc63 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -499,7 +499,7 @@ unitcheck : $$(firstword $$(gb_Module_CHECKTARGETSTACK))
slowcheck : $$(firstword $$(gb_Module_SLOWCHECKTARGETSTACK))
screenshot : $$(firstword $$(gb_Module_SCREENSHOTTARGETSTACK))
ifeq ($(WINDOWS_BUILD_SIGNING),TRUE)
-screenshot : $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done
+screenshot : $(gb_CustomTarget_workdir)/postprocess/signing/signing.done
endif
subsequentcheck : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
perfcheck : $$(firstword $$(gb_Module_PERFCHECKTARGETSTACK))
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 641ff838e4d2..90d6f1d0f702 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -104,7 +104,7 @@ $(call gb_PythonTest_get_target,$(1)) : MODULES += $(3)
endef
define gb_PythonTest_use_customtarget
-$(call gb_PythonTest_get_target,$(1)) : $(call gb_CustomTarget_get_workdir,$(2))
+$(call gb_PythonTest_get_target,$(1)) : $(gb_CustomTarget_workdir)/$(2)
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 65026c355826..1db26abd9e4e 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -58,6 +58,7 @@ gb_CustomPackage_get_target = $(WORKDIR)/CustomPackage/$(1).filelist
gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1)
+gb_CustomTarget_workdir := $(WORKDIR)/CustomTarget
gb_DescriptionTranslateTarget_get_target = $(WORKDIR)/DescriptionTranslateTarget/$(1).xml
gb_Dictionary_get_target = $(WORKDIR)/Dictionary/$(1).done
gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 334080b70a70..e49dbed2fe8f 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -126,7 +126,7 @@ $(call gb_UITest_get_target,$(1)) : MODULES += $(strip $(2))/$(strip $(3))
endef
define gb_UITest_use_customtarget
-$(call gb_UITest_get_target,$(1)) : $(call gb_CustomTarget_get_workdir,$(2))
+$(call gb_UITest_get_target,$(1)) : $(gb_CustomTarget_workdir)/$(2)
endef
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 7cc98adc5f2c..bc66d427a716 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -111,7 +111,7 @@ endef
define gb_WinResTarget__use_custom_headers
$(call gb_WinResTarget_get_target,$(1)) : $(call gb_CustomTarget_get_target,$(2))
-$(call gb_WinResTarget__add_include,$(1),$(call gb_CustomTarget_get_workdir,$(2)))
+$(call gb_WinResTarget__add_include,$(1),$(gb_CustomTarget_workdir)/$(2))
endef
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk
index 73f9be2b78ef..5e817228d900 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -160,7 +160,7 @@ $(WORKDIR)/LinkTarget/Library/%.exports:
@true
define gb_LinkTarget__use_custom_headers
-$(call gb_LinkTarget__add_include,$(1),$(call gb_CustomTarget_get_workdir,$(2)))
+$(call gb_LinkTarget__add_include,$(1),$(gb_CustomTarget_workdir)/$(2))
endef
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index a973a711d59a..3b4f761adc77 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -186,8 +186,8 @@ $(if $(filter TRUE,$(ENABLE_QT5)), \
sed -e 's/@APPNAME@/$(basename $(notdir $(1)))/g' -e 's/@APPEXPORTNAME@/$(basename $(notdir $(1)))_entry/g' -e 's/@PRELOAD@//g' -e 's|const instance = await qtLoad$(OPEN_PAREN){|const instance = await qtLoad$(OPEN_PAREN){ "arguments": ["--norestore"$(COMMA) "--nologo"$(COMMA) "--writer"$(COMMA) "/android/default-document/example.odt"]$(COMMA)|' -e 's/}$(CLOSE_PAREN);$$/}$(CLOSE_PAREN); window.Module = instance;/' $(QT6_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(basename $(notdir $(1))).html && \
cp $(QT6_PLATFORMS_SRCDIR)/qtlogo.svg $(QT6_PLATFORMS_SRCDIR)/qtloader.js $(dir $(1)) && \
)) \
- cp $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir $(1))/soffice.data && \
- cp $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata $(dir $(1))/soffice.data.js.metadata \
+ cp $(gb_CustomTarget_workdir)/static/emscripten_fs_image/soffice.data $(dir $(1))/soffice.data && \
+ cp $(gb_CustomTarget_workdir)/static/emscripten_fs_image/soffice.data.js.metadata $(dir $(1))/soffice.data.js.metadata \
)
endef
diff --git a/static/CustomTarget_components.mk b/static/CustomTarget_components.mk
index 510395c9488b..cc5a604d3bf0 100644
--- a/static/CustomTarget_components.mk
+++ b/static/CustomTarget_components.mk
@@ -10,8 +10,8 @@
$(eval $(call gb_CustomTarget_CustomTarget,static/components))
-static_WORKDIR := $(call gb_CustomTarget_get_workdir,static)
-postprocess_WORKDIR := $(call gb_CustomTarget_get_workdir,postprocess)
+static_WORKDIR := $(gb_CustomTarget_workdir)/static
+postprocess_WORKDIR := $(gb_CustomTarget_workdir)/postprocess
$(call gb_CustomTarget_get_target,static/components): \
$(static_WORKDIR)/component_maps.cxx \
diff --git a/static/CustomTarget_emscripten_fs_image.mk b/static/CustomTarget_emscripten_fs_image.mk
index 89b0c628b4c8..b82dcff82aa7 100644
--- a/static/CustomTarget_emscripten_fs_image.mk
+++ b/static/CustomTarget_emscripten_fs_image.mk
@@ -1487,7 +1487,7 @@ gb_emscripten_fs_image_filelists += $(call gb_Package_get_target,fontconfig_data
# Ruleset
#
-emscripten_fs_image_WORKDIR := $(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)
+emscripten_fs_image_WORKDIR := $(gb_CustomTarget_workdir)/static/emscripten_fs_image
# we just need data.js.link at link time, which is equal to soffice.data.js
$(call gb_CustomTarget_get_target,static/emscripten_fs_image): \
diff --git a/static/CustomTarget_unoembind.mk b/static/CustomTarget_unoembind.mk
index d1bc294e0b9f..dbc06007dfbf 100644
--- a/static/CustomTarget_unoembind.mk
+++ b/static/CustomTarget_unoembind.mk
@@ -14,15 +14,15 @@ $(eval $(call gb_CustomTarget_register_targets,static/unoembind, \
bindings_uno.js \
))
-$(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.cxx \
-$(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.hxx \
-$(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.js: \
+$(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.cxx \
+$(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.hxx \
+$(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js: \
$(call gb_Executable_get_target_for_build,embindmaker) $(call gb_UnoApi_get_target,udkapi) \
$(call gb_UnoApi_get_target,offapi)
$(call gb_Executable_get_command,embindmaker) uno \
- $(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.cxx \
- $(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.hxx \
- $(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.js \
+ $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.cxx \
+ $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.hxx \
+ $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \
+$(call gb_UnoApi_get_target,udkapi) +$(call gb_UnoApi_get_target,offapi)
# vim: set noet sw=4 ts=4:
diff --git a/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk b/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk
index afd28784eb96..3d43dadb8832 100644
--- a/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk
+++ b/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk
@@ -10,12 +10,12 @@
$(eval $(call gb_CustomTarget_CustomTarget,static/qt5-mandelbrot))
$(call gb_CustomTarget_get_target,static/qt5-mandelbrot) : \
- $(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/renderthread.moc \
- $(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/mandelbrotwidget.moc \
+ $(gb_CustomTarget_workdir)/static/qt5-mandelbrot/renderthread.moc \
+ $(gb_CustomTarget_workdir)/static/qt5-mandelbrot/mandelbrotwidget.moc \
-qt5_mandelbrot_MOCDEFS_H := $(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/moc_predefs.h
-qt5_mandelbrot_MOCDEFS_CXX := $(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/moc_dummy.cxx
-qt5_mandelbrot_WORKDIR := $(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/.dir
+qt5_mandelbrot_MOCDEFS_H := $(gb_CustomTarget_workdir)/static/qt5-mandelbrot/moc_predefs.h
+qt5_mandelbrot_MOCDEFS_CXX := $(gb_CustomTarget_workdir)/static/qt5-mandelbrot/moc_dummy.cxx
+qt5_mandelbrot_WORKDIR := $(gb_CustomTarget_workdir)/static/qt5-mandelbrot/.dir
$(qt5_mandelbrot_MOCDEFS_CXX): | $(qt5_mandelbrot_WORKDIR)
touch $@
@@ -26,7 +26,7 @@ $(qt5_mandelbrot_MOCDEFS_H): $(qt5_mandelbrot_MOCDEFS_CXX) | $(qt5_mandelbrot_WO
$(CXX) -pipe -O2 -std=gnu++11 -fno-exceptions $(gb_EMSCRIPTEN_CPPFLAGS) -dM -E -o $@ $<
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CXX)
-$(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/%.moc : \
+$(gb_CustomTarget_workdir)/static/qt5-mandelbrot/%.moc : \
$(SRCDIR)/static/source/qt5-mandelbrot/%.h \
$(qt5_mandelbrot_MOCDEFS_H) | $(qt5_mandelbrot_WORKDIR)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
diff --git a/static/Package_unoembind.mk b/static/Package_unoembind.mk
index d1f82b970424..cfd153e54ade 100644
--- a/static/Package_unoembind.mk
+++ b/static/Package_unoembind.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,unoembind,$(call gb_CustomTarget_get_workdir,static/unoembind)))
+$(eval $(call gb_Package_Package,unoembind,$(gb_CustomTarget_workdir)/static/unoembind))
$(eval $(call gb_Package_use_custom_target,unoembind,static/unoembind))
diff --git a/sw/CustomTarget_generated.mk b/sw/CustomTarget_generated.mk
index e804e1590d49..ca59842fd582 100644
--- a/sw/CustomTarget_generated.mk
+++ b/sw/CustomTarget_generated.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,sw/generated))
sw_SRC := $(SRCDIR)/sw/source/core/swg
sw_PY := $(SRCDIR)/solenv/bin/gentoken.py
-sw_INC := $(call gb_CustomTarget_get_workdir,sw/generated)
+sw_INC := $(gb_CustomTarget_workdir)/sw/generated
# static pattern rule
$(sw_INC)/TextBlockTokens.gperf \
diff --git a/sw/CustomTarget_source.mk b/sw/CustomTarget_source.mk
index ca3c471c5e5f..d69d981e5e98 100644
--- a/sw/CustomTarget_source.mk
+++ b/sw/CustomTarget_source.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,sw/source/writerfilter))
-writerfilter_WORK := $(call gb_CustomTarget_get_workdir,sw/source/writerfilter)
+writerfilter_WORK := $(gb_CustomTarget_workdir)/sw/source/writerfilter
writerfilter_SRC := $(SRCDIR)/sw/source/writerfilter
writerfilter_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
@@ -56,7 +56,7 @@ writerfilter_ALL = \
$(patsubst %,$(writerfilter_WORK)/ooxml/OOXMLFactory_%.hxx,$(writerfilter_OOXMLNAMESPACES)) \
$(patsubst %,$(writerfilter_WORK)/ooxml/OOXMLFactory_%.cxx,$(writerfilter_OOXMLNAMESPACES)) \
-writerfilter_DEP_ooxml_Namespaces_txt=$(call gb_CustomTarget_get_workdir,oox/generated)/misc/namespaces.txt
+writerfilter_DEP_ooxml_Namespaces_txt=$(gb_CustomTarget_workdir)/oox/generated/misc/namespaces.txt
writerfilter_GEN_ooxml_FactoryValues_hxx=$(writerfilter_WORK)/ooxml/OOXMLFactory_values.hxx
writerfilter_GEN_ooxml_Factory_cxx=$(writerfilter_WORK)/ooxml/OOXMLFactory_generated.cxx
writerfilter_GEN_ooxml_Factory_hxx=$(writerfilter_WORK)/ooxml/OOXMLFactory_generated.hxx
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index 44afba7233ee..b31df46f0fe0 100644
--- a/sysui/CustomTarget_deb.mk
+++ b/sysui/CustomTarget_deb.mk
@@ -9,7 +9,7 @@
include $(SRCDIR)/sysui/productlist.mk
-deb_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/deb)
+deb_WORKDIR := $(gb_CustomTarget_workdir)/sysui/deb
deb_SRCDIR := $(SRCDIR)/sysui/desktop/debian
$(eval $(call gb_CustomTarget_CustomTarget,sysui/deb))
@@ -39,9 +39,9 @@ $(deb_WORKDIR)/%/DEBIAN/prerm: $(deb_SRCDIR)/prerm
cat $< | tr -d "\015" | \
sed 's/%PREFIX/$(UNIXFILENAME.$*)/g' >> $@
-$(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call gb_CustomTarget_get_workdir,sysui/share)/%/create_tree.sh
+$(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(gb_CustomTarget_workdir)/sysui/share/%/create_tree.sh
mkdir -p $(deb_WORKDIR)/$*/usr/lib/menu
- cd $(call gb_CustomTarget_get_workdir,sysui/share)/$* \
+ cd $(gb_CustomTarget_workdir)/sysui/share/$* \
&& DESTDIR=$(deb_WORKDIR)/$* \
ICON_PREFIX=$(UNIXFILENAME.$*) \
KDEMAINDIR=/usr \
diff --git a/sysui/CustomTarget_infoplist.mk b/sysui/CustomTarget_infoplist.mk
index 98f5f1c427b9..09c488129063 100644
--- a/sysui/CustomTarget_infoplist.mk
+++ b/sysui/CustomTarget_infoplist.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-info_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/infoplist)
+info_WORKDIR := $(gb_CustomTarget_workdir)/sysui/infoplist
info_SRCDIR := $(SRCDIR)/sysui/desktop/macosx
info_BUILDDIR := $(BUILDDIR)/sysui/desktop/macosx
diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk
index a76b4161e2af..c0ef34cc7d4d 100644
--- a/sysui/CustomTarget_rpm.mk
+++ b/sysui/CustomTarget_rpm.mk
@@ -9,7 +9,7 @@
include $(SRCDIR)/sysui/productlist.mk
-rpm_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/rpm)
+rpm_WORKDIR := $(gb_CustomTarget_workdir)/sysui/rpm
rpm_SRCDIR := $(SRCDIR)/sysui/desktop
RPMDISTROS := freedesktop
@@ -20,12 +20,12 @@ $(call gb_CustomTarget_get_target,sysui/rpm): $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSI
$(rpm_WORKDIR)/$(1)-desktop-integration.tar.gz: $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm
$(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm : \
$(rpm_SRCDIR)/$(2)/$(2)-menus.spec \
- $(call gb_CustomTarget_get_workdir,sysui/share)/$(1)/create_tree.sh \
+ $(gb_CustomTarget_workdir)/sysui/share/$(1)/create_tree.sh \
| $(rpm_WORKDIR)/$(1)/.dir
$(call gb_Helper_print_on_error,\
$(RPM) -bb $$< \
--buildroot $(rpm_WORKDIR)/$(1)/$(2) \
- --define "_builddir $(call gb_CustomTarget_get_workdir,sysui/share)/$(1)" \
+ --define "_builddir $(gb_CustomTarget_workdir)/sysui/share/$(1)" \
--define "_rpmdir $(rpm_WORKDIR)/$(1)" \
--define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
--define "productname $(PRODUCTNAME.$(1))" \
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 912048b2ad66..0a2fe2ef1f7e 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -18,7 +18,7 @@ else
brand_URIPARAM :=
endif
-share_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/share)
+share_WORKDIR := $(gb_CustomTarget_workdir)/sysui/share
share_SRCDIR := $(SRCDIR)/sysui/desktop
share_TRANSLATE := $(SRCDIR)/solenv/bin/desktop-translate.py
diff --git a/sysui/CustomTarget_solaris.mk b/sysui/CustomTarget_solaris.mk
index 42a0a8a90633..a38c45f53a60 100644
--- a/sysui/CustomTarget_solaris.mk
+++ b/sysui/CustomTarget_solaris.mk
@@ -9,7 +9,7 @@
include $(SRCDIR)/sysui/productlist.mk
-solaris_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/solaris)
+solaris_WORKDIR := $(gb_CustomTarget_workdir)/sysui/solaris
solaris_SRCDIR := $(SRCDIR)/sysui/desktop/solaris
$(eval $(call gb_CustomTarget_CustomTarget,sysui/solaris))
@@ -46,9 +46,9 @@ $(solaris_WORKDIR)/%/postremove: $(solaris_SRCDIR)/postremove
cat $< | tr -d "\015" > $@
$(solaris_WORKDIR)/%/prototype: $(solaris_SRCDIR)/prototype
- cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$*)/g" -e "s_%SOURCE_$(call gb_CustomTarget_get_workdir,sysui/share)/$*_g" -e "s/%ICONPREFIX/$(UNIXFILENAME.$*)/g" > $@
+ cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$*)/g" -e "s_%SOURCE_$(gb_CustomTarget_workdir)/sysui/share/$*_g" -e "s/%ICONPREFIX/$(UNIXFILENAME.$*)/g" > $@
-$(solaris_WORKDIR)/%-desktop-integration.tar.gz: $(solaris_WORKDIR)/%/copyright $(solaris_WORKDIR)/%/pkginfo $(solaris_WORKDIR)/%/depend $(solaris_WORKDIR)/%/mailcap $(solaris_WORKDIR)/%/postinstall $(solaris_WORKDIR)/%/postremove $(solaris_WORKDIR)/%/prototype $(call gb_CustomTarget_get_workdir,sysui/share)/%/openoffice.org.xml
+$(solaris_WORKDIR)/%-desktop-integration.tar.gz: $(solaris_WORKDIR)/%/copyright $(solaris_WORKDIR)/%/pkginfo $(solaris_WORKDIR)/%/depend $(solaris_WORKDIR)/%/mailcap $(solaris_WORKDIR)/%/postinstall $(solaris_WORKDIR)/%/postremove $(solaris_WORKDIR)/%/prototype $(gb_CustomTarget_workdir)/sysui/share/%/openoffice.org.xml
# pkgmk -l 1073741824 -r $(solaris_WORKDIR) -f $(solaris_WORKDIR)/$*/prototype -o -d $(solaris_WORKDIR) ARCH=all VERSION=$(PKGVERSION.$*)
fakeroot $(GNUTAR) -cf - -C $(solaris_WORKDIR) $* | gzip > $@
diff --git a/sysui/Package_infoplist.mk b/sysui/Package_infoplist.mk
index de53ba5ba769..3c67a69ee4ea 100644
--- a/sysui/Package_infoplist.mk
+++ b/sysui/Package_infoplist.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,infoplist,$(call gb_CustomTarget_get_workdir,sysui/infoplist)))
+$(eval $(call gb_Package_Package,infoplist,$(gb_CustomTarget_workdir)/sysui/infoplist))
# workaround to avoid gb_Package_add_files with empty directory adding extra '/'
$(eval $(call gb_Package_set_outdir,infoplist,$(INSTDIR)))
diff --git a/sysui/Package_osxicons.mk b/sysui/Package_osxicons.mk
index 89b69bdcf7b4..102b3934de28 100644
--- a/sysui/Package_osxicons.mk
+++ b/sysui/Package_osxicons.mk
@@ -6,7 +6,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-icns_WRKDIR := $(call gb_CustomTarget_get_workdir,sysui/icns)
+icns_WRKDIR := $(gb_CustomTarget_workdir)/sysui/icns
icns_SRCDIR := $(SRCDIR)/sysui/desktop/icons/macos
icns_mimetypes := database drawing drawing-template extension formula master-document \
@@ -31,7 +31,7 @@ $(icns_WRKDIR)/oasis-%.icns: $(foreach size,$(icns_sizes),$(icns_SRCDIR)/mime-oa
$(call gb_Output_announce,$(@F),$(true),ICNS,2)
iconutil -c icns -o $@ $(<D)
-$(eval $(call gb_Package_Package,sysui_osxicons,$(call gb_CustomTarget_get_workdir,sysui/icns)))
+$(eval $(call gb_Package_Package,sysui_osxicons,$(gb_CustomTarget_workdir)/sysui/icns))
$(call gb_Package_get_clean_target,sysui_osxicons): $(call gb_CustomTarget_get_clean_target,sysui/icns)
$(eval $(call gb_Package_add_files_with_dir,sysui_osxicons,Resources,\
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
index 9e934f03498a..fd12947ac434 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest))
-testtools_BRIDGEDIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
+testtools_BRIDGEDIR := $(gb_CustomTarget_workdir)/testtools/bridgetest
ifeq ($(OS),WNT)
testtools_BATCHSUFFIX := .bat
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk
index aa1336e24d92..b992e5267a92 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_climaker))
-testtools_CLIDIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_climaker)
+testtools_CLIDIR := $(gb_CustomTarget_workdir)/testtools/bridgetest_climaker
$(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \
$(testtools_CLIDIR)/cli_types_bridgetest.dll
diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
index 0ab401551510..283cf4d879a1 100644
--- a/testtools/CustomTarget_bridgetest_javamaker.mk
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_javamaker))
-testtools_JAVADIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)
+testtools_JAVADIR := $(gb_CustomTarget_workdir)/testtools/bridgetest_javamaker
$(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(testtools_JAVADIR)/done
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk
index c5d789d1cb7e..e7956fa911d5 100644
--- a/testtools/Jar_testComponent.mk
+++ b/testtools/Jar_testComponent.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star
$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,NONE,uno_services))
$(eval $(call gb_Jar_add_packagedirs,testComponent,\
- $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)/test \
+ $(gb_CustomTarget_workdir)/testtools/bridgetest_javamaker/test \
))
$(eval $(call gb_Jar_add_sourcefiles,testComponent,\
diff --git a/tools/CustomTarget_reversemap.mk b/tools/CustomTarget_reversemap.mk
index 94a697f1a6af..c90413c2b3a6 100644
--- a/tools/CustomTarget_reversemap.mk
+++ b/tools/CustomTarget_reversemap.mk
@@ -9,11 +9,11 @@
$(eval $(call gb_CustomTarget_CustomTarget,tools/string))
$(call gb_CustomTarget_get_target,tools/string) : \
- $(call gb_CustomTarget_get_workdir,tools/string)/reversemap.cxx
+ $(gb_CustomTarget_workdir)/tools/string/reversemap.cxx
-$(call gb_CustomTarget_get_workdir,tools/string)/reversemap.cxx : \
+$(gb_CustomTarget_workdir)/tools/string/reversemap.cxx : \
$(call gb_Executable_get_runtime_dependencies,bestreversemap) \
- | $(call gb_CustomTarget_get_workdir,tools/string)/.dir
+ | $(gb_CustomTarget_workdir)/tools/string/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRM,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),BRM)
$(call gb_Helper_execute,bestreversemap > $@)
diff --git a/unoidl/CustomTarget_unoidl-check_test.mk b/unoidl/CustomTarget_unoidl-check_test.mk
index 52ef4d6c30bd..2e0bf69b8f35 100644
--- a/unoidl/CustomTarget_unoidl-check_test.mk
+++ b/unoidl/CustomTarget_unoidl-check_test.mk
@@ -23,183 +23,183 @@ $(eval $(call gb_CustomTarget_CustomTarget,unoidl/unoidl-check_test))
$(call gb_CustomTarget_get_target,unoidl/unoidl-check_test): \
$(call gb_Executable_get_runtime_dependencies,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/other1.rdb \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/other2.rdb \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/pe.rdb \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psb.rdb \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/ue.rdb \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usb.rdb
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/other1.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/other2.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/pe.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psb.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/ue.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usb.rdb
ifneq ($(gb_SUPPRESS_TESTS),)
@true
else
$(call gb_Helper_abbreviate_dirs,( \
$(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psb.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psb.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usb.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usb.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/pe.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/pe.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/ue.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/ue.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/other1.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/other1.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/other2.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/other2.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
$(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psb.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psb.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usb.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usb.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/pe.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/pe.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/ue.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/ue.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/other1.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/other1.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/other2.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/other2.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
$(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
$(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psb.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psb.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
$(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
$(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usb.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usb.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
$(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/pe.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/pe.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
$(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/ue.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/ue.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
$(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/other1.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/other1.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
$(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/other2.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/other2.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
$(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psa.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psb.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/psb.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
$(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usb.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usb.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/pe.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/pe.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/ue.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/ue.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/other1.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/other1.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
$(call gb_Helper_abbreviate_dirs,( \
! $(call gb_Executable_get_command,unoidl-check) \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
- -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/other2.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/usa.rdb \
+ -- $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/other2.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
endif
-$(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/%.rdb: \
+$(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/%.rdb: \
$(SRCDIR)/unoidl/qa/unoidl-check/%.idl \
$(call gb_Executable_get_runtime_dependencies,unoidl-write) \
- | $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/.dir
+ | $(gb_CustomTarget_workdir)/unoidl/unoidl-check_test/.dir
$(call gb_Helper_abbreviate_dirs,( \
$(call gb_Executable_get_command,unoidl-write) $< $@))
diff --git a/unoidl/CustomTarget_unoidl-write_test.mk b/unoidl/CustomTarget_unoidl-write_test.mk
index fc80f516c53d..7641fb533324 100644
--- a/unoidl/CustomTarget_unoidl-write_test.mk
+++ b/unoidl/CustomTarget_unoidl-write_test.mk
@@ -25,77 +25,77 @@ $(call gb_CustomTarget_get_target,unoidl/unoidl-write_test) : \
$(SRCDIR)/idlc/test/parser/published.tests \
$(SRCDIR)/idlc/test/parser/struct.tests \
$(SRCDIR)/idlc/test/parser/typedef.tests \
- | $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/.dir
+ | $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/.dir
ifneq ($(gb_SUPPRESS_TESTS),)
@true
else
$(call gb_Helper_abbreviate_dirs,( \
$(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
$(SRCDIR)/idlc/test/parser/attribute.tests \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/in.idl \
1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \
{} \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/out.rdb \
&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
$(SRCDIR)/idlc/test/parser/constant.tests \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/in.idl \
1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \
{} \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/out.rdb \
&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
$(SRCDIR)/idlc/test/parser/constructor.tests \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/in.idl \
1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \
{} \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/out.rdb \
&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
$(SRCDIR)/idlc/test/parser/conversion.tests \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/in.idl \
1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \
{} \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/out.rdb \
&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
$(SRCDIR)/idlc/test/parser/interfaceinheritance.tests \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/in.idl \
1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \
{} \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/out.rdb \
&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
$(SRCDIR)/idlc/test/parser/methodoverload.tests \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/in.idl \
1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \
{} \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/out.rdb \
&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
$(SRCDIR)/idlc/test/parser/oldstyle.tests \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/in.idl \
1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \
{} \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/out.rdb \
&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
$(SRCDIR)/idlc/test/parser/polystruct.tests \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/in.idl \
1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \
{} \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/out.rdb \
&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
$(SRCDIR)/idlc/test/parser/published.tests \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/in.idl \
1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \
{} \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/out.rdb \
&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
$(SRCDIR)/idlc/test/parser/struct.tests \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/in.idl \
1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \
{} \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/out.rdb \
&& $(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
$(SRCDIR)/idlc/test/parser/typedef.tests \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/in.idl \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/in.idl \
1 $(call gb_Executable_get_command,unoidl-write) $(SRCDIR)/udkapi \
{} \
- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb) \
+ $(gb_CustomTarget_workdir)/unoidl/unoidl-write_test/out.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
endif
diff --git a/unoil/CustomTarget_javamaker.mk b/unoil/CustomTarget_javamaker.mk
index 97793d519655..9f4da44e6325 100644
--- a/unoil/CustomTarget_javamaker.mk
+++ b/unoil/CustomTarget_javamaker.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,unoil/javamaker))
-unoil_JAVADIR := $(call gb_CustomTarget_get_workdir,unoil/javamaker)
+unoil_JAVADIR := $(gb_CustomTarget_workdir)/unoil/javamaker
$(call gb_CustomTarget_get_target,unoil/javamaker) : $(unoil_JAVADIR)/done
diff --git a/vcl/CustomTarget_gtk3_kde5_moc.mk b/vcl/CustomTarget_gtk3_kde5_moc.mk
index 06f28de31cfe..15a5a30c2eb7 100644
--- a/vcl/CustomTarget_gtk3_kde5_moc.mk
+++ b/vcl/CustomTarget_gtk3_kde5_moc.mk
@@ -10,12 +10,12 @@
$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/gtk3_kde5))
$(call gb_CustomTarget_get_target,vcl/unx/gtk3_kde5) : \
- $(call gb_CustomTarget_get_workdir,vcl/unx/gtk3_kde5)/kde5_filepicker.moc \
- $(call gb_CustomTarget_get_workdir,vcl/unx/gtk3_kde5)/kde5_filepicker_ipc.moc \
+ $(gb_CustomTarget_workdir)/vcl/unx/gtk3_kde5/kde5_filepicker.moc \
+ $(gb_CustomTarget_workdir)/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.moc \
-$(call gb_CustomTarget_get_workdir,vcl/unx/gtk3_kde5)/%.moc : \
+$(gb_CustomTarget_workdir)/vcl/unx/gtk3_kde5/%.moc : \
$(SRCDIR)/vcl/unx/gtk3_kde5/%.hxx \
- | $(call gb_CustomTarget_get_workdir,vcl/unx/gtk3_kde5)/.dir
+ | $(gb_CustomTarget_workdir)/vcl/unx/gtk3_kde5/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MOC)
$(MOC5) $< -o $@
diff --git a/vcl/CustomTarget_kf5_moc.mk b/vcl/CustomTarget_kf5_moc.mk
index 27e783fad1f8..6180997e2670 100644
--- a/vcl/CustomTarget_kf5_moc.mk
+++ b/vcl/CustomTarget_kf5_moc.mk
@@ -10,11 +10,11 @@
$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kf5))
$(call gb_CustomTarget_get_target,vcl/unx/kf5) : \
- $(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/KFFilePicker.moc
+ $(gb_CustomTarget_workdir)/vcl/unx/kf5/KFFilePicker.moc
-$(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/%.moc : \
+$(gb_CustomTarget_workdir)/vcl/unx/kf5/%.moc : \
$(SRCDIR)/vcl/unx/kf5/%.hxx \
- | $(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/.dir
+ | $(gb_CustomTarget_workdir)/vcl/unx/kf5/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MOC)
$(MOC5) $< -o $@
diff --git a/vcl/CustomTarget_kf6_moc.mk b/vcl/CustomTarget_kf6_moc.mk
index ba0f514cd81a..b42549566955 100644
--- a/vcl/CustomTarget_kf6_moc.mk
+++ b/vcl/CustomTarget_kf6_moc.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kf6))
$(call gb_CustomTarget_get_target,vcl/unx/kf6) : \
- $(call gb_CustomTarget_get_workdir,vcl/unx/kf6)/KFFilePicker.moc
+ $(gb_CustomTarget_workdir)/vcl/unx/kf6/KFFilePicker.moc
# For now, the headers in vcl/unx/kf6 just '#include' the ones
# in 'vcl/unx/kf5'.
@@ -18,9 +18,9 @@ $(call gb_CustomTarget_get_target,vcl/unx/kf6) : \
# it needs to be run on the headers in the kf5 dir.
# That will have to be adapted in case the kf6 VCL plugin
# uses "own" headers
-$(call gb_CustomTarget_get_workdir,vcl/unx/kf6)/%.moc : \
+$(gb_CustomTarget_workdir)/vcl/unx/kf6/%.moc : \
$(SRCDIR)/vcl/unx/kf5/%.hxx \
- | $(call gb_CustomTarget_get_workdir,vcl/unx/kf6)/.dir
+ | $(gb_CustomTarget_workdir)/vcl/unx/kf6/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MOC)
$(MOC6) $< -o $@
diff --git a/vcl/CustomTarget_nativecalc.mk b/vcl/CustomTarget_nativecalc.mk
index 1c6804082a2f..28a880b6e324 100644
--- a/vcl/CustomTarget_nativecalc.mk
+++ b/vcl/CustomTarget_nativecalc.mk
@@ -10,9 +10,9 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/workben))
fuzzer_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
-fuzzer_Native_cxx=$(call gb_CustomTarget_get_workdir,vcl/workben)/native-calc.cxx
+fuzzer_Native_cxx=$(gb_CustomTarget_workdir)/vcl/workben/native-calc.cxx
-$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(call gb_CustomTarget_get_workdir,vcl/workben)/.dir
+$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(gb_CustomTarget_workdir)/vcl/workben/.dir
$(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND) $(SRCDIR)/solenv/bin/native-code.py -g core -g calc) > $@
# vim: set noet sw=4 ts=4:
diff --git a/vcl/CustomTarget_nativecore.mk b/vcl/CustomTarget_nativecore.mk
index 964e7af1a8d3..3eb6589eaf12 100644
--- a/vcl/CustomTarget_nativecore.mk
+++ b/vcl/CustomTarget_nativecore.mk
@@ -10,9 +10,9 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/workben))
fuzzer_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
-fuzzer_Native_cxx=$(call gb_CustomTarget_get_workdir,vcl/workben)/native-core.cxx
+fuzzer_Native_cxx=$(gb_CustomTarget_workdir)/vcl/workben/native-core.cxx
-$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(call gb_CustomTarget_get_workdir,vcl/workben)/.dir
+$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(gb_CustomTarget_workdir)/vcl/workben/.dir
$(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND) $(SRCDIR)/solenv/bin/native-code.py -g core) > $@
# vim: set noet sw=4 ts=4:
diff --git a/vcl/CustomTarget_nativedraw.mk b/vcl/CustomTarget_nativedraw.mk
index 513bf564b909..b849503ff63b 100644
--- a/vcl/CustomTarget_nativedraw.mk
+++ b/vcl/CustomTarget_nativedraw.mk
@@ -10,9 +10,9 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/workben))
fuzzer_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
-fuzzer_Native_cxx=$(call gb_CustomTarget_get_workdir,vcl/workben)/native-draw.cxx
+fuzzer_Native_cxx=$(gb_CustomTarget_workdir)/vcl/workben/native-draw.cxx
-$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(call gb_CustomTarget_get_workdir,vcl/workben)/.dir
+$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(gb_CustomTarget_workdir)/vcl/workben/.dir
$(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND) $(SRCDIR)/solenv/bin/native-code.py -g core -g draw) > $@
# vim: set noet sw=4 ts=4:
diff --git a/vcl/CustomTarget_nativemath.mk b/vcl/CustomTarget_nativemath.mk
index 7465378c184f..2ad6d12d47e6 100644
--- a/vcl/CustomTarget_nativemath.mk
+++ b/vcl/CustomTarget_nativemath.mk
@@ -10,9 +10,9 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/workben))
fuzzer_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
-fuzzer_Native_cxx=$(call gb_CustomTarget_get_workdir,vcl/workben)/native-math.cxx
+fuzzer_Native_cxx=$(gb_CustomTarget_workdir)/vcl/workben/native-math.cxx
-$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(call gb_CustomTarget_get_workdir,vcl/workben)/.dir
+$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(gb_CustomTarget_workdir)/vcl/workben/.dir
$(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND) $(SRCDIR)/solenv/bin/native-code.py -g core -g math) > $@
# vim: set noet sw=4 ts=4:
diff --git a/vcl/CustomTarget_nativewriter.mk b/vcl/CustomTarget_nativewriter.mk
index c396f0f5df2b..fe259ef0fe65 100644
--- a/vcl/CustomTarget_nativewriter.mk
+++ b/vcl/CustomTarget_nativewriter.mk
@@ -10,9 +10,9 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/workben))
fuzzer_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
-fuzzer_Native_cxx=$(call gb_CustomTarget_get_workdir,vcl/workben)/native-writer.cxx
+fuzzer_Native_cxx=$(gb_CustomTarget_workdir)/vcl/workben/native-writer.cxx
-$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(call gb_CustomTarget_get_workdir,vcl/workben)/.dir
+$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(gb_CustomTarget_workdir)/vcl/workben/.dir
$(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND) $(SRCDIR)/solenv/bin/native-code.py -g core -g writer) > $@
# vim: set noet sw=4 ts=4:
diff --git a/vcl/CustomTarget_qt5_moc.mk b/vcl/CustomTarget_qt5_moc.mk
index 136741320e9d..466767d7c075 100644
--- a/vcl/CustomTarget_qt5_moc.mk
+++ b/vcl/CustomTarget_qt5_moc.mk
@@ -10,21 +10,21 @@
$(eval $(call gb_CustomTarget_CustomTarget,vcl/qt5))
$(call gb_CustomTarget_get_target,vcl/qt5) : \
- $(call gb_CustomTarget_get_workdir,vcl/qt5)/QtClipboard.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt5)/QtFilePicker.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt5)/QtFrame.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt5)/QtInstance.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt5)/QtInstanceMessageDialog.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt5)/QtMainWindow.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt5)/QtMenu.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt5)/QtObject.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt5)/QtTimer.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt5)/QtWidget.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt5)/QtXAccessible.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt5/QtClipboard.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt5/QtFilePicker.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt5/QtFrame.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstance.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt5/QtInstanceMessageDialog.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt5/QtMainWindow.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt5/QtMenu.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt5/QtObject.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt5/QtTimer.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt5/QtWidget.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt5/QtXAccessible.moc \
-$(call gb_CustomTarget_get_workdir,vcl/qt5)/%.moc : \
+$(gb_CustomTarget_workdir)/vcl/qt5/%.moc : \
$(SRCDIR)/vcl/inc/qt5/%.hxx \
- | $(call gb_CustomTarget_get_workdir,vcl/qt5)/.dir
+ | $(gb_CustomTarget_workdir)/vcl/qt5/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MOC)
$(MOC5) $< -o $@
diff --git a/vcl/CustomTarget_qt6_moc.mk b/vcl/CustomTarget_qt6_moc.mk
index c544490d4398..7dd7ace45a93 100644
--- a/vcl/CustomTarget_qt6_moc.mk
+++ b/vcl/CustomTarget_qt6_moc.mk
@@ -10,17 +10,17 @@
$(eval $(call gb_CustomTarget_CustomTarget,vcl/qt6))
$(call gb_CustomTarget_get_target,vcl/qt6) : \
- $(call gb_CustomTarget_get_workdir,vcl/qt6)/QtClipboard.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt6)/QtFilePicker.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt6)/QtFrame.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt6)/QtInstance.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt6)/QtInstanceMessageDialog.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt6)/QtMainWindow.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt6)/QtMenu.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt6)/QtObject.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt6)/QtTimer.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt6)/QtWidget.moc \
- $(call gb_CustomTarget_get_workdir,vcl/qt6)/QtXAccessible.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt6/QtClipboard.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt6/QtFilePicker.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt6/QtFrame.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstance.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt6/QtInstanceMessageDialog.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt6/QtMainWindow.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt6/QtMenu.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt6/QtObject.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt6/QtTimer.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt6/QtWidget.moc \
+ $(gb_CustomTarget_workdir)/vcl/qt6/QtXAccessible.moc \
# For now, the headers in vcl/inc/qt6 just '#include' the ones
# in 'vcl/inc/qt5'.
@@ -28,9 +28,9 @@ $(call gb_CustomTarget_get_target,vcl/qt6) : \
# it needs to be run on the headers in the qt5 dir.
# That will have to be adapted in case the qt6 VCL plugin
# uses "own" headers
-$(call gb_CustomTarget_get_workdir,vcl/qt6)/%.moc : \
+$(gb_CustomTarget_workdir)/vcl/qt6/%.moc : \
$(SRCDIR)/vcl/inc/qt5/%.hxx \
- | $(call gb_CustomTarget_get_workdir,vcl/qt6)/.dir
+ | $(gb_CustomTarget_workdir)/vcl/qt6/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MOC)
$(MOC6) $< -o $@
diff --git a/winaccessibility/CustomTarget_ia2_idl.mk b/winaccessibility/CustomTarget_ia2_idl.mk
index 364e6b625719..c30f16cc7ff8 100644
--- a/winaccessibility/CustomTarget_ia2_idl.mk
+++ b/winaccessibility/CustomTarget_ia2_idl.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,winaccessibility/ia2/idl))
iaccessible2_DIR := $(call gb_UnpackedTarball_get_dir,IAccessible2)
-wina11y_COMIDLDIR := $(call gb_CustomTarget_get_workdir,winaccessibility/ia2/idl)
+wina11y_COMIDLDIR := $(gb_CustomTarget_workdir)/winaccessibility/ia2/idl
wina11y_SOURCE := $(SRCDIR)/winaccessibility/source/UAccCOMIDL
# We cannot depend on *.tlb because they only produced by IDL compiler
diff --git a/wizards/CustomTarget_share.mk b/wizards/CustomTarget_share.mk
index 1c4ce3391167..80dbfa5b039e 100644
--- a/wizards/CustomTarget_share.mk
+++ b/wizards/CustomTarget_share.mk
@@ -10,12 +10,12 @@
$(eval $(call gb_CustomTarget_CustomTarget,wizards/share))
$(call gb_CustomTarget_get_target,wizards/share): \
- $(call gb_CustomTarget_get_workdir,wizards/share)/dialog.xlc \
- $(call gb_CustomTarget_get_workdir,wizards/share)/script.xlc
+ $(gb_CustomTarget_workdir)/wizards/share/dialog.xlc \
+ $(gb_CustomTarget_workdir)/wizards/share/script.xlc
-$(call gb_CustomTarget_get_workdir,wizards/share)/%.xlc: \
+$(gb_CustomTarget_workdir)/wizards/share/%.xlc: \
$(SRCDIR)/wizards/source/configshare/%.xlc \
- | $(call gb_CustomTarget_get_workdir,wizards/share)/.dir
+ | $(gb_CustomTarget_workdir)/wizards/share/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED)
sed -e 's/@LIBO_SHARE_FOLDER@/$(LIBO_SHARE_FOLDER)/' $< > $@
diff --git a/wizards/CustomTarget_wizards.mk b/wizards/CustomTarget_wizards.mk
index f8d88b4283de..6b18ae11db69 100644
--- a/wizards/CustomTarget_wizards.mk
+++ b/wizards/CustomTarget_wizards.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,wizards/locproperties))
-wizards_DIR := $(call gb_CustomTarget_get_workdir,wizards/locproperties)
+wizards_DIR := $(gb_CustomTarget_workdir)/wizards/locproperties
define wizards_Properties_Properties
$(call wizards_Properties__Properties_impl,$(wizards_DIR)/resources_$(1).properties,$(SRCDIR)/wizards/source/resources/resources_en_US.properties,$(gb_POLOCATION)/$(2)/wizards/source/resources.po,$(2))
diff --git a/wizards/Package_share.mk b/wizards/Package_share.mk
index b986041e04ea..a502a52cd4c2 100644
--- a/wizards/Package_share.mk
+++ b/wizards/Package_share.mk
@@ -17,7 +17,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-$(eval $(call gb_Package_Package,wizards_basicshare,$(call gb_CustomTarget_get_workdir,wizards/share)))
+$(eval $(call gb_Package_Package,wizards_basicshare,$(gb_CustomTarget_workdir)/wizards/share))
$(eval $(call gb_Package_add_files,wizards_basicshare,$(LIBO_SHARE_FOLDER)/basic,\
dialog.xlc \
diff --git a/wizards/Package_wizards_properties.mk b/wizards/Package_wizards_properties.mk
index d687f2cfc7d1..0754aec4b836 100644
--- a/wizards/Package_wizards_properties.mk
+++ b/wizards/Package_wizards_properties.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,wizards_properties,$(call gb_CustomTarget_get_workdir,wizards/locproperties)))
+$(eval $(call gb_Package_Package,wizards_properties,$(gb_CustomTarget_workdir)/wizards/locproperties))
$(eval $(call gb_Package_add_files,wizards_properties,$(LIBO_SHARE_FOLDER)/wizards,\
$(foreach lang,$(subst -,_,$(wizards_LANGS)),resources_$(lang).properties) \
diff --git a/xmloff/CustomTarget_generated.mk b/xmloff/CustomTarget_generated.mk
index fe135c2b37b8..e0949f80853b 100644
--- a/xmloff/CustomTarget_generated.mk
+++ b/xmloff/CustomTarget_generated.mk
@@ -11,8 +11,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,xmloff/generated))
#Generates a hashtable for the odf-tags
xmloff_SRC := $(SRCDIR)/xmloff/source/token
-xmloff_MISC := $(call gb_CustomTarget_get_workdir,xmloff/generated)/misc
-xmloff_INC := $(call gb_CustomTarget_get_workdir,xmloff/generated)
+xmloff_MISC := $(gb_CustomTarget_workdir)/xmloff/generated/misc
+xmloff_INC := $(gb_CustomTarget_workdir)/xmloff/generated
xmloff_GENHEADERPATH := $(xmloff_INC)/xmloff/token
$(eval $(call gb_CustomTarget_token_hash,xmloff/generated,tokenhash.inc,tokenhash.gperf))