summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-02-27 20:50:37 +0100
committerMichael Stahl <mstahl@redhat.com>2013-02-27 20:51:36 +0100
commit58b499007372d04290ed22a0f390ac793ccf1aba (patch)
tree20e85c50cd99578b1f940a597bd81ad16507a851 /solenv
parentc9c90e8ea21b37bf6e6f547ff35d114cfef8a5d4 (diff)
gbuild: add dependencies on makedepend to rules that use it
Change-Id: I25d23cd9a526b0d0be37ea0a0211e407266e6475
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/AllLangResTarget.mk2
-rw-r--r--solenv/gbuild/WinResTarget.mk2
-rw-r--r--solenv/gbuild/platform/WNT_INTEL_GCC.mk2
-rw-r--r--solenv/gbuild/platform/com_MSC_class.mk4
4 files changed, 8 insertions, 2 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 656e44cb7b18..b06a8da104d1 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -105,7 +105,7 @@ $(call gb_Helper_abbreviate_dirs,\
endef
$(call gb_SrsPartTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) \
- $(gb_ResTarget_RSCDEPS)
+ $(gb_ResTarget_RSCDEPS) $(gb_SrsPartTarget__command_target)
$(call gb_SrsPartTarget__command_dep,$*,$<)
$(call gb_SrsPartTarget__command,$@,$*,$<)
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index d9c2197b21ae..c2802768f2ab 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -28,7 +28,7 @@ endif
endef
ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,%) :
+$(call gb_WinResTarget_get_dep_target,%) : $(gb_WinResTarget__command_target)
$(call gb_WinResTarget__command_dep,$@,$*,$<)
endif
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 3a5be2cac7fd..09606436c19d 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -358,6 +358,7 @@ $(eval $(call gb_Helper_make_dep_targets,\
))
ifeq ($(gb_FULLDEPS),$(true))
+gb_WinResTarget__command_target = $(OUTDIR_FOR_BUILD)/bin/makedepend
define gb_WinResTarget__command_dep
$(call gb_Output_announce,RC:$(2),$(true),DEP,1)
$(call gb_Helper_abbreviate_dirs,\
@@ -375,6 +376,7 @@ $(call gb_Helper_abbreviate_dirs,\
> $(1))
endef
else
+gb_WinResTarget__command_target =
gb_WinResTarget__command_dep =
endif
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index d52a4c16a5c3..e2cfc4970fe7 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -462,6 +462,7 @@ endef
# SrsPartTarget class
ifeq ($(gb_FULLDEPS),$(true))
+gb_SrsPartTarget__command_target = $(OUTDIR)/bin/makedepend$(gb_Executable_EXT)
define gb_SrsPartTarget__command_dep
$(call gb_Helper_abbreviate_dirs,\
$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
@@ -477,6 +478,7 @@ $(call gb_Helper_abbreviate_dirs,\
> $(call gb_SrsPartTarget_get_dep_target,$(1)))
endef
else
+gb_SrsPartTarget__command_target =
gb_SrsPartTarget__command_dep =
endif
@@ -501,6 +503,7 @@ $(eval $(call gb_Helper_make_dep_targets,\
))
ifeq ($(gb_FULLDEPS),$(true))
+gb_WinResTarget__command_target = $(OUTDIR)/bin/makedepend$(gb_Executable_EXT)
define gb_WinResTarget__command_dep
$(call gb_Output_announce,RC:$(2),$(true),DEP,1)
$(call gb_Helper_abbreviate_dirs,\
@@ -518,6 +521,7 @@ $(call gb_Helper_abbreviate_dirs,\
> $(1))
endef
else
+gb_WinResTarget__command_target =
gb_WinResTarget__command_dep =
endif