diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-26 11:02:06 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-26 11:39:38 -0400 |
| commit | ea360ff3ad9dac359f707cee5f0ca6548a7cd5d5 (patch) | |
| tree | 01ced535c2c8e5692a5b649ed5197538b7da818e | |
| parent | 4dd7010c007c89497b0b684ee4dbf699c2be1ee4 (diff) | |
add frm to Library_merged
Change-Id: I72fff5fe1fd26e618ffe89111471d95cd4d30852
| -rw-r--r-- | RepositoryModule_host.mk | 2 | ||||
| -rw-r--r-- | forms/Module_forms.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index e28c9aed1638..a2be8b8f68a0 100644 --- a/RepositoryModule_host.mk +++ b/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 \ diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk index 7480767d9098..bd64ac18a013 100644 --- a/forms/Module_forms.mk +++ b/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: diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 117c0dfb029a..2217014050d3 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -45,6 +45,7 @@ gb_MERGEDLIBS := \ filterconfig \ for \ forui \ + $(call gb_Helper_optional,DBCONNECTIVITY,frm) \ fsstorage \ fwe \ fwi \ |