summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-02-07 14:43:42 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-02-11 13:51:48 +0100
commit40fe721462df5bedacddc8829cefc3d739cf940f (patch)
tree7d3286c21c27670f071cc50e20aa8b8c041ab3ee /solenv/gbuild
parentbf25e69f8f657d5e3bcdd0bd54c5fa0d66ec85fe (diff)
add some more libs to libmerged
and fix a consequent symbol name clash in basctl Change-Id: Idc836fcbb379e1046a60008391635eb6241b27c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88188 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'solenv/gbuild')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 00d9bc57921a..e20cec20344e 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -10,6 +10,9 @@
# we link all object files from these libraries into one, merged library
MERGE_LIBRARY_LIST := \
avmedia \
+ $(call gb_Helper_optional,SCRIPTING, \
+ basctl \
+ ) \
basegfx \
canvastools \
comphelper \
@@ -35,14 +38,18 @@ MERGE_LIBRARY_LIST := \
localebe1 \
mcnttype \
msfilter \
+ mtfrenderer \
$(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \
package2 \
sax \
sb \
+ simplecanvas \
sfx \
sofficeapp \
sot \
$(if $(DISABLE_GUI),,spl) \
+ $(call gb_Helper_optional,SCRIPTING,stringresource) \
+ stringresource \
svl \
svt \
svx \