add rpt, rptui, and rptxml to Library_merged

Change-Id: I8c20d81043602229a3fd936af6e7cdc337c40951

RepositoryModule_host.mk

@@ -162,7 +162,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	registry \
 	remotebridges \
 	reportbuilder \
-	reportdesign \
+	$(call gb_Helper_optional,DBCONNECTIVITY,reportdesign) \
 	$(call gb_Helper_optional,RHINO,rhino) \
 	ridljar \
 	rsc \

reportdesign/Module_reportdesign.mk

@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Module_Module,reportdesign))
 
-ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
-
 $(eval $(call gb_Module_add_targets,reportdesign,\
     AllLangResTarget_rpt \
     AllLangResTarget_rptui \
@@ -44,6 +42,4 @@ $(eval $(call gb_Module_add_targets,reportdesign,\
 	JunitTest_reportdesign_complex \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -69,6 +69,9 @@ gb_MERGEDLIBS := \
 	$(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \
 	oox \
 	package2 \
+	$(call gb_Helper_optional,DBCONNECTIVITY,rpt) \
+	$(call gb_Helper_optional,DBCONNECTIVITY,rptui) \
+	$(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \
 	sax \
 	sb \
 	sc \