[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl]

 solenv/gbuild/AllLangResTarget.mk       |    2 +-
 solenv/gbuild/WinResTarget.mk           |    2 +-
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |    2 ++
 solenv/gbuild/platform/com_MSC_class.mk |    4 ++++
 4 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 58b499007372d04290ed22a0f390ac793ccf1aba
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Feb 27 20:50:37 2013 +0100

    gbuild: add dependencies on makedepend to rules that use it
    
    Change-Id: I25d23cd9a526b0d0be37ea0a0211e407266e6475

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 656e44c..b06a8da 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 d9c2197..c280276 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 3a5be2c..0960643 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 d52a4c1..e2cfc49 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