From 1435ddb89c303c38ff23ff977dfb81953f32eb96 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 11 Jul 2012 16:40:21 +0200 Subject: build: get dependency file directories from object file names After commit dcff25f2cd8c11a9368cc2369aeb0319c32d9e26, Dependency file are taken from the directories that have a Makefile.objs file. This is not enough, since files can be included from other directories. So, pick them from directories that have an object file in them. Signed-off-by: Paolo Bonzini Signed-off-by: Blue Swirl --- rules.mak | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'rules.mak') diff --git a/rules.mak b/rules.mak index 60f3e96541..a28494679a 100644 --- a/rules.mak +++ b/rules.mak @@ -94,7 +94,6 @@ define unnest-dir $(foreach var,$(nested-vars),$(call push-var,$(var),$1/)) $(eval obj := $(obj)/$1) $(eval include $(SRC_PATH)/$1/Makefile.objs) -$(eval -include $(wildcard $1/*.d)) $(eval obj := $(patsubst %/$1,%,$(obj))) $(foreach var,$(nested-vars),$(call pop-var,$(var),$1/)) endef @@ -113,4 +112,6 @@ define unnest-vars $(call unnest-vars-1) $(foreach var,$(nested-vars),$(eval $(var) := $(filter-out %/, $($(var))))) $(shell mkdir -p $(sort $(foreach var,$(nested-vars),$(dir $($(var)))))) +$(foreach var,$(nested-vars), $(eval \ + -include $(addsuffix *.d, $(sort $(dir $($(var))))))) endef -- cgit v1.2.1