solenv/gbuild/extensions/pre_MergedLibsList.mk | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
New commits:
commit ae17922b7d0f797129dd5fbd5514d691ac9ebeaa
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 14 09:33:05 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Feb 14 10:49:36 2024 +0100
add more libs into --enable-mergelibs=more build
Change-Id: Idec36cb54e998c9e4830d5e51a6d2df7d94170fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163350
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 9a2fffa033ac..c51ea9fcfe7f 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -130,6 +130,11 @@ gb_MERGE_LIBRARY_LIST += \
date \
$(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \
dlgprov \
+ $(if $(ENABLE_EVOAB2),evoab) \
+ $(call gb_Helper_optional,DBCONNECTIVITY, \
+ flat \
+ file) \
+ $(if $(ENABLE_FIREBIRD_SDBC),firebird_sdbc) \
$(if $(filter WNT,$(OS)), \
fps \
) \
@@ -138,13 +143,26 @@ gb_MERGE_LIBRARY_LIST += \
) \
graphicfilter \
hwp \
+ $(if $(ENABLE_JAVA),hsqldb) \
log \
$(if $(ENABLE_LWP),lwpft) \
+ $(if $(filter $(OS),MACOSX), \
+ macab1 \
+ macabdrv1 \
+ ) \
+ mozbootstrap \
msforms \
+ $(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \
+ $(call gb_Helper_optional,MARIADBC,$(call
gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
+ odbc \
pdffilter \
+ $(if $(BUILD_POSTGRESQL_SDBC), \
+ postgresql-sdbc \
+ postgresql-sdbc-impl) \
pricing \
$(call gb_Helper_optional,SCRIPTING,protocolhandler) \
$(call gb_Helper_optional,SCRIPTING,scriptframe) \
+ sdbc2 \
slideshow \
$(if $(filter WNT,$(OS)), \
smplmail \
