diff options
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 11 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 1 |
2 files changed, 9 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 diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 7a2240ec8106..75e2fd35cadc 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -90,6 +90,7 @@ gb_CliNativeLibraryTarget_get_target = $(WORKDIR)/CliNativeLibraryTarget/$(1)$(g gb_CliUnoApiTarget_get_target = $(WORKDIR)/CliUnoApiTarget/$(1)$(gb_CliUnoApiTarget_EXT) gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component gb_ComponentsTarget_get_target = $(WORKDIR)/ComponentsTarget/$(1).components +gb_Configuration_get_preparation_target = $(WORKDIR)/Configuration/$(1).prepared gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done |