From 370998cc3e8b567b60eb5380ce0e0b54f9f8213c Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Thu, 16 Jan 2020 13:21:24 +0100 Subject: [PATCH] Makefile.dep: include new DEFAULT_MODULEs Currently default modules resolution is only performed in Makefile.include. This avoids DEFAULT_MODULES being declared in Makefile.dep since they never become USEMODULE. Duplicate at the end of the dependency resolutiion after recursive cach of transitive depdencies since at this stage DEFAULT_MODULES can't and SHOULD NOT trigger depedency resolutions. --- Makefile.dep | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile.dep b/Makefile.dep index 871004638c..dcc82a2b86 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -1056,3 +1056,9 @@ USEPKG := $(sort $(USEPKG)) ifneq ($(OLD_USEMODULE) $(OLD_USEPKG),$(USEMODULE) $(USEPKG)) include $(RIOTBASE)/Makefile.dep endif + +# Add auto_init_% DEFAULT_MODULES. This is done after the recursive cach since +# none of these modules can trigger dependency resolution. +ifneq (,$(filter auto_init,$(USEMODULE))) + USEMODULE += $(filter auto_init_%,$(filter-out $(DISABLE_MODULE),$(DEFAULT_MODULE))) +endif