add frm to Library_merged

Change-Id: I72fff5fe1fd26e618ffe89111471d95cd4d30852

RepositoryModule_host.mk

@@ -79,7 +79,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	fileaccess \
 	filter \
 	$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
-	forms \
+	$(call gb_Helper_optional,DBCONNECTIVITY,forms) \
 	formula \
 	fpicker \
 	framework \

forms/Module_forms.mk

@@ -28,7 +28,6 @@
 
 $(eval $(call gb_Module_Module,forms))
 
-ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,forms,\
     AllLangResTarget_frm \
     Library_frm \
@@ -38,6 +37,5 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\
     JunitTest_forms_unoapi \
     JunitTest_forms_complex \
 ))
-endif
 
 # vim: set noet sw=4 ts=4:

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -45,6 +45,7 @@ gb_MERGEDLIBS := \
 	filterconfig \
 	for \
 	forui \
+	$(call gb_Helper_optional,DBCONNECTIVITY,frm) \
 	fsstorage \
 	fwe \
 	fwi \