From 824d2047dae3bbf84e4173852890774fb59e4d55 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Thu, 12 Dec 2013 20:45:45 +0100 Subject: [PATCH] Add the explicit list of modules, since we cannot do auto-dependency management of them --- cpu/6502/Makefile.6502 | 2 +- platform/avr-raven/Makefile.avr-raven | 2 +- platform/cc2530dk/Makefile.cc2530dk | 2 +- platform/cc2538dk/Makefile.cc2538dk | 3 ++- platform/cooja/Makefile.cooja | 3 ++- platform/econotag/Makefile.econotag | 3 ++- platform/exp5438/Makefile.exp5438 | 3 ++- platform/mbxxx/Makefile.mbxxx | 3 ++- platform/micaz/Makefile.micaz | 3 ++- platform/native/Makefile.native | 2 +- platform/sensinode/Makefile.sensinode | 2 +- platform/sky/Makefile.sky | 3 ++- platform/wismote/Makefile.wismote | 3 ++- platform/z1/Makefile.z1 | 3 ++- 14 files changed, 23 insertions(+), 14 deletions(-) diff --git a/cpu/6502/Makefile.6502 b/cpu/6502/Makefile.6502 index 10dc4a03b..dc90fac9d 100644 --- a/cpu/6502/Makefile.6502 +++ b/cpu/6502/Makefile.6502 @@ -69,4 +69,4 @@ LDFLAGS = $(STARTADDR_FLAG) -t $(TARGET) -m contiki-$(TARGET).map -D __STACKSIZE AROPTS = a ## Default modules -MODULES += core/net/ipv4 core/ctk +MODULES += core/net/ipv4 core/ctk core/net core/net/ip diff --git a/platform/avr-raven/Makefile.avr-raven b/platform/avr-raven/Makefile.avr-raven index 345177ada..d13307c0b 100644 --- a/platform/avr-raven/Makefile.avr-raven +++ b/platform/avr-raven/Makefile.avr-raven @@ -35,4 +35,4 @@ AVRDUDE_MCU=m1284p include $(CONTIKIAVR)/Makefile.avr include $(CONTIKIAVR)/radio/Makefile.radio -MODULES += core/net/ipv6 core/net/ipv4 core/net/mac core/net core/net/rime core/net/mac/sicslowmac +MODULES += core/net/ipv6 core/net/ipv4 core/net/ip core/net/mac core/net core/net/rime core/net/mac/sicslowmac diff --git a/platform/cc2530dk/Makefile.cc2530dk b/platform/cc2530dk/Makefile.cc2530dk index 31468eaa2..a163a2aef 100644 --- a/platform/cc2530dk/Makefile.cc2530dk +++ b/platform/cc2530dk/Makefile.cc2530dk @@ -47,4 +47,4 @@ CONTIKI_CPU=$(CONTIKI)/cpu/cc253x include $(CONTIKI_CPU)/Makefile.cc253x # Default modules -MODULES += core/net/ipv6 core/net/rime +MODULES += core/net/ip core/net/ipv6 core/net/rime core/net core/net/mac core/net/rpl diff --git a/platform/cc2538dk/Makefile.cc2538dk b/platform/cc2538dk/Makefile.cc2538dk index c28364bc3..397fbb978 100644 --- a/platform/cc2538dk/Makefile.cc2538dk +++ b/platform/cc2538dk/Makefile.cc2538dk @@ -26,4 +26,5 @@ endif CONTIKI_CPU=$(CONTIKI)/cpu/cc2538 include $(CONTIKI_CPU)/Makefile.cc2538 -MODULES += core/net/ipv6 core/net/mac core/net/rime core/net/mac/contikimac +MODULES += core/net core/net/ipv6 core/net/mac core/net/ip \ + core/net/rpl core/net/rime core/net/mac/contikimac diff --git a/platform/cooja/Makefile.cooja b/platform/cooja/Makefile.cooja index ad99a67a3..1426bf7cc 100644 --- a/platform/cooja/Makefile.cooja +++ b/platform/cooja/Makefile.cooja @@ -88,4 +88,5 @@ ifeq ($(UIP_CONF_IPV6),1) endif # UIP_CONF_RPL endif # UIP_CONF_IPV6 -MODULES += core/net/ipv6 core/net/mac core/net/rime core/net/mac/contikimac +MODULES += core/net core/net/ip core/net/ipv4 \ + core/net/ipv6 core/net/mac core/net/rime core/net/rpl diff --git a/platform/econotag/Makefile.econotag b/platform/econotag/Makefile.econotag index 712f07f6c..8e6939f9c 100644 --- a/platform/econotag/Makefile.econotag +++ b/platform/econotag/Makefile.econotag @@ -20,4 +20,5 @@ endif include $(CONTIKIMC1322X)/Makefile.mc1322x -MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 core/net/rime core/net/mac +MODULES+=core/net/ip core/net/ipv4 core/net core/net/rpl \ + core/net/ipv6 core/net/rime core/net/mac diff --git a/platform/exp5438/Makefile.exp5438 b/platform/exp5438/Makefile.exp5438 index 43d083666..380012c36 100644 --- a/platform/exp5438/Makefile.exp5438 +++ b/platform/exp5438/Makefile.exp5438 @@ -1,7 +1,8 @@ # $Id: Makefile.z1,v 1.4 2010/11/07 08:40:24 enricmcalvo Exp $ # msp430flasher -n msp430x5437 -w "Firmware.txt" -v -z [VCC] -MODULES += core/net/ipv6 core/net/ipv4 core/net/rime core/net/mac/contikimac \ +MODULES += core/net core/net/ip core/net/ipv6 core/net/ipv4 \ + core/net/mac core/net/rpl core/net/rime core/net/mac/contikimac \ dev/cc2420 ifdef IAR diff --git a/platform/mbxxx/Makefile.mbxxx b/platform/mbxxx/Makefile.mbxxx index 4da4f5f23..68905e295 100644 --- a/platform/mbxxx/Makefile.mbxxx +++ b/platform/mbxxx/Makefile.mbxxx @@ -21,4 +21,5 @@ ifeq ($(HOST_OS),Windows) SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-windows endif -MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 core/net/rime core/net/mac core/nnet/mac/contikimac +MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 \ + core/net/rpl core/net/rime core/net/mac core/net/mac/contikimac diff --git a/platform/micaz/Makefile.micaz b/platform/micaz/Makefile.micaz index b7fcc9d89..cdfea9e74 100644 --- a/platform/micaz/Makefile.micaz +++ b/platform/micaz/Makefile.micaz @@ -45,4 +45,5 @@ ifneq ($(strip $(HAVE_PRGBOARD_FILE)), ) include $(PRGBOARD_FILE) endif -MODULES += core/net/ipv6 core/net/ipv4 core/net/rime core/net/mac/cxmac dev/cc2420 +MODULES += core/net core/net/ip core/net/ipv6 core/net/ipv4 core/net/rime \ + core/net/mac core/net/rpl core/net/mac/cxmac dev/cc2420 diff --git a/platform/native/Makefile.native b/platform/native/Makefile.native index c85256727..36fb375c8 100644 --- a/platform/native/Makefile.native +++ b/platform/native/Makefile.native @@ -46,4 +46,4 @@ CURSES_LIBS ?= -lncurses TARGET_LIBFILES += $(CURSES_LIBS) -MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 core/net/rime +MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 core/net/rime core/net/mac diff --git a/platform/sensinode/Makefile.sensinode b/platform/sensinode/Makefile.sensinode index 5bf4907f7..3cb297544 100644 --- a/platform/sensinode/Makefile.sensinode +++ b/platform/sensinode/Makefile.sensinode @@ -88,4 +88,4 @@ include $(CONTIKI)/cpu/cc2430/Makefile.cc2430 contiki-$(TARGET).a:# $(addprefix $(OBJECTDIR)/,symbols.rel) -MODULES += core/net/ipv6 core/net/ipv4 core/net/rime +MODULES += core/net/ipv6 core/net/ipv4 core/net/rime core/net core/net/mac core/net/rpl diff --git a/platform/sky/Makefile.sky b/platform/sky/Makefile.sky index 4fc4daf9e..bcceba92f 100644 --- a/platform/sky/Makefile.sky +++ b/platform/sky/Makefile.sky @@ -10,6 +10,7 @@ endif include $(CONTIKI)/platform/sky/Makefile.common -MODULES += core/net/ipv6 core/net/ipv4 core/net/rime \ +MODULES += core/net/ipv6 core/net/ipv4 core/net/rime core/net/mac \ + core/net core/net/ip core/net/rpl \ core/net/mac/contikimac core/net/mac/cxmac \ dev/cc2420 dev/sht11 dev/ds2411 diff --git a/platform/wismote/Makefile.wismote b/platform/wismote/Makefile.wismote index 9686aa602..ea6547371 100644 --- a/platform/wismote/Makefile.wismote +++ b/platform/wismote/Makefile.wismote @@ -59,5 +59,6 @@ contiki-$(TARGET).a: ${addprefix $(OBJECTDIR)/,symbols.o} %.upload-clean: %.hex msp430flasher -n msp430x5437 -w $< -v -z [VCC] -MODULES += core/net/ipv6 core/net/ipv4 core/net/rime core/net/mac/contikimac \ +MODULES += core/net core/net/ip core/net/ipv6 core/net/ipv4 core/net/mac \ + core/net/rime core/net/mac/contikimac core/net/rpl \ dev/cc2520 dev/sht11 diff --git a/platform/z1/Makefile.z1 b/platform/z1/Makefile.z1 index d3a012f70..03695479b 100644 --- a/platform/z1/Makefile.z1 +++ b/platform/z1/Makefile.z1 @@ -5,5 +5,6 @@ CLEAN += *.z1 include $(CONTIKI)/platform/z1/Makefile.common -MODULES += core/net/ipv6 core/net/ipv4 core/net/rime core/net/mac/contikimac \ +MODULES += core/net core/net/ip core/net/ipv6 core/net/ipv4 core/net/rpl \ + core/net/rime core/net/mac core/net/mac/contikimac \ dev/cc2420 dev/sht11