add calc, dbase, file, and flat to Library_merged

Change-Id: Ib6b03cda815ba0450930cec970bfe7eb4d98ac44

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 \

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:

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) \