From 20bbe439c6160753c2cecaf09ef91a0905c199b5 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Tue, 18 Feb 2020 17:22:27 +0100 Subject: [PATCH] Makefile.dep: Add auto_init_% DEFAULT_MODULES only once The logic that adds auto_init_% DEFAULT_MODULES was placed at the end of Makefile.dep, which is recursively included. That means that the logic is executed multiple times. This moves the logic so it is only executed once, when the break condition of the iteration is met. --- Makefile.dep | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index 4809a88733..3ffd024adb 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -1052,10 +1052,12 @@ USEMODULE := $(sort $(USEMODULE)) 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))) +else + # 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))) + DEFAULT_MODULE := $(sort $(DEFAULT_MODULE)) + USEMODULE += $(filter auto_init_%,$(filter-out $(DISABLE_MODULE),$(DEFAULT_MODULE))) + USEMODULE := $(sort $(USEMODULE)) + endif endif