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

fix configuration deps

Browse Source 
Change-Id: Ie431fadb4f11284e231112744af80bfb5c219d94
This commit is contained in:
David Tardon 2012-08-07 07:49:15 +02:00
parent 7edc1390e4
commit b03fd9b3a6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reportbuilder/Configuration_reportbuilder.mk
View File

@ -27,7 +27,7 @@
$(eval $(call gb_Configuration_Configuration,sun-report-builder,nodeliver)) $(eval $(call gb_Configuration_Configuration,sun-report-builder,nodeliver))
$(eval $(call gb_Configuration_use_configuration,sun-report-builder,officecfg)) $(eval $(call gb_Configuration_use_configuration,sun-report-builder,registry))
$(eval $(call gb_Configuration_add_schemas,sun-report-builder,reportbuilder/registry/schema,\ $(eval $(call gb_Configuration_add_schemas,sun-report-builder,reportbuilder/registry/schema,\
org/openoffice/Office/ReportDesign.xcs \ org/openoffice/Office/ReportDesign.xcs \

2
solenv/gbuild/Configuration.mk
View File

@ -505,7 +505,7 @@ endef
# #
# Example: # Example:
# # foo needs schemas from the main configuration # # foo needs schemas from the main configuration
# $(eval $(call gb_Configuration_use_configuration,foo,officecfg)) # $(eval $(call gb_Configuration_use_configuration,foo,registry))
define gb_Configuration_use_configuration define gb_Configuration_use_configuration
$(call gb_Configuration_get_preparation_target,$(1)) : $(call gb_Configuration_get_target,$(2)) $(call gb_Configuration_get_preparation_target,$(1)) : $(call gb_Configuration_get_target,$(2))
$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := $(gb_Configuration_registry)/schema $(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := $(gb_Configuration_registry)/schema

2
solenv/gbuild/CppunitTest.mk
View File

@ -266,7 +266,7 @@ endef
# Use standard configuration. # Use standard configuration.
define gb_CppunitTest_use_configuration define gb_CppunitTest_use_configuration
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,officecfg) $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,registry)
$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(gb_Configuration_registry)) $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(gb_Configuration_registry))
endef endef