Skip to content

Commit e80bb4b

Browse files
makefile: add a check for real modules
1 parent 16b5fd3 commit e80bb4b

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

Makefile.base

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@ include $(RIOTMAKE)/tools/fixdep.inc.mk
8989
$(BINDIR)/$(MODULE)/:
9090
$(Q)mkdir -p $@
9191

92-
# only create the module folder when it's going to hold objects
93-
ifneq (,$(strip $(OBJ)))
94-
$(MODULE).module $(OBJ): | $(BINDIR)/$(MODULE)/
95-
endif
92+
$(MODULE).module $(OBJ): | $(BINDIR)/$(MODULE)/
9693

9794
$(MODULE).module: $(OBJ) | $(DIRS:%=ALL--%)
9895

Makefile.include

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,7 @@ DIRS += $(EXTERNAL_MODULE_DIRS)
556556
BUILDDEPS += $(RIOTBUILD_CONFIG_HEADER_C)
557557
BUILDDEPS += pkg-prepare
558558
BUILDDEPS += $(APPDEPS)
559+
BUILDDEPS += $(MODULE_LIST_DIR)
559560

560561
# Save value to verify it is not modified later
561562
_BASELIBS_VALUE_BEFORE_USAGE := $(BASELIBS)
@@ -575,16 +576,20 @@ ifeq ($(BUILD_IN_DOCKER),1)
575576
link: ..in-docker-container
576577
else
577578
ifeq (,$(RIOTNOLINK))
578-
link: ..compiler-check ..build-message $(BUILD_FILES) print-size
579+
link: ..compiler-check ..build-message $(BUILD_FILES) print-size ..module-check
579580
else
580-
link: ..compiler-check ..build-message $(BASELIBS) $(ARCHIVES)
581+
link: ..compiler-check ..build-message $(BASELIBS) $(ARCHIVES) ..module-check
581582
endif # RIOTNOLINK
582583

583584
$(ELFFILE): $(BASELIBS) $(ARCHIVES)
584585
$(Q)$(_LINK) -o $@
585586

586587
.PHONY: $(APPLICATION_MODULE).module
587588

589+
..module-check: $(BASELIBS)
590+
@[ -z "$(strip $(NON_GENERATED_MODULES))" ] || \
591+
($(COLOR_ECHO) "$(COLOR_RED)Error - using unknown modules: $(COLOR_RESET)$(NON_GENERATED_MODULES)" && false)
592+
588593
$(APPLICATION_MODULE).module: pkg-build $(BUILDDEPS)
589594
$(Q)DIRS="$(DIRS)" APPLICATION_BLOBS="$(BLOBS)" \
590595
"$(MAKE)" -C $(APPDIR) -f $(RIOTMAKE)/application.inc.mk

makefiles/modules.inc.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,8 @@ EXTDEFINES = $(addprefix -D,$(call uppercase_and_underscore,$(ED)))
1212
REALMODULES += $(filter-out $(PSEUDOMODULES), $(_ALLMODULES))
1313
REALMODULES += $(filter $(NO_PSEUDOMODULES), $(_ALLMODULES))
1414
BASELIBS += $(REALMODULES:%=%.module)
15+
16+
# Add modules compiled with Makefile.base and extra archives
17+
GENERATED_MODULES = $(notdir $(shell find $(BINDIR) -type d)) $(basename $(notdir $(ARCHIVES)))
18+
19+
NON_GENERATED_MODULES = $(filter-out $(GENERATED_MODULES),$(REALMODULES))

0 commit comments

Comments
 (0)