riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make: Add DEFAULT_MODULE and DISABLE_MODULE

Browse Source 
Closes #926
This commit is contained in:
René Kijewski 2014-03-28 22:55:56 +01:00
parent f9d8f1fc75
commit e740fbc800
12 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.defaultmodules Normal file
View File

@ -0,0 +1,3 @@
DEFAULT_MODULE += cpu core sys
DEFAULT_MODULE += auto_init

5
Makefile.include
View File

@ -48,6 +48,11 @@ include $(RIOTBOARD)/$(BOARD)/Makefile.include
include $(RIOTCPU)/$(CPU)/Makefile.include include $(RIOTCPU)/$(CPU)/Makefile.include
include $(RIOTBASE)/Makefile.dep include $(RIOTBASE)/Makefile.dep
# Test if there where dependencies against a module in DISABLE_MODULE.
ifneq (, $(filter $(DISABLE_MODULE), $(USEMODULE)))
$(error "Required modules were disabled using DISABLE_MODULE: $(sort $(filter $(DISABLE_MODULE), $(USEMODULE)))")
endif
# Test if the input language was specified externally. # Test if the input language was specified externally.
# Otherwise test if the compiler unterstands the "-std=gnu99" flag, and use it if so. # Otherwise test if the compiler unterstands the "-std=gnu99" flag, and use it if so.
# Otherwise test if the compiler unterstands the "-std=c99" flag, and use it if so. # Otherwise test if the compiler unterstands the "-std=c99" flag, and use it if so.

4
Makefile.modules
View File

@ -1,8 +1,10 @@
UNDEF += $(BINDIR)startup.o UNDEF += $(BINDIR)startup.o
include $(RIOTBASE)/Makefile.pseudomodules include $(RIOTBASE)/Makefile.pseudomodules
include $(RIOTBASE)/Makefile.defaultmodules
USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
USEMODULE += cpu core sys
INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
ED = $(USEMODULE:%=-DMODULE_%) ED = $(USEMODULE:%=-DMODULE_%)
ED += $(USEPKG:%=-DMODULE_%) ED += $(USEPKG:%=-DMODULE_%)

1
examples/ccn-lite-client/Makefile
View File

@ -34,7 +34,6 @@ USEMODULE += shell
USEMODULE += shell_commands USEMODULE += shell_commands
USEMODULE += posix USEMODULE += posix
USEMODULE += ps USEMODULE += ps
USEMODULE += auto_init
USEMODULE += random USEMODULE += random
USEMODULE += transceiver USEMODULE += transceiver
ifeq ($(BOARD),msba2) ifeq ($(BOARD),msba2)

3
examples/ccn-lite-relay/Makefile
View File

@ -31,9 +31,6 @@ export QUIET ?= 1
USEMODULE += config USEMODULE += config
USEMODULE += posix USEMODULE += posix
USEMODULE += auto_init
USEMODULE += auto_init
USEMODULE += transceiver USEMODULE += transceiver
ifeq ($(BOARD),msba2) ifeq ($(BOARD),msba2)

1
examples/default/Makefile
View File

@ -34,7 +34,6 @@ USEMODULE += shell
USEMODULE += shell_commands USEMODULE += shell_commands
USEMODULE += ps USEMODULE += ps
USEMODULE += vtimer USEMODULE += vtimer
USEMODULE += auto_init
USEMODULE += defaulttransceiver USEMODULE += defaulttransceiver
ifneq (,$(filter msb-430,$(BOARD))) ifneq (,$(filter msb-430,$(BOARD)))

1
examples/rpl_udp/Makefile
View File

@ -32,7 +32,6 @@ CFLAGS += "-Wno-cpp"
# Modules to include: # Modules to include:
USEMODULE += auto_init
USEMODULE += shell USEMODULE += shell
USEMODULE += shell_commands USEMODULE += shell_commands
USEMODULE += posix USEMODULE += posix

1
tests/test_irq/Makefile
View File

@ -5,7 +5,6 @@ ifeq (,$(filter native,$(BOARD)))
include $(RIOTBASE)/Makefile.unsupported include $(RIOTBASE)/Makefile.unsupported
else else
USEMODULE += auto_init
USEMODULE += posix USEMODULE += posix
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

1
tests/test_nativenet/Makefile
View File

@ -5,7 +5,6 @@ ifeq (,$(filter native,$(BOARD)))
include $(RIOTBASE)/Makefile.unsupported include $(RIOTBASE)/Makefile.unsupported
else else
USEMODULE += auto_init
USEMODULE += nativenet USEMODULE += nativenet
USEMODULE += transceiver USEMODULE += transceiver

1
tests/test_net_if/Makefile
View File

@ -8,7 +8,6 @@ ifeq ($(BOARD),stm32f4discovery)
include Makefile.$(BOARD) include Makefile.$(BOARD)
endif endif
USEMODULE += auto_init
USEMODULE += net_if USEMODULE += net_if
USEMODULE += defaulttransceiver USEMODULE += defaulttransceiver

1
tests/test_pnet/Makefile
View File

@ -1,7 +1,6 @@
export PROJECT = test_pnet export PROJECT = test_pnet
include ../Makefile.tests_common include ../Makefile.tests_common
USEMODULE += auto_init
USEMODULE += posix USEMODULE += posix
USEMODULE += pnet USEMODULE += pnet
USEMODULE += vtimer USEMODULE += vtimer

1
tests/test_vtimer_msg/Makefile
View File

@ -1,7 +1,6 @@
export PROJECT = test_vtimer_msg export PROJECT = test_vtimer_msg
include ../Makefile.tests_common include ../Makefile.tests_common
USEMODULE += auto_init
USEMODULE += vtimer USEMODULE += vtimer
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include