From 64b9c66673ed48b09c9be72668acdfb9230df488 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Tue, 16 Feb 2016 23:35:41 +1100 Subject: [PATCH] Correctly include dependencies for nested modules Currently we pull auto-generated dependencies into the Makefile with include ccan/*/*.d. That will omit any .d files from nested modules, meaning things might not be correctly rebuilt there. Correct this by using the list of modules instead of a 1-level wildcard. Signed-off-by: David Gibson --- Makefile-ccan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile-ccan b/Makefile-ccan index f4e096b5..bd6af5ca 100644 --- a/Makefile-ccan +++ b/Makefile-ccan @@ -136,7 +136,7 @@ default: libccan.a # Automatic dependency generation: makes ccan/*/*.d files. DEPGEN=-MMD --include ccan/*/*.d +-include $(foreach m, $(MODS), ccan/$(m)/*.d) # Anything with C files needs building; dir leaves / on, sort uniquifies DIRS=$(patsubst %/, %, $(sort $(foreach m, $(filter-out $(MODS_EXCLUDE), $(MODS_WITH_SRC)), $(dir $(wildcard ccan/$m/*.c))))) -- 2.39.2