From f8a75853aacb57d2a10d58a47e8a7dc79bf98353 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 30 Apr 2012 16:40:54 +0200
Subject: fix dep. generation for WinResTarget

Change-Id: I4ee6eb456bf400747c2e397ec6cd402fb6251bc6
---
 solenv/gbuild/WinResTarget.mk           | 19 +++++++++----------
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |  9 +++++----
 solenv/gbuild/platform/WNT_INTEL_MSC.mk | 10 ++++++----
 3 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'solenv')

diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index adb65db57100..1adff41db44e 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -15,32 +15,31 @@ $(call gb_WinResTarget_get_target,$(1)) : DEFS := $(gb_WinResTarget_DEFAULTDEFS)
 $(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(SOLARINC)
 $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
 $(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
+
 ifeq ($(gb_FULLDEPS),$(true))
--include $(call gb_WinResTarget_get_dep_target,$(1))
 $(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS)
 $(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE)
 $(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE :=
+
+-include $(call gb_WinResTarget_get_dep_target,$(1))
 endif
 
 endef
 
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,%) : $(gb_Helper_MISCDUMMY)
-		mkdir -p $(dir $@) && \
-			echo '$(call gb_WinResTarget_get_target,$*) : $$(gb_Helper_PHONY)' > $@
+$(call gb_WinResTarget_get_dep_target,%) : $(call gb_WinResTarget_get_target,%)
+	$(call gb_WinResTarget__command_dep,$@,$*,$<)
 endif
 
 
 $(call gb_WinResTarget_get_target,%) :
-	$(call gb_Output_announce,$*,$(true),RES,1)
-	$(call gb_WinResTarget__command_dep,$*,$<)
-	$(call gb_Helper_abbreviate_dirs,\
-		mkdir -p $(dir $@))
-	$(call gb_WinResTarget__command,$@)
+	$(call gb_WinResTarget__command,$@,$*,$<)
 
 $(call gb_WinResTarget_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),RES,3)
 	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_WinResTarget_get_target,$*))
+		rm -f $(call gb_WinResTarget_get_target,$*) \
+			$(call gb_WinResTarget_get_dep_target,$*))
 
 define gb_WinResTarget_set_defs
 $$(call gb_Output_error,gb_WinResTarget_set_defs: use gb_WinResTarget_add_defs instead.)
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 7c25c8b4ece3..03767f57f199 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -398,7 +398,6 @@ $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_RC) \
 		$(DEFS) $(FLAGS) \
-		-I$(dir $(3)) \
 		$(INCLUDE) \
 		-o $(1) \
 		$(RCFILE) )
@@ -410,18 +409,20 @@ $(eval $(call gb_Helper_make_dep_targets,\
 
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_WinResTarget__command_dep
+$(call gb_Output_announce,RES:$(2),$(true),DEP,1)
 $(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) && \
 	$(OUTDIR_FOR_BUILD)/bin/makedepend \
 		$(INCLUDE) \
 		$(DEFS) \
-		$(2) \
+		$(RCFILE) \
 		-f - \
 	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-		-v OBJECTFILE=$(call gb_WinResTarget_get_target,$(1)) \
+		-v OBJECTFILE=$(3) \
 		-v OUTDIR=$(OUTDIR)/ \
 		-v WORKDIR=$(WORKDIR)/ \
 		-v SRCDIR=$(SRCDIR)/ \
-	> $(call gb_WinResTarget_get_dep_target,$(1)))
+	> $(1))
 endef
 else
 gb_WinResTarget__command_dep =
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index ee340c71cad3..a8ae1dec4b1d 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -661,7 +661,7 @@ endif
 gb_WinResTarget_POSTFIX :=.res
 
 define gb_WinResTarget__command
-$(call gb_Output_announce,$(2),$(true),RES,3)
+$(call gb_Output_announce,$(2),$(true),RES,1)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_RC) \
@@ -677,18 +677,20 @@ $(eval $(call gb_Helper_make_dep_targets,\
 
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_WinResTarget__command_dep
+$(call gb_Output_announce,RES:$(2),$(true),DEP,1)
 $(call gb_Helper_abbreviate_dirs,\
+	mkdir -p $(dir $(1)) && \
 	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
 		$(INCLUDE) \
 		$(DEFS) \
-		$(2) \
+		$(RCFILE) \
 		-f - \
 	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-		-v OBJECTFILE=$(call gb_WinResTarget_get_target,$(1)) \
+		-v OBJECTFILE=$(3) \
 		-v OUTDIR=$(OUTDIR)/ \
 		-v WORKDIR=$(WORKDIR)/ \
 		-v SRCDIR=$(SRCDIR)/ \
-	> $(call gb_WinResTarget_get_dep_target,$(1)))
+	> $(1))
 endef
 else
 gb_WinResTarget__command_dep =
-- 
cgit