From 4797560c09169fd8977252c08f8a6924ca4de77a Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Thu, 10 Apr 2014 22:33:33 +0200 Subject: [PATCH] wsn430-v1_4b: don't always link cc2420 --- boards/wsn430-v1_4/Makefile | 3 +++ boards/wsn430-v1_4/Makefile.include | 9 --------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/boards/wsn430-v1_4/Makefile b/boards/wsn430-v1_4/Makefile index b91f1a85de..403b68de98 100644 --- a/boards/wsn430-v1_4/Makefile +++ b/boards/wsn430-v1_4/Makefile @@ -2,6 +2,9 @@ MODULE = $(BOARD)_base DIRS = $(RIOTBOARD)/wsn430-common +INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include \ + -I$(RIOTBASE)/sys/net/include + all: $(BINDIR)$(MODULE).a @for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ; diff --git a/boards/wsn430-v1_4/Makefile.include b/boards/wsn430-v1_4/Makefile.include index 316b867f1b..b8e4e4a3b9 100644 --- a/boards/wsn430-v1_4/Makefile.include +++ b/boards/wsn430-v1_4/Makefile.include @@ -1,13 +1,4 @@ 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)/wsn430-common/Makefile.include