Commit 64b9c666 authored by David Gibson's avatar David Gibson

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: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 34f380e5
...@@ -136,7 +136,7 @@ default: libccan.a ...@@ -136,7 +136,7 @@ default: libccan.a
# Automatic dependency generation: makes ccan/*/*.d files. # Automatic dependency generation: makes ccan/*/*.d files.
DEPGEN=-MMD DEPGEN=-MMD
-include ccan/*/*.d -include $(foreach m, $(MODS), ccan/$(m)/*.d)
# Anything with C files needs building; dir leaves / on, sort uniquifies # 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))))) DIRS=$(patsubst %/, %, $(sort $(foreach m, $(filter-out $(MODS_EXCLUDE), $(MODS_WITH_SRC)), $(dir $(wildcard ccan/$m/*.c)))))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment