[Libreoffice-commits] core.git: solenv/gbuild

[Oliver Specht]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3393e04edd0f4f6baf5faeda2ed761332f45d9e5
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Wed Mar 23 08:28:23 2016 +0100

    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 at libreoffice.org>
    Reviewed-by: Oliver Specht <oliver.specht at cib.de>

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index cd2a0df..307351d 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 \