Correct dependency file inclusion in GCCXML build.
--- a/sbsv2/raptor/lib/flm/gccxml.flm Tue Feb 02 17:34:53 2010 +0000
+++ b/sbsv2/raptor/lib/flm/gccxml.flm Wed Feb 03 15:59:39 2010 +0000
@@ -200,7 +200,7 @@
define gccxmlprocesssource
$(eval DEPENDFILENAME:=$(call mapsource2output,$(1),.xml.d))
- $(eval DEPENDFILE:=$(DEPENDFILENAME))
+ $(eval DEPENDFILE:=$(wildcard $(DEPENDFILENAME)))
$(call mapsource2output,$(1),.xml): $(1) $(if $(DEPENDFILE),,RESOURCE BITMAP EXPORT)
$(call startrule,gccxmlprocesssource) \
@@ -214,13 +214,13 @@
$(call endrule,gccxmlprocesssource)
CLEANTARGETS:=$$(CLEANTARGETS) $(DEPENDFILENAME)
- ifneq "$(DEPENDFILE)" ""
- ifeq ($(NO_DEPEND_INCLUDE),)
- ifeq "$(filter %CLEAN,$(call uppercase,$(MAKECMDGOALS)))" ""
- -include $(DEPENDFILE)
+ ifneq ($(DEPENDFILE),)
+ ifeq ($(NO_DEPEND_INCLUDE),)
+ ifeq ($(filter %CLEAN,$(call uppercase,$(MAKECMDGOALS))),)
+ -include $(DEPENDFILE)
+ endif
endif
endif
- endif
endef
$(foreach SRCFILE,$(SOURCE),$(eval $(call gccxmlprocesssource,$(SRCFILE))))