Skip to content

Commit 0c4c84a

Browse files
clophcloph
committed
makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)
…by a simple/static $(gb_CustomTarget_workdir)/foo The build system has a lot of overly complicated leftovers from when it was introduced and had not only deal with split repositories but also had to coexist with another buildsystem. Along with lots of copy'n'paste along the years the makefiles became hard to grasp for newcomers with all our calls and evals. As a first step to streamline that, the macros from TargetLocations that simply prefix a static path to the argument (and similar of the same kind) are a natural pick before simplifying the rules themselves/getting rid of a bunch of eval statements. Change-Id: Ia06dbbcd5d1994755a2ff05b84f72ccbc4e3cab5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167005 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]>
1 parent d19b79e commit 0c4c84a

File tree

155 files changed

+531
-530
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+531
-530
lines changed

‎android/CustomTarget_lo_android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
$(eval $(call gb_CustomTarget_CustomTarget,android/loandroid3))
1010

11-
loandroid3_DIR := $(call gb_CustomTarget_get_workdir,android/source)
11+
loandroid3_DIR := $(gb_CustomTarget_workdir)/android/source
1212

1313
$(call gb_CustomTarget_get_target,android/loandroid3) : \
1414
$(loandroid3_DIR)/done

‎bridges/CustomTarget_gcc3_linux_arm.mk

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
$(eval $(call gb_CustomTarget_CustomTarget,bridges/source/cpp_uno/gcc3_linux_arm))
1111

1212
$(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_linux_arm) : \
13-
$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
13+
$(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.objectlist
1414

15-
$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o : \
15+
$(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.o : \
1616
$(SRCDIR)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S \
17-
| $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/.dir
17+
| $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/.dir
1818
$(gb_CXX) -c -o $@ $< -fPIC
1919

20-
$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist : \
21-
$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.o \
22-
| $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/.dir
20+
$(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.objectlist : \
21+
$(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.o \
22+
| $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/.dir
2323
echo $< > $@
2424

2525
# vim: set noet sw=4 ts=4:

‎bridges/Library_cpp_uno.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ bridges_SELECTED_BRIDGE := gcc3_linux_arm
1616
bridge_noopt_objects := cpp2uno except uno2cpp
1717
# HACK
1818
$(call gb_Library_get_linktarget_target,gcc3_uno) : \
19-
$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
19+
$(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.objectlist
2020
$(call gb_Library_get_linktarget_target,gcc3_uno) : \
21-
EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
21+
EXTRAOBJECTLISTS += $(gb_CustomTarget_workdir)/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.objectlist
2222
endif
2323

2424
else ifeq ($(CPUNAME),AARCH64)

‎cli_ure/CustomTarget_cli_ure_assemblies.mk

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@ include $(SRCDIR)/cli_ure/version/version.txt
1414
$(eval $(call gb_CustomTarget_CustomTarget,cli_ure/source))
1515

1616
$(call gb_CustomTarget_get_target,cli_ure/source) : \
17-
$(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs \
18-
$(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx \
19-
$(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs
17+
$(gb_CustomTarget_workdir)/cli_ure/source/basetypes/assembly.cs \
18+
$(gb_CustomTarget_workdir)/cli_ure/source/native/assembly.cxx \
19+
$(gb_CustomTarget_workdir)/cli_ure/source/ure/assembly.cs
2020

21-
$(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs : \
21+
$(gb_CustomTarget_workdir)/cli_ure/source/basetypes/assembly.cs : \
2222
$(SRCDIR)/cli_ure/source/basetypes/assembly.cs \
2323
$(SRCDIR)/cli_ure/version/version.txt \
2424
$(cli_ure_source_MAKEFILE) \
25-
| $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/.dir
25+
| $(gb_CustomTarget_workdir)/cli_ure/source/basetypes/.dir
2626
sed -e "s/@CLI_BASETYPES_NEW_VERSION@/$(CLI_BASETYPES_NEW_VERSION)/g" $< > $@
2727

28-
$(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx : \
28+
$(gb_CustomTarget_workdir)/cli_ure/source/native/assembly.cxx : \
2929
$(SRCDIR)/cli_ure/source/native/assembly.cxx \
3030
$(SRCDIR)/cli_ure/version/version.txt \
3131
$(cli_ure_source_MAKEFILE) \
32-
| $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/.dir
32+
| $(gb_CustomTarget_workdir)/cli_ure/source/native/.dir
3333
sed -e "s/@CLI_CPPUHELPER_NEW_VERSION@/$(CLI_CPPUHELPER_NEW_VERSION)/g" $< > $@
3434

35-
$(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \
35+
$(gb_CustomTarget_workdir)/cli_ure/source/ure/assembly.cs : \
3636
$(SRCDIR)/cli_ure/source/ure/assembly.cs \
3737
$(SRCDIR)/cli_ure/version/version.txt \
3838
$(cli_ure_source_MAKEFILE) \
39-
| $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/.dir
39+
| $(gb_CustomTarget_workdir)/cli_ure/source/ure/.dir
4040
sed -e "s/@CLI_URE_NEW_VERSION@/$(CLI_URE_NEW_VERSION)/g" $< > $@
4141

4242
# vim: set noet sw=4 ts=4:

‎desktop/CustomTarget_desktop_unopackages_install.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
$(eval $(call gb_CustomTarget_CustomTarget,desktop/unopackages_install))
1111

1212
$(call gb_CustomTarget_get_target,desktop/unopackages_install) : | \
13-
$(call gb_CustomTarget_get_workdir,desktop/unopackages_install)/uno_packages/cache/uno_packages
13+
$(gb_CustomTarget_workdir)/desktop/unopackages_install/uno_packages/cache/uno_packages
1414

15-
$(call gb_CustomTarget_get_workdir,desktop/unopackages_install)/uno_packages/cache/uno_packages : | \
16-
$(call gb_CustomTarget_get_workdir,desktop/unopackages_install)/.dir
15+
$(gb_CustomTarget_workdir)/desktop/unopackages_install/uno_packages/cache/uno_packages : | \
16+
$(gb_CustomTarget_workdir)/desktop/unopackages_install/.dir
1717
mkdir -p $@
1818

1919
# vim: set noet sw=4 ts=4:

‎desktop/CustomTarget_soffice.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ endif
2727
else
2828

2929
$(call gb_CustomTarget_get_target,desktop/soffice) : \
30-
$(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh
30+
$(gb_CustomTarget_workdir)/desktop/soffice/soffice.sh
3131

32-
$(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh : \
32+
$(gb_CustomTarget_workdir)/desktop/soffice/soffice.sh : \
3333
$(SRCDIR)/desktop/scripts/soffice.sh \
3434
$(BUILDDIR)/config_host.mk \
35-
| $(call gb_CustomTarget_get_workdir,desktop/soffice)/.dir
35+
| $(gb_CustomTarget_workdir)/desktop/soffice/.dir
3636
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
3737
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED)
3838
ifneq ($(JITC_PROCESSOR_TYPE),)

‎desktop/Executable_soffice_bin.mk

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ $(eval $(call gb_Executable_add_cobjects,soffice_bin,\
2828
))
2929

3030
ifeq ($(OS),EMSCRIPTEN)
31-
$(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
31+
$(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,soffice_bin)) : $(gb_CustomTarget_workdir)/static/emscripten_fs_image/soffice.data.js.link
3232

3333
# don't sort; later can override previous settings!
3434
$(eval $(call gb_Executable_add_prejs,soffice_bin,$(SRCDIR)/static/emscripten/environment.js))
35-
$(eval $(call gb_Executable_add_prejs,soffice_bin,$(call gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.link))
35+
$(eval $(call gb_Executable_add_prejs,soffice_bin,$(gb_CustomTarget_workdir)/static/emscripten_fs_image/soffice.data.js.link))
3636
ifeq ($(ENABLE_QT5),TRUE)
3737
$(eval $(call gb_Executable_add_prejs,soffice_bin,$(SRCDIR)/static/emscripten/soffice_args.js))
3838
endif
@@ -74,11 +74,11 @@ endif
7474
ifneq ($(ENABLE_DBGUTIL),)
7575

7676
$(call gb_Executable_get_linktarget_target,soffice_bin): \
77-
$(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.js \
77+
$(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \
7878
$(SRCDIR)/unotest/source/embindtest/embindtest.js
7979

8080
$(eval $(call gb_Executable_add_ldflags,soffice_bin, \
81-
--post-js $(call gb_CustomTarget_get_workdir,static/unoembind)/bindings_uno.js \
81+
--post-js $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \
8282
--post-js $(SRCDIR)/unotest/source/embindtest/embindtest.js \
8383
))
8484

‎desktop/GeneratedPackage_desktop_unopackages_install.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
88
#
99

10-
$(eval $(call gb_GeneratedPackage_GeneratedPackage,desktop_unopackages_install,$(call gb_CustomTarget_get_workdir,desktop/unopackages_install)))
10+
$(eval $(call gb_GeneratedPackage_GeneratedPackage,desktop_unopackages_install,$(gb_CustomTarget_workdir)/desktop/unopackages_install))
1111

1212
$(eval $(call gb_GeneratedPackage_use_customtarget,desktop_unopackages_install,desktop/unopackages_install))
1313

‎desktop/Package_soffice_sh.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
88
#
99

10-
$(eval $(call gb_Package_Package,desktop_soffice_sh,$(call gb_CustomTarget_get_workdir,desktop/soffice)))
10+
$(eval $(call gb_Package_Package,desktop_soffice_sh,$(gb_CustomTarget_workdir)/desktop/soffice))
1111

1212
$(eval $(call gb_Package_add_file,desktop_soffice_sh,$(LIBO_BIN_FOLDER)/soffice,soffice.sh))
1313

‎editeng/CustomTarget_generated.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,editeng/generated))
1111

1212
editeng_SRC := $(SRCDIR)/editeng/source/misc
1313
editeng_PY := $(SRCDIR)/solenv/bin/gentoken.py
14-
editeng_INC := $(call gb_CustomTarget_get_workdir,editeng/generated)
14+
editeng_INC := $(gb_CustomTarget_workdir)/editeng/generated
1515

1616
$(editeng_INC)/tokens.hxx $(editeng_INC)/tokens.gperf : $(editeng_SRC)/tokens.txt $(editeng_PY) \
1717
$(call gb_ExternalExecutable_get_dependencies,python)

‎extensions/CustomTarget_automationtest.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
$(eval $(call gb_CustomTarget_CustomTarget,extensions/automationtest))
1111

12-
extensions_AUTOMATIONTESTDIR := $(call gb_CustomTarget_get_workdir,extensions/automationtest)
12+
extensions_AUTOMATIONTESTDIR := $(gb_CustomTarget_workdir)/extensions/automationtest
1313

1414
extensions_AUTOMATIONTESTLOG1 := $(extensions_AUTOMATIONTESTDIR)/automationtest.1.log
1515
extensions_AUTOMATIONTESTLOG2 := $(extensions_AUTOMATIONTESTDIR)/automationtest.2.log

‎extensions/CustomTarget_so_activex_idl.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex/idl))
1111

12-
extensions_AXIDLDIR := $(call gb_CustomTarget_get_workdir,extensions/source/activex/idl)
12+
extensions_AXIDLDIR := $(gb_CustomTarget_workdir)/extensions/source/activex/idl
1313

1414
$(call gb_CustomTarget_get_target,extensions/source/activex/idl) : \
1515
$(extensions_AXIDLDIR)/so_activex.tlb

‎extensions/CustomTarget_so_activex_x64.mk

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex))
1111

1212
$(call gb_CustomTarget_get_target,extensions/source/activex) : \
13-
$(call gb_CustomTarget_get_workdir,extensions/source/activex)/SOActionsApproval.cxx \
14-
$(call gb_CustomTarget_get_workdir,extensions/source/activex)/SOActiveX.cxx \
15-
$(call gb_CustomTarget_get_workdir,extensions/source/activex)/SOComWindowPeer.cxx \
16-
$(call gb_CustomTarget_get_workdir,extensions/source/activex)/SODispatchInterceptor.cxx \
17-
$(call gb_CustomTarget_get_workdir,extensions/source/activex)/StdAfx2.cxx \
18-
$(call gb_CustomTarget_get_workdir,extensions/source/activex)/so_activex.cxx \
13+
$(gb_CustomTarget_workdir)/extensions/source/activex/SOActionsApproval.cxx \
14+
$(gb_CustomTarget_workdir)/extensions/source/activex/SOActiveX.cxx \
15+
$(gb_CustomTarget_workdir)/extensions/source/activex/SOComWindowPeer.cxx \
16+
$(gb_CustomTarget_workdir)/extensions/source/activex/SODispatchInterceptor.cxx \
17+
$(gb_CustomTarget_workdir)/extensions/source/activex/StdAfx2.cxx \
18+
$(gb_CustomTarget_workdir)/extensions/source/activex/so_activex.cxx \
1919

20-
$(call gb_CustomTarget_get_workdir,extensions/source/activex)/% : \
20+
$(gb_CustomTarget_workdir)/extensions/source/activex/% : \
2121
$(SRCDIR)/extensions/source/activex/% \
22-
| $(call gb_CustomTarget_get_workdir,extensions/source/activex)/.dir
22+
| $(gb_CustomTarget_workdir)/extensions/source/activex/.dir
2323
cp $< $@
2424

2525
# vim:set shiftwidth=4 tabstop=4 noexpandtab:

‎external/onlineupdate/CustomTarget_generated.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
$(eval $(call gb_CustomTarget_CustomTarget,external/onlineupdate/generated))
1111

12-
onlineupdate_INC := $(call gb_CustomTarget_get_workdir,external/onlineupdate/generated)
12+
onlineupdate_INC := $(gb_CustomTarget_workdir)/external/onlineupdate/generated
1313

1414
$(onlineupdate_INC)/primaryCert.h $(onlineupdate_INC)/secondaryCert.h : \
1515
$(call gb_ExternalExecutable_get_dependencies,python) \

‎extras/AllLangPackage_autotextshare.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
88
#
99

10-
$(eval $(call gb_AllLangPackage_AllLangPackage,autotextshare,$(call gb_CustomTarget_get_workdir,extras/source/autotext)))
10+
$(eval $(call gb_AllLangPackage_AllLangPackage,autotextshare,$(gb_CustomTarget_workdir)/extras/source/autotext))
1111

1212
$(eval $(call gb_AllLangPackage_add_files,autotextshare,$(LIBO_SHARE_FOLDER)/autotext,\
1313
af/standard.bau \

‎extras/CustomTarget_autocorr.mk

+6-6
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ extras_AUTOCORR_XMLFILES := \
245245
# param: shortlang
246246
extras_AUTOCORR_XMLFILES_LANG = $(subst $(1)/,,$(filter $(1)/%,$(extras_AUTOCORR_XMLFILES)))
247247

248-
$(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%/mimetype : \
249-
| $(dir $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%/mimetype).dir
248+
$(gb_CustomTarget_workdir)/extras/source/autocorr/%/mimetype : \
249+
| $(dir $(gb_CustomTarget_workdir)/extras/source/autocorr/%/mimetype).dir
250250
$(call gb_Output_announce,autocorr/$*/mimetype,$(true),TCH,1)
251251
$(call gb_Trace_StartRange,autocorr/$*/mimetype,TCH)
252252
touch $@
@@ -256,9 +256,9 @@ $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%/mimetype : \
256256
# secondexpansion since the pattern not just covers a file, but also a directory portion with
257257
# different number of elements (just the lang or lang/META-INF) and thus the directory dependency
258258
# needs the stem of the actual target to work as intended
259-
$(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%.xml : $(SRCDIR)/extras/source/autocorr/lang/%.xml \
259+
$(gb_CustomTarget_workdir)/extras/source/autocorr/%.xml : $(SRCDIR)/extras/source/autocorr/lang/%.xml \
260260
| $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
261-
$$(dir $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/$$*.xml).dir
261+
$$(dir $(gb_CustomTarget_workdir)/extras/source/autocorr/$$*.xml).dir
262262
$(call gb_Output_announce,autocorr/$*.xml,$(true),XSL,1)
263263
$(call gb_Trace_StartRange,autocorr/$*.xml,XSL)
264264
$(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
269269
# allows the actual stem from the target to be used in the macro calls
270270
# there's no reason for the different directories though, so a janitorial cleanup would be
271271
# TODO: get rid of the shortform:longform language names when assembling the autocorr files
272-
$(call gb_CustomTarget_get_workdir,extras/source/autocorr)/acor_%.dat : \
272+
$(gb_CustomTarget_workdir)/extras/source/autocorr/acor_%.dat : \
273273
$$(addprefix \
274-
$(call gb_CustomTarget_get_workdir,extras/source/autocorr)/$$(call extras_AUTOCORR_SHORTLANG,$$*)/,\
274+
$(gb_CustomTarget_workdir)/extras/source/autocorr/$$(call extras_AUTOCORR_SHORTLANG,$$*)/,\
275275
mimetype \
276276
$$(call extras_AUTOCORR_XMLFILES_LANG,$$(call extras_AUTOCORR_SHORTLANG,$$*))) \
277277
| $(call gb_ExternalExecutable_get_dependencies,python)

‎extras/CustomTarget_autotextshare.mk

+8-8
Original file line numberDiff line numberDiff line change
@@ -3637,31 +3637,31 @@ extras_AUTOTEXTSHARE_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras
36373637
.SECONDEXPANSION:
36383638
# secondexpansion since the patterns not just cover a filename portion, but also include a
36393639
# directory portion withdifferent number of elements
3640-
$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%/mimetype : \
3641-
| $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext)/$$*/mimetype).dir
3640+
$(gb_CustomTarget_workdir)/extras/source/autotext/%/mimetype : \
3641+
| $$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/$$*/mimetype).dir
36423642
$(call gb_Output_announce,autotext/$*/mimetype,$(true),TCH,1)
36433643
$(call gb_Trace_StartRange,autotext/$*/mimetype,TCH)
36443644
touch $@
36453645
$(call gb_Trace_EndRange,autotext/$*/mimetype,TCH)
36463646

36473647
# rule for *.rdf, *.svm, *.png, …
3648-
$(call gb_CustomTarget_get_workdir,extras/source/autotext)/% : $(SRCDIR)/extras/source/autotext/lang/% \
3649-
| $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext)/$$*).dir
3648+
$(gb_CustomTarget_workdir)/extras/source/autotext/% : $(SRCDIR)/extras/source/autotext/lang/% \
3649+
| $$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/$$*).dir
36503650
$(call gb_Output_announce,autotext/$*,$(true),CPY,1)
36513651
$(call gb_Trace_StartRange,autotext/$*,CPY)
36523652
cp $< $@
36533653
$(call gb_Trace_EndRange,autotext/$*,CPY)
36543654

3655-
$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.xml : $(SRCDIR)/extras/source/autotext/lang/%.xml \
3655+
$(gb_CustomTarget_workdir)/extras/source/autotext/%.xml : $(SRCDIR)/extras/source/autotext/lang/%.xml \
36563656
| $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
3657-
$$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext)/$$*.xml).dir
3657+
$$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/$$*.xml).dir
36583658
$(call gb_Output_announce,autotext/$*.xml,$(true),XSL,1)
36593659
$(call gb_Trace_StartRange,autotext/$*.xml,XSL)
36603660
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
36613661
$(call gb_Trace_EndRange,autotext/$*.xml,XSL)
36623662

3663-
$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.bau : \
3664-
$$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/autotext)/$$*/,\
3663+
$(gb_CustomTarget_workdir)/extras/source/autotext/%.bau : \
3664+
$$(addprefix $(gb_CustomTarget_workdir)/extras/source/autotext/$$*/,\
36653665
mimetype $$(call extras_AUTOTEXTSHARE_XMLFILES_RELATIVE,$$*))
36663666
$(call gb_Output_announce,autotext/$*.bau,$(true),ZIP,2)
36673667
$(call gb_Trace_StartRange,autotext/$*.bau,ZIP)

‎extras/CustomTarget_autotextuser.mk

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@ extras_AUTOTEXTUSER_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_
1919
.SECONDEXPANSION:
2020
# secondexpansion since the patterns not just cover a filename portion, but also include a
2121
# directory portion withdifferent number of elements
22-
$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%/mimetype : \
23-
| $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/$$*/mimetype).dir
22+
$(gb_CustomTarget_workdir)/extras/source/autotext/user/%/mimetype : \
23+
| $$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/user/$$*/mimetype).dir
2424
$(call gb_Output_announce,autotext/user/$*/mimetype,$(true),TCH,1)
2525
$(call gb_Trace_StartRange,autotext/user/$*/mimetype,TCH)
2626
touch $@
2727
$(call gb_Trace_EndRange,autotext/user/$*/mimetype,TCH)
2828

29-
$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.xml : $(SRCDIR)/extras/source/autotext/%.xml \
29+
$(gb_CustomTarget_workdir)/extras/source/autotext/user/%.xml : $(SRCDIR)/extras/source/autotext/%.xml \
3030
| $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
31-
$$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/$$*.xml).dir
31+
$$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/user/$$*.xml).dir
3232
$(call gb_Output_announce,autotext/user/$*.xml,$(true),XSL,1)
3333
$(call gb_Trace_StartRange,autotext/user/$*.xml,XSL)
3434
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
3535
$(call gb_Trace_EndRange,autotext/user/$*.xml,XSL)
3636

37-
$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.bau : \
38-
$$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/$$*/,\
37+
$(gb_CustomTarget_workdir)/extras/source/autotext/user/%.bau : \
38+
$$(addprefix $(gb_CustomTarget_workdir)/extras/source/autotext/user/$$*/,\
3939
mimetype $$(call extras_AUTOTEXTUSER_XMLFILES_RELATIVE,$$*))
4040
$(call gb_Output_announce,autotext/user/$*.bau,$(true),ZIP,2)
4141
$(call gb_Trace_StartRange,autotext/user/$*.bau,ZIP)

‎extras/CustomTarget_gallsystem.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ $(eval $(call gb_CustomTarget_register_targets,extras/gallsysstr,\
1515
))
1616

1717
$(eval $(call gb_CustomTarget_ulfex_rule,\
18-
$(call gb_CustomTarget_get_workdir,extras/gallsysstr)/extras_gallsystem.ulf,\
18+
$(gb_CustomTarget_workdir)/extras/gallsysstr/extras_gallsystem.ulf,\
1919
$(SRCDIR)/extras/source/gallery/share/gallery_names.ulf,\
2020
$(foreach lang,$(gb_TRANS_LANGS),\
2121
$(gb_POLOCATION)/$(lang)/extras/source/gallery/share.po)))
2222

2323
# desktop-translate.py is ugly af/doesn't play nice with make dependencies.
2424
# It expects the target filename to exist and modifies it, so do the hack with own
2525
# temporary dir
26-
$(call gb_CustomTarget_get_workdir,extras/gallsysstr)/%.str : \
27-
$(call gb_CustomTarget_get_workdir,extras/gallsysstr)/extras_gallsystem.ulf \
26+
$(gb_CustomTarget_workdir)/extras/gallsysstr/%.str : \
27+
$(gb_CustomTarget_workdir)/extras/gallsysstr/extras_gallsystem.ulf \
2828
$(SRCDIR)/extras/source/gallery/gallery_system/dummy.str \
2929
$(call gb_ExternalExecutable_get_dependencies,python) \
3030
$(SRCDIR)/solenv/bin/desktop-translate.py

0 commit comments

Comments
 (0)