summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2016-03-23 08:28:23 +0100
committerOliver Specht <oliver.specht@cib.de>2016-04-29 06:13:22 +0000
commit3393e04edd0f4f6baf5faeda2ed761332f45d9e5 (patch)
tree3528ef323c11c0560c87e48c9b2dcf7df59fe0f2 /solenv
parent523a3d18e98cd51aa8bf76cf76314a22ddc2b2cf (diff)
add additional modules to merged lib
acc, expwrap and store are loaded at startup anyway Change-Id: I28020962238be3fe73a1b1dbba59a45c7d3c1e1d Reviewed-on: https://gerrit.libreoffice.org/23459 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index cd2a0df01779..307351d1b29f 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -10,6 +10,7 @@
# we link all object files from these libraries into one, merged library
MERGE_LIBRARY_LIST := \
+ acc \
avmedia \
basegfx \
canvastools \
@@ -23,6 +24,7 @@ MERGE_LIBRARY_LIST := \
$(if $(USING_X11),desktop_detector) \
drawinglayer \
editeng \
+ expwrap \
filterconfig \
fsstorage \
fwe \
@@ -43,6 +45,7 @@ MERGE_LIBRARY_LIST := \
sofficeapp \
sot \
$(if $(ENABLE_HEADLESS),,spl) \
+ store \
svl \
svt \
svx \