diff options
| author | Andras Timar <atimar@suse.com> | 2012-09-28 16:57:02 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-09-28 16:57:02 +0200 |
| commit | dbac379f77a034f10e62e607258fcbafad41b7ab (patch) | |
| tree | 38c9db63bb991d8ff0ca8060274f8c6aaf92e3c9 /solenv/gbuild/Configuration.mk | |
| parent | Correct dependancies in makefiles (diff) | |
| parent | Revert "fdo#52246 let helpex use gsicheck's tag checker" (diff) | |
| download | core-dbac379f77a034f10e62e607258fcbafad41b7ab.tar.gz core-dbac379f77a034f10e62e607258fcbafad41b7ab.zip | |
Merge branch 'master' into feature/killsdf
Conflicts:
l10ntools/Module_l10ntools.mk
l10ntools/source/merge.cxx
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/ExtensionTarget.mk
solenv/gbuild/InstallModuleTarget.mk
solenv/gbuild/TargetLocations.mk
Diffstat (limited to 'solenv/gbuild/Configuration.mk')
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 240c4ab458dc..b9d2e7f3b1c3 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -329,13 +329,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)))) @@ -368,7 +372,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)) : \ @@ -506,9 +511,9 @@ endef # # Example: # # 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 -$(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 |