From f09f30c94dbeee2e3002442fb0c022e0d9baaeee Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Thu, 6 Feb 2014 13:18:25 +0100 Subject: [PATCH] fix wsn430-v1_4 Makefiles --- boards/wsn430-v1_4/Makefile | 2 +- boards/wsn430-v1_4/Makefile.dep | 2 +- boards/wsn430-v1_4/Makefile.include | 11 ++++++++++- examples/default/Makefile | 4 ---- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/boards/wsn430-v1_4/Makefile b/boards/wsn430-v1_4/Makefile index 7f7fba05ea..6d7ece3cbe 100644 --- a/boards/wsn430-v1_4/Makefile +++ b/boards/wsn430-v1_4/Makefile @@ -1,4 +1,4 @@ -MODULE =$(BOARD)_base +MODULE = $(BOARD)_base DIRS = $(RIOTBOARD)/wsn430-common diff --git a/boards/wsn430-v1_4/Makefile.dep b/boards/wsn430-v1_4/Makefile.dep index 52516208bc..4e36d0ff56 100644 --- a/boards/wsn430-v1_4/Makefile.dep +++ b/boards/wsn430-v1_4/Makefile.dep @@ -1 +1 @@ -USEMODULE += msp430_common \ No newline at end of file +USEMODULE += msp430_common diff --git a/boards/wsn430-v1_4/Makefile.include b/boards/wsn430-v1_4/Makefile.include index a5ba9a0c94..88b3700a3f 100644 --- a/boards/wsn430-v1_4/Makefile.include +++ b/boards/wsn430-v1_4/Makefile.include @@ -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)/wsn430-common/Makefile.include diff --git a/examples/default/Makefile b/examples/default/Makefile index 336ad79fe1..40f3a8eeb3 100644 --- a/examples/default/Makefile +++ b/examples/default/Makefile @@ -50,10 +50,6 @@ ifneq (,$(findstring wsn430-v1_3b,$(BOARD))) USEMODULE += cc110x_ng export INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include endif -ifneq (,$(findstring wsn430-v1_4,$(BOARD))) - USEMODULE += cc2420 - export INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include -endif ifneq (,$(findstring msb-430h,$(BOARD))) USEMODULE += cc110x_ng export INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include