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

wsn430-v1_4b: don't always link cc2420

Browse Source
This commit is contained in:
Oleg Hahm 2014-04-10 22:33:33 +02:00
parent ef07dd1708
commit 4797560c09
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boards/wsn430-v1_4/Makefile
View File

@ -2,6 +2,9 @@ MODULE = $(BOARD)_base
DIRS = $(RIOTBOARD)/wsn430-common DIRS = $(RIOTBOARD)/wsn430-common
INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include \
-I$(RIOTBASE)/sys/net/include
all: $(BINDIR)$(MODULE).a all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ; @for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;

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

@ -1,13 +1,4 @@
export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include -I$(RIOTBOARD)/wsn430-common/include export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include -I$(RIOTBOARD)/wsn430-common/include
ifeq (,$(filter cc2420,$(USEMODULE)))
USEMODULE += cc2420
endif
ifneq (,$(filter 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