Browse Source

Makefile.include: Move USEMODULE CFLAGS expansion last

Some USEMODULE parts (e.g. defined in ${BOARD}/Makefile.dep) were not
being properly exported to CFLAGS -DMODULE_xxx options.
pr/spi.typo
Joakim Nohlgård 7 years ago
parent
commit
a678e868e9
  1. 11
      Makefile.include
  2. 6
      Makefile.modules

11
Makefile.include

@ -176,8 +176,14 @@ export PREFIX ?= $(if $(TARGET_ARCH),$(TARGET_ARCH)-)
# Import all toolchain settings
include $(RIOTCPU)/Makefile.include.$(TOOLCHAIN)
# Add standard include directories
INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
INCLUDES += -I$(RIOTCPU)/$(CPU)/include
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
# mandatory includes!
include $(RIOTBASE)/Makefile.modules
include $(RIOTBASE)/Makefile.pseudomodules
include $(RIOTBASE)/Makefile.defaultmodules
include $(RIOTBOARD)/$(BOARD)/Makefile.include
include $(RIOTCPU)/$(CPU)/Makefile.include
@ -492,6 +498,9 @@ include $(RIOTBASE)/dist/tools/desvirt/Makefile.desvirt
# include bindist target
include $(RIOTBASE)/Makefile.bindist
# Add all USEMODULE modules to CFLAGS
include $(RIOTBASE)/Makefile.modules
# Build a header file with all common macro definitions and undefinitions
# make it phony to force re-run of the script every time even if the file exists
# The script will only touch the file if anything has changed since last time.

6
Makefile.modules

@ -1,11 +1,5 @@
include $(RIOTBASE)/Makefile.pseudomodules
include $(RIOTBASE)/Makefile.defaultmodules
USEMODULE := $(filter-out $(filter-out $(FEATURES_PROVIDED), $(FEATURES_OPTIONAL)), $(sort $(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
INCLUDES += -I$(RIOTCPU)/$(CPU)/include
INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include
ED = $(addprefix FEATURE_,$(sort $(filter $(FEATURES_PROVIDED), $(FEATURES_REQUIRED))))
ED += $(addprefix MODULE_,$(sort $(USEMODULE) $(USEPKG)))
EXTDEFINES = $(addprefix -D,$(shell echo '$(ED)' | tr 'a-z-' 'A-Z_'))

Loading…
Cancel
Save