diff options
| -rw-r--r-- | RepositoryModule_host.mk | 2 | ||||
| -rw-r--r-- | connectivity/Module_connectivity.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index a2be8b8f68a0..c77357c65e40 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -51,7 +51,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ $(call gb_Helper_optional,DESKTOP,codemaker) \ comphelper \ configmgr \ - connectivity \ + $(call gb_Helper_optional,DBCONNECTIVITY,connectivity) \ cosv \ cppcanvas \ cppu \ diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index bef94383d3e8..4ca6a6ffc179 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -27,8 +27,6 @@ $(eval $(call gb_Module_Module,connectivity)) -ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) - $(eval $(call gb_Module_add_targets,connectivity,\ AllLangResTarget_cnr \ AllLangResTarget_sdbcl \ @@ -165,6 +163,4 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\ CppunitTest_connectivity_commontools \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 60f71d726a6e..a9f236584fca 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -30,12 +30,14 @@ ifeq ($(MERGELIBS),TRUE) # we link all object files from these libraries into one, merged library gb_MERGEDLIBS := \ avmedia \ + $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ canvastools \ chartcore \ configmgr \ cppcanvas \ cui \ $(call gb_Helper_optional,DBCONNECTIVITY,dba) \ + $(call gb_Helper_optional,DBCONNECTIVITY,dbase) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ deploymentmisc \ @@ -43,7 +45,9 @@ gb_MERGEDLIBS := \ desktopbe1 \ drawinglayer \ editeng \ + $(call gb_Helper_optional,DBCONNECTIVITY,file) \ filterconfig \ + $(call gb_Helper_optional,DBCONNECTIVITY,flat) \ for \ forui \ $(call gb_Helper_optional,DBCONNECTIVITY,frm) \ |