mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add frm to Library_merged

Browse Source 
Change-Id: I72fff5fe1fd26e618ffe89111471d95cd4d30852
This commit is contained in:
Peter Foley
2013-03-26 11:02:06 -04:00
parent 4dd7010c00
commit ea360ff3ad
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RepositoryModule_host.mk
View File

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

2
forms/Module_forms.mk
View File

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

1
solenv/gbuild/extensions/pre_MergedLibsList.mk
View File

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