diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-19 11:54:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-19 13:00:22 +0000 |
| commit | 9d7315df825762ef03f47c56dd078d7b1724f1cf (patch) | |
| tree | a417fe1cf6e045a301c629c5e5a7c4fedb73fe82 | |
| parent | 002a83fca94dd34cc30a58162c3316e371478308 (diff) | |
lets always have at least dbtools
Change-Id: I72f768ad760fd9fa1e3ec988e5217672bca9c824
Reviewed-on: https://gerrit.libreoffice.org/32175
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | RepositoryModule_host.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 2a174e517840..c6c0f3d99972 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 b946060b26fc..481032c701cb 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) \ |