diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-16 20:32:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-16 23:58:44 +0200 |
| commit | b6076ec3c1b9c384d8229cd079c39f510a9f38f7 (patch) | |
| tree | ded16d200d7ddbe51b740eac9dfa2511275d6b9f /solenv/gbuild/Extension.mk | |
| parent | further spurious dep-file rebuild fixes: (diff) | |
| download | core-b6076ec3c1b9c384d8229cd079c39f510a9f38f7.tar.gz core-b6076ec3c1b9c384d8229cd079c39f510a9f38f7.zip | |
gbuild: fix build executable dependencies:
Rules that invoke generated executables should have dependencies on
those executables.
Diffstat (limited to 'solenv/gbuild/Extension.mk')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 912018cbae4a..5029a20d2d8d 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -166,7 +166,8 @@ $(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(S $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF) endif $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2) -$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) +$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) \ + $(gb_Extension_PROPMERGETARGET) $$(call gb_Output_announce,$(2),$(true),PRP,3) mkdir -p $$(dir $$@) && \ cp -f $$< $$@ \ @@ -188,7 +189,7 @@ $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2 $(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))localize.sdf $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET) -$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) +$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) $(gb_Extension_HELPEXTARGET) $$(call gb_Output_announce,$(2),$(true),XHP,3) mkdir -p $$(dir $$@) && \ $(gb_Extension_HELPEXCOMMAND) -i $$< -o $$@ -l $(4) -m $$(SDF) |