strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)

Browse source 
…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 <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Christian Lohmaier 2024-05-02 11:19:38 +02:00
parent d19b79e4b4
commit 0c4c84a14b
155 changed files with 531 additions and 530 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/CustomTarget_lo_android.mk
View file

@ -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

12
bridges/CustomTarget_gcc3_linux_arm.mk
View file

@ -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:

4
bridges/Library_cpp_uno.mk
View file

@ -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)

18
cli_ure/CustomTarget_cli_ure_assemblies.mk
View file

@ -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:

6
desktop/CustomTarget_desktop_unopackages_install.mk
View file

@ -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:

6
desktop/CustomTarget_soffice.mk
View file

@ -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),)

8
desktop/Executable_soffice_bin.mk
View file

@ -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 \
))

2
desktop/GeneratedPackage_desktop_unopackages_install.mk
View file

@ -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))

2
desktop/Package_soffice_sh.mk
View file

@ -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))

2
editeng/CustomTarget_generated.mk
View file

@ -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)

2
extensions/CustomTarget_automationtest.mk
View file

@ -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

2
extensions/CustomTarget_so_activex_idl.mk
View file

@ -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

16
extensions/CustomTarget_so_activex_x64.mk
View file

@ -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:

2
external/onlineupdate/CustomTarget_generated.mk vendored
View file

@ -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) \

2
extras/AllLangPackage_autotextshare.mk
View file

@ -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 \

12
extras/CustomTarget_autocorr.mk
View file

@ -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)

16
extras/CustomTarget_autotextshare.mk
View file

@ -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)

12
extras/CustomTarget_autotextuser.mk
View file

@ -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)

6
extras/CustomTarget_gallsystem.mk
View file

@ -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

2
extras/CustomTarget_glade.mk
View file

@ -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)

4
extras/CustomTarget_opensymbol.mk
View file

@ -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

30
extras/CustomTarget_templates.mk
View file

@ -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)

20
extras/CustomTarget_tplpresnt.mk
View file

@ -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)

32
extras/CustomTarget_tplwizard.mk
View file

@ -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)

2
extras/Package_autocorr.mk
View file

@ -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 \

2
extras/Package_autotextuser.mk
View file

@ -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 \

2
extras/Package_fonts.mk
View file

@ -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))

2
extras/Package_gallsystemstr.mk
View file

@ -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,\

2
extras/Package_glade.mk
View file

@ -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))

2
extras/Package_resource_fonts.mk
View file

@ -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))

2
extras/Package_templates.mk
View file

@ -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 \

2
extras/Package_tplpresnt.mk
View file

@ -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 \

2
extras/Package_tplwizard.mk
View file

@ -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 \

2
filter/CustomTarget_svg.mk
View file

@ -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

2
i18npool/CustomTarget_breakiterator.mk
View file

@ -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

2
i18npool/CustomTarget_collator.mk
View file

@ -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, \

6
i18npool/CustomTarget_indexentry.mk
View file

@ -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, \

8
i18npool/CustomTarget_localedata.mk
View file

@ -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:

6
i18npool/CustomTarget_textconversion.mk
View file

@ -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, \

12
i18npool/Library_i18npool.mk
View file

@ -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 \

46
instsetoo_native/CustomTarget_install.mk
View file

@ -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 \

38
instsetoo_native/CustomTarget_setup.mk
View file

@ -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))

2
instsetoo_native/Package_setup.mk
View file

@ -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) \

2
instsetoo_native/Package_setup_ure.mk
View file

@ -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) \

6
jvmfwk/CustomTarget_jreproperties.mk
View file

@ -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, \

2
jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk
View file

@ -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)

2
jvmfwk/Package_jreproperties.mk
View file

@ -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))

2
jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk
View file

@ -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) \

2
librelogo/CustomTarget_librelogo.mk
View file

@ -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))

2
librelogo/Package_librelogo_properties.mk
View file

@ -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) \

2
odk/CustomTarget_allheaders.mk
View file

@ -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

4
odk/CustomTarget_check.mk
View file

@ -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 \

2
odk/CustomTarget_classes.mk
View file

@ -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 $@

2
odk/CustomTarget_config_win.mk
View file

@ -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:

16
odk/CustomTarget_doxygen.mk
View file

@ -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)

2
odk/CustomTarget_html.mk
View file

@ -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' \

12
odk/CustomTarget_javadoc.mk
View file

@ -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)

2
odk/CustomTarget_settings.mk
View file

@ -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)))/' \

2
odk/GeneratedPackage_odk_doxygen.mk
View file

@ -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))

2
odk/GeneratedPackage_odk_javadoc.mk
View file

@ -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,.))

2
odk/GeneratedPackage_uno_loader_classes.mk
View file

@ -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))

2
odk/Package_config_win.mk
View file

@ -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)))

2
odk/Package_html.mk
View file

@ -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)))

2
odk/Package_settings_generated.mk
View file

@ -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)))

2
odk/Package_share_readme.mk
View file

@ -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)))

16
odk/build-examples_common.mk
View file

@ -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))

6
officecfg/CustomTarget_registry.mk
View file

@ -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)

2
oox/CustomTarget_generated.mk
View file

@ -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 \

2
oox/Package_generated.mk
View file

@ -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 \

2
postprocess/CustomTarget_check_dynamic_objects.mk
View file

@ -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)

2
postprocess/CustomTarget_components.mk
View file

@ -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 \

8
postprocess/CustomTarget_fontconfig.mk
View file

@ -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)),)

2
postprocess/CustomTarget_images.mk
View file

@ -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) \

36
postprocess/CustomTarget_registry.mk
View file

@ -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'/>) \

4
postprocess/CustomTarget_signing.mk
View file

@ -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)

2
postprocess/Package_fontconfig.mk
View file

@ -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 \

2
postprocess/Package_images.mk
View file

@ -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) \

6
pyuno/CustomTarget_python_shell.mk
View file

@ -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)

2
pyuno/CustomTarget_pyuno_pythonloader_ini.mk
View file

@ -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)

2
pyuno/Package_python_shell.mk
View file

@ -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))

2
pyuno/Package_pyuno_pythonloader_ini.mk
View file

@ -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) \

2
readlicense_oo/CustomTarget_license.mk
View file

@ -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

2
readlicense_oo/CustomTarget_readme.mk
View file

@ -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 ;-)

2
readlicense_oo/Package_license.mk
View file

@ -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))

2
readlicense_oo/Package_readlicense_oo_readmes.mk
View file

@ -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))) \

2
ridljar/CustomTarget_javamaker.mk
View file

@ -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

2
ridljar/CustomTarget_test_urp.mk
View file

@ -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

4
ridljar/Jar_libreoffice.mk
View file

@ -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) \
))

2
ridljar/JunitTest_bridgefactory.mk
View file

@ -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 \

2
ridljar/JunitTest_connections.mk
View file

@ -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 \

2
ridljar/JunitTest_java.mk
View file

@ -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 \

2
ridljar/JunitTest_java_remote.mk
View file

@ -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 \

2
ridljar/JunitTest_remote.mk
View file

@ -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 \

2
ridljar/JunitTest_urp.mk
View file

@ -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 \

6
scp2/CustomTarget_langmacros.mk
View file

@ -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)' && \

6
sdext/CustomTarget_pdfimport.mk
View file

@ -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)$$' $<) > $@

2
setup_native/CustomTarget_mac.mk
View file

@ -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)))

2
setup_native/CustomTarget_scripts.mk
View file

@ -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))

2
setup_native/CustomTarget_spell.mk
View file

@ -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:

2
sfx2/CustomTarget_classification.mk
View file

@ -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)

Some files were not shown because too many files have changed in this diff Show more