mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
Makefile: remove usage of SUBMODULES_NOFORCE
With #10970 only existing *.c files will be added to SRC when using the SUBMODULES mechanism, so SUBMODULES_NOFORCE (used to filter out non existing source files) is now redundant so remove the usage.
This commit is contained in:
parent
623381f9d3
commit
2331448644
@ -43,10 +43,8 @@ ifeq (1, $(SUBMODULES))
|
|||||||
# for each $(BASE_MODULE)_<name> in USEMODULE, add <name>.c to SRC
|
# for each $(BASE_MODULE)_<name> in USEMODULE, add <name>.c to SRC
|
||||||
SRC += $(wildcard $(patsubst $(BASE_MODULE)_%,%.c,$(filter $(BASE_MODULE)_%,$(USEMODULE))))
|
SRC += $(wildcard $(patsubst $(BASE_MODULE)_%,%.c,$(filter $(BASE_MODULE)_%,$(USEMODULE))))
|
||||||
|
|
||||||
# don't fail if a selected *.c file does not exist
|
# remove duplicates
|
||||||
ifeq (1, $(SUBMODULES_NOFORCE))
|
SRC := $(sort $(SRC))
|
||||||
SRC := $(filter $(SRC), $(wildcard *.c))
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# By default consider C++ files has a .cpp extension
|
# By default consider C++ files has a .cpp extension
|
||||||
|
@ -3,9 +3,6 @@ MODULE ?= periph
|
|||||||
# enable submodules
|
# enable submodules
|
||||||
SUBMODULES := 1
|
SUBMODULES := 1
|
||||||
|
|
||||||
# don't fail if requested submodule does not have corresponding *.c file
|
|
||||||
SUBMODULES_NOFORCE := 1
|
|
||||||
|
|
||||||
# in case of e.g., <cpu>_periph_common, use periph_* as submodule prefix
|
# in case of e.g., <cpu>_periph_common, use periph_* as submodule prefix
|
||||||
BASE_MODULE := periph
|
BASE_MODULE := periph
|
||||||
|
|
||||||
|
@ -2,9 +2,6 @@ MODULE = wolfcrypt
|
|||||||
|
|
||||||
SUBMODULES += 1
|
SUBMODULES += 1
|
||||||
|
|
||||||
# Do not fail for module that do not have a file
|
|
||||||
SUBMODULES_NOFORCE = 1
|
|
||||||
|
|
||||||
NO_AUTO_SRC = 1
|
NO_AUTO_SRC = 1
|
||||||
|
|
||||||
#-------------------------------------------------------------#
|
#-------------------------------------------------------------#
|
||||||
|
@ -2,7 +2,5 @@ MODULE = wolfssl
|
|||||||
|
|
||||||
NO_AUTO_SRC = 1
|
NO_AUTO_SRC = 1
|
||||||
SUBMODULES += 1
|
SUBMODULES += 1
|
||||||
SUBMODULES_NOFORCE = 1
|
|
||||||
|
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
SRC := event.c
|
SRC := event.c
|
||||||
|
|
||||||
SUBMODULES := 1
|
SUBMODULES := 1
|
||||||
SUBMODULES_NOFORCE := 1
|
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -10,9 +10,6 @@ SRC := core.c util.c
|
|||||||
# enable submodules
|
# enable submodules
|
||||||
SUBMODULES := 1
|
SUBMODULES := 1
|
||||||
|
|
||||||
# "ztimer_extend" does not have corresponding .c
|
|
||||||
SUBMODULES_NOFORCE := 1
|
|
||||||
|
|
||||||
# disable obsolete warning
|
# disable obsolete warning
|
||||||
CFLAGS += -Wno-missing-field-initializers
|
CFLAGS += -Wno-missing-field-initializers
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user