From 8d664dd4750a90c83cecf7e995df47aea681e8b1 Mon Sep 17 00:00:00 2001 From: Olaf Bergmann Date: Thu, 19 Feb 2015 14:21:16 +0100 Subject: [PATCH] Fixed Contiki-specific Makefile --- examples/contiki/Makefile.contiki | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/examples/contiki/Makefile.contiki b/examples/contiki/Makefile.contiki index a6d9a931..7d7cac0c 100644 --- a/examples/contiki/Makefile.contiki +++ b/examples/contiki/Makefile.contiki @@ -1,3 +1,5 @@ +NODE_ADDR?=0x1000 + ######################################################################## # platform-specific options @@ -18,18 +20,15 @@ endif # usually, you should not need changing anything beyond this line ######################################################################## -all: coap-server #coap-client - $(MAKE) $(MAKEFLAGS) ROLE=server coap-server -# $(MAKE) $(MAKEFLAGS) clean -# $(MAKE) $(MAKEFLAGS) ROLE=client coap-client +all: server -CONTIKI=../.. +CONTIKI=../../../.. #CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" -CFLAGS += -DCOAP_MAX_BLOCK_SZX=1 +CFLAGS += -DNODE_ADDR=$(NODE_ADDR) -DCOAP_MAX_BLOCK_SZX=1 ifeq ($(UIP_CONF_IPV6_RPL),0) -CFLAGS += -DUIP_CONF_IPV6_RPL=0 -DRPL_BORDER_ROUTER=0 +CFLAGS += -DUIP_CONF_IPV6_RPL=0 -DRPL_BORDER_ROUTER=0 -DUIP_CONF_ROUTER=0 endif WITH_UIP6=1