RepositoryModule_host.mk | 2 +-
solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9d7315df825762ef03f47c56dd078d7b1724f1cf
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Dec 19 11:54:37 2016 +0000
lets always have at least dbtools
Change-Id: I72f768ad760fd9fa1e3ec988e5217672bca9c824
Reviewed-on: https://gerrit.libreoffice.org/32175
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 2a174e5..c6c0f3d 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,DESKTOP,codemaker) \
comphelper \
configmgr \
- $(call gb_Helper_optional,DBCONNECTIVITY,connectivity) \
+ connectivity \
cppcanvas \
cppu \
cppuhelper \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index b946060b..481032c 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -16,7 +16,7 @@ MERGE_LIBRARY_LIST := \
configmgr \
cppcanvas \
$(call gb_Helper_optional,BREAKPAD,crashreport) \
- $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
+ dbtools \
deployment \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
