summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/CustomTarget_generated.mk2
-rw-r--r--sw/CustomTarget_source.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/CustomTarget_generated.mk b/sw/CustomTarget_generated.mk
index e804e1590d49..ca59842fd582 100644
--- a/sw/CustomTarget_generated.mk
+++ b/sw/CustomTarget_generated.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,sw/generated))
sw_SRC := $(SRCDIR)/sw/source/core/swg
sw_PY := $(SRCDIR)/solenv/bin/gentoken.py
-sw_INC := $(call gb_CustomTarget_get_workdir,sw/generated)
+sw_INC := $(gb_CustomTarget_workdir)/sw/generated
# static pattern rule
$(sw_INC)/TextBlockTokens.gperf \
diff --git a/sw/CustomTarget_source.mk b/sw/CustomTarget_source.mk
index ca3c471c5e5f..d69d981e5e98 100644
--- a/sw/CustomTarget_source.mk
+++ b/sw/CustomTarget_source.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,sw/source/writerfilter))
-writerfilter_WORK := $(call gb_CustomTarget_get_workdir,sw/source/writerfilter)
+writerfilter_WORK := $(gb_CustomTarget_workdir)/sw/source/writerfilter
writerfilter_SRC := $(SRCDIR)/sw/source/writerfilter
writerfilter_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
@@ -56,7 +56,7 @@ writerfilter_ALL = \
$(patsubst %,$(writerfilter_WORK)/ooxml/OOXMLFactory_%.hxx,$(writerfilter_OOXMLNAMESPACES)) \
$(patsubst %,$(writerfilter_WORK)/ooxml/OOXMLFactory_%.cxx,$(writerfilter_OOXMLNAMESPACES)) \
-writerfilter_DEP_ooxml_Namespaces_txt=$(call gb_CustomTarget_get_workdir,oox/generated)/misc/namespaces.txt
+writerfilter_DEP_ooxml_Namespaces_txt=$(gb_CustomTarget_workdir)/oox/generated/misc/namespaces.txt
writerfilter_GEN_ooxml_FactoryValues_hxx=$(writerfilter_WORK)/ooxml/OOXMLFactory_values.hxx
writerfilter_GEN_ooxml_Factory_cxx=$(writerfilter_WORK)/ooxml/OOXMLFactory_generated.cxx
writerfilter_GEN_ooxml_Factory_hxx=$(writerfilter_WORK)/ooxml/OOXMLFactory_generated.hxx