diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-26 21:44:21 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-28 09:58:10 -0400 |
| commit | 1081150d3575b2da393862214b71dbf30cc489a3 (patch) | |
| tree | 05313c40a137bef12e91e34495a6564a7e61f469 | |
| parent | 1b55d8f34be39ba53f4bf80ebf3ec8d13f46410b (diff) | |
add rpt, rptui, and rptxml to Library_merged
Change-Id: I8c20d81043602229a3fd936af6e7cdc337c40951
| -rw-r--r-- | RepositoryModule_host.mk | 2 | ||||
| -rw-r--r-- | reportdesign/Module_reportdesign.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index c77357c65e40..1d20b5f9309a 100644 --- a/RepositoryModule_host.mk +++ b/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 \ diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk index 854a822a1158..e72e4301bf77 100644 --- a/reportdesign/Module_reportdesign.mk +++ b/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: diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index d036fb011a23..344655b31183 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/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 \ |