summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-02-21 08:46:02 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-02-26 07:07:04 +0100
commit4ec76bdeeb000881cf46c78166dc02badb4f44db (patch)
tree0b85a2772cab8964687f4098b78ea4cc2d48f4da
parent9b18f4b2b064c823ac1500a0c297d113587a9bd4 (diff)
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@collabora.co.uk>
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk11
1 files changed, 11 insertions, 0 deletions
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 \