giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Automatically include module-macros.h when provided by modules

Browse Source
This commit is contained in:
Simon Duquennoy 2017-12-19 08:24:25 -08:00
parent cf262c57c8
commit 070b493391
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.include
View File

@ -165,9 +165,17 @@ endif
MODULEDIRS = $(MODULES_REL) ${wildcard ${addprefix $(CONTIKI)/, $(MODULES)}} MODULEDIRS = $(MODULES_REL) ${wildcard ${addprefix $(CONTIKI)/, $(MODULES)}}
UNIQUEMODULES = $(call uniq,$(MODULEDIRS)) UNIQUEMODULES = $(call uniq,$(MODULEDIRS))
MODULES_SOURCES = ${foreach d, $(MODULEDIRS), ${subst ${d}/,,${wildcard $(d)/*.c}}} MODULES_SOURCES = ${foreach d, $(MODULEDIRS), ${subst ${d}/,,${wildcard $(d)/*.c}}}
CONTIKI_SOURCEFILES += $(MODULES_SOURCES)
# Include module-specific makefiles
MODULES_INCLUDES = ${wildcard ${foreach d, $(MODULEDIRS), $(d)/Makefile.${notdir $(d)}}} MODULES_INCLUDES = ${wildcard ${foreach d, $(MODULEDIRS), $(d)/Makefile.${notdir $(d)}}}
include $(MODULES_INCLUDES) include $(MODULES_INCLUDES)
CONTIKI_SOURCEFILES += $(MODULES_SOURCES)
# C-include module-specific macros using -imacros
MODULES_IMACROS = ${wildcard ${foreach d, $(MODULEDIRS), $(d)/module-macros.h}}
ifneq ($(MODULES_IMACROS),)
CFLAGS += ${foreach d, $(MODULES_IMACROS), -imacros $(d)}
endif
### Verbosity control. Use make V=1 to get verbose builds. ### Verbosity control. Use make V=1 to get verbose builds.

1
examples/rpl-border-router/native/Makefile.native
View File

@ -1,4 +1,3 @@
CFLAGS += -imacros native/module-macros.h
MODULES += os/services/slip-cmd MODULES += os/services/slip-cmd
MAKE_MAC = MAKE_MAC_OTHER MAKE_MAC = MAKE_MAC_OTHER

1
examples/rpl-border-router/sky/Makefile.sky
View File

@ -1 +0,0 @@
CFLAGS += -imacros sky/module-macros.h

1
examples/slip-radio/sky/Makefile.sky
View File

@ -1 +0,0 @@
CFLAGS += -imacros sky/module-macros.h