Add the explicit list of modules, since we cannot do auto-dependency management of them

This commit is contained in:
Adam Dunkels 2013-12-12 20:45:45 +01:00
parent 24155ee0ae
commit 824d2047da
14 changed files with 23 additions and 14 deletions

View file

@ -69,4 +69,4 @@ LDFLAGS = $(STARTADDR_FLAG) -t $(TARGET) -m contiki-$(TARGET).map -D __STACKSIZE
AROPTS = a AROPTS = a
## Default modules ## Default modules
MODULES += core/net/ipv4 core/ctk MODULES += core/net/ipv4 core/ctk core/net core/net/ip

View file

@ -35,4 +35,4 @@ AVRDUDE_MCU=m1284p
include $(CONTIKIAVR)/Makefile.avr include $(CONTIKIAVR)/Makefile.avr
include $(CONTIKIAVR)/radio/Makefile.radio 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

View file

@ -47,4 +47,4 @@ CONTIKI_CPU=$(CONTIKI)/cpu/cc253x
include $(CONTIKI_CPU)/Makefile.cc253x include $(CONTIKI_CPU)/Makefile.cc253x
# Default modules # 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

View file

@ -26,4 +26,5 @@ endif
CONTIKI_CPU=$(CONTIKI)/cpu/cc2538 CONTIKI_CPU=$(CONTIKI)/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.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

View file

@ -88,4 +88,5 @@ ifeq ($(UIP_CONF_IPV6),1)
endif # UIP_CONF_RPL endif # UIP_CONF_RPL
endif # UIP_CONF_IPV6 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

View file

@ -20,4 +20,5 @@ endif
include $(CONTIKIMC1322X)/Makefile.mc1322x 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

View file

@ -1,7 +1,8 @@
# $Id: Makefile.z1,v 1.4 2010/11/07 08:40:24 enricmcalvo Exp $ # $Id: Makefile.z1,v 1.4 2010/11/07 08:40:24 enricmcalvo Exp $
# msp430flasher -n msp430x5437 -w "Firmware.txt" -v -z [VCC] # 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 dev/cc2420
ifdef IAR ifdef IAR

View file

@ -21,4 +21,5 @@ ifeq ($(HOST_OS),Windows)
SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-windows SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-windows
endif 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

View file

@ -45,4 +45,5 @@ ifneq ($(strip $(HAVE_PRGBOARD_FILE)), )
include $(PRGBOARD_FILE) include $(PRGBOARD_FILE)
endif 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

View file

@ -46,4 +46,4 @@ CURSES_LIBS ?= -lncurses
TARGET_LIBFILES += $(CURSES_LIBS) 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

View file

@ -88,4 +88,4 @@ include $(CONTIKI)/cpu/cc2430/Makefile.cc2430
contiki-$(TARGET).a:# $(addprefix $(OBJECTDIR)/,symbols.rel) 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

View file

@ -10,6 +10,7 @@ endif
include $(CONTIKI)/platform/sky/Makefile.common 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 \ core/net/mac/contikimac core/net/mac/cxmac \
dev/cc2420 dev/sht11 dev/ds2411 dev/cc2420 dev/sht11 dev/ds2411

View file

@ -59,5 +59,6 @@ contiki-$(TARGET).a: ${addprefix $(OBJECTDIR)/,symbols.o}
%.upload-clean: %.hex %.upload-clean: %.hex
msp430flasher -n msp430x5437 -w $< -v -z [VCC] 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 dev/cc2520 dev/sht11

View file

@ -5,5 +5,6 @@ CLEAN += *.z1
include $(CONTIKI)/platform/z1/Makefile.common 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 dev/cc2420 dev/sht11