RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #657 from LudwigOrtmann/wsn430-v1_4_Makefiles

Browse Source 
fix wsn430-v1_4 Makefiles
This commit is contained in:
Oleg Hahm 2014-02-11 17:55:11 +01:00
commit 9fff3f5b90
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/wsn430-v1_4/Makefile
View File

@ -1,4 +1,4 @@
MODULE =$(BOARD)_base MODULE = $(BOARD)_base
DIRS = $(RIOTBOARD)/wsn430-common DIRS = $(RIOTBOARD)/wsn430-common

2
boards/wsn430-v1_4/Makefile.dep
View File

@ -1 +1 @@
USEMODULE += msp430_common USEMODULE += msp430_common

11
boards/wsn430-v1_4/Makefile.include
View File

@ -1,4 +1,13 @@
export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include -I$(RIOTBOARD)/wsn430-common/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/include export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include -I$(RIOTBOARD)/wsn430-common/include
ifeq (,$(findstring cc2420,$(USEMODULE)))
USEMODULE += cc2420
endif
ifneq (,$(findstring cc2420,$(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include \
-I$(RIOTBASE)/sys/net/include
endif
include $(RIOTBOARD)/$(BOARD)/Makefile.dep include $(RIOTBOARD)/$(BOARD)/Makefile.dep
include $(RIOTBOARD)/wsn430-common/Makefile.include include $(RIOTBOARD)/wsn430-common/Makefile.include

4
examples/default/Makefile
View File

@ -48,10 +48,6 @@ endif
ifneq (,$(findstring wsn430-v1_3b,$(BOARD))) ifneq (,$(findstring wsn430-v1_3b,$(BOARD)))
USEMODULE += cc110x_ng USEMODULE += cc110x_ng
endif endif
ifneq (,$(findstring wsn430-v1_4,$(BOARD)))
USEMODULE += cc2420
export INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include
endif
ifneq (,$(findstring msb-430h,$(BOARD))) ifneq (,$(findstring msb-430h,$(BOARD)))
USEMODULE += cc110x_ng USEMODULE += cc110x_ng
endif endif