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

[Noel Grandin (via logerrit)]

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

New commits:
commit 4ec76bdeeb000881cf46c78166dc02badb4f44db
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 21 08:46:02 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Feb 26 07:07:04 2020 +0100

    add some libs to libmerged
    
    another small chunk of libs shared by calc/write/impress,
    doing this in stages in case anything goes wrong.
    
    Change-Id: Ica162828565e825b8eaeb223eb3ab132880a6279
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89166
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 9cb91a5d4a15..976de14e8967 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -83,13 +83,24 @@ MERGE_LIBRARY_LIST := \
 	svx \
 	svxcore \
 	syssh \
+	textfd \
 	tk \
 	tl \
 	ucb1 \
 	ucbhelper \
 	ucpexpand1 \
+	ucpext \
+	ucphier1 \
+	ucpimage \
 	ucpfile1 \
+	ucptdoc1 \
+	unordf \
 	unoxml \
+	$(if $(ENABLE_ONLINE_UPDATE), \
+		updatecheckui \
+        updchk \
+	) \
+	updatefeed \
 	utl \
 	uui \
 	vcl \