diff options
| author | David Tardon <dtardon@redhat.com> | 2012-07-30 07:09:46 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-22 08:15:35 +0200 |
| commit | 77103991898befbf20b723ea368af86eded1c36f (patch) | |
| tree | 40734bd08764b54e946cbaf46687c7118a6954fe /solenv/gbuild/Configuration.mk | |
| parent | add missing deps on tools (diff) | |
| download | core-77103991898befbf20b723ea368af86eded1c36f.tar.gz core-77103991898befbf20b723ea368af86eded1c36f.zip | |
fix dep for configuration schemas
Configuration of extensions can use schemas from the main configuration
(officecfg). Now that officecfg is in tail_build, we need to make sure
that building of any such configuration only starts _after_ officecfg
has been done.
Change-Id: I95c775bb9c15c2e3aad930189d5524957cb5c49d
Diffstat (limited to 'solenv/gbuild/Configuration.mk')
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 61254cea46bc..12225c636237 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -323,13 +323,17 @@ endef $(call gb_Configuration_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),CFG,1) $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_Configuration_get_target,$*)) + rm -f $(call gb_Configuration_get_target,$*) $(call gb_Configuration_get_preparation_target,$*)) $(call gb_Configuration_get_target,%) : $(call gb_Output_announce,$*,$(true),CFG,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && touch $@) +$(call gb_Configuration_get_preparation_target,%) : + $(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $@) && touch $@) + # TODO: ? define gb_Configuration_Configuration_nozip $$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1)))) @@ -362,7 +366,8 @@ define gb_Configuration_add_schema $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_XcsTarget_get_clean_target,$(2)/$(3)) $(call gb_XcsTarget_get_target,$(2)/$(3)) : \ - $(call gb_Configuration__get_source,$(1),$(2)/$(3)) + $(call gb_Configuration__get_source,$(1),$(2)/$(3)) \ + $(call gb_Configuration_get_preparation_target,$(1)) $(call gb_XcsTarget_get_target,$(2)/$(3)) : XCSFILE := $(3) $(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE := $(3) $(call gb_Configuration_get_target,$(1)) : \ @@ -502,7 +507,7 @@ endef # # foo needs schemas from the main configuration # $(eval $(call gb_Configuration_use_configuration,foo,officecfg)) define gb_Configuration_use_configuration -$(call gb_Configuration_get_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 endef |