diff --git a/examples/er-rest-example/Makefile b/examples/er-rest-example/Makefile index 0eac1a4e4..9a72bf63a 100644 --- a/examples/er-rest-example/Makefile +++ b/examples/er-rest-example/Makefile @@ -7,8 +7,6 @@ all: er-example-server er-example-client WITH_COAP=13 -# variable for Makefile.include -WITH_UIP6=1 # for some platforms UIP_CONF_IPV6=1 # IPv6 make config disappeared completely diff --git a/examples/ipv6/json-ws/Makefile b/examples/ipv6/json-ws/Makefile index 12aa155e8..2f1ba6582 100644 --- a/examples/ipv6/json-ws/Makefile +++ b/examples/ipv6/json-ws/Makefile @@ -1,6 +1,5 @@ CONTIKI=../../.. -WITH_UIP6=1 UIP_CONF_IPV6=1 SMALL=1 diff --git a/examples/ipv6/native-border-router/Makefile b/examples/ipv6/native-border-router/Makefile index b28c0dc73..191d9c819 100644 --- a/examples/ipv6/native-border-router/Makefile +++ b/examples/ipv6/native-border-router/Makefile @@ -4,7 +4,6 @@ APPS = slip-cmd CONTIKI=../../.. -WITH_UIP6=1 UIP_CONF_IPV6=1 CFLAGS+= -DUIP_CONF_IPV6_RPL -DUIP_CONF_IPV6 -DWITH_UIP6 diff --git a/examples/ipv6/rpl-border-router/Makefile b/examples/ipv6/rpl-border-router/Makefile index 43230a17f..f296b0bb3 100644 --- a/examples/ipv6/rpl-border-router/Makefile +++ b/examples/ipv6/rpl-border-router/Makefile @@ -3,7 +3,6 @@ all: $(CONTIKI_PROJECT) CONTIKI=../../.. -WITH_UIP6=1 UIP_CONF_IPV6=1 CFLAGS+= -DUIP_CONF_IPV6_RPL diff --git a/examples/ipv6/rpl-collect/Makefile b/examples/ipv6/rpl-collect/Makefile index e37b71468..7ed3f6ae1 100644 --- a/examples/ipv6/rpl-collect/Makefile +++ b/examples/ipv6/rpl-collect/Makefile @@ -3,7 +3,6 @@ APPS = powertrace collect-view CONTIKI_PROJECT = udp-sender udp-sink PROJECT_SOURCEFILES += collect-common.c -WITH_UIP6=1 UIP_CONF_IPV6=1 CFLAGS+= -DUIP_CONF_IPV6_RPL diff --git a/examples/ipv6/rpl-udp/Makefile b/examples/ipv6/rpl-udp/Makefile index e4ea78e28..6dfe77c47 100644 --- a/examples/ipv6/rpl-udp/Makefile +++ b/examples/ipv6/rpl-udp/Makefile @@ -2,7 +2,6 @@ all: udp-client udp-server APPS=servreg-hack CONTIKI=../../.. -WITH_UIP6=1 UIP_CONF_IPV6=1 CFLAGS+= -DUIP_CONF_IPV6_RPL diff --git a/examples/ipv6/simple-udp-rpl/Makefile b/examples/ipv6/simple-udp-rpl/Makefile index 5721b46aa..9cc51e534 100644 --- a/examples/ipv6/simple-udp-rpl/Makefile +++ b/examples/ipv6/simple-udp-rpl/Makefile @@ -2,7 +2,6 @@ all: broadcast-example unicast-sender unicast-receiver APPS=servreg-hack CONTIKI=../../.. -WITH_UIP6=1 UIP_CONF_IPV6=1 CFLAGS+= -DUIP_CONF_IPV6_RPL diff --git a/examples/ipv6/sky-websense/Makefile b/examples/ipv6/sky-websense/Makefile index 09d80ce32..21fee6e7c 100644 --- a/examples/ipv6/sky-websense/Makefile +++ b/examples/ipv6/sky-websense/Makefile @@ -2,7 +2,6 @@ all: sky-websense CONTIKI=../../.. -WITH_UIP6=1 UIP_CONF_IPV6=1 CFLAGS+= -DUIP_CONF_IPV6_RPL diff --git a/examples/ipv6/slip-radio/Makefile b/examples/ipv6/slip-radio/Makefile index ff6387136..e4176d5e1 100644 --- a/examples/ipv6/slip-radio/Makefile +++ b/examples/ipv6/slip-radio/Makefile @@ -8,7 +8,6 @@ endif CONTIKI=../../.. -WITH_UIP6=1 UIP_CONF_IPV6=1 UIP_CONF_RPL=0 diff --git a/examples/mbxxx/mbxxx-websense/Makefile b/examples/mbxxx/mbxxx-websense/Makefile index f59f6251f..a1d4b3af9 100644 --- a/examples/mbxxx/mbxxx-websense/Makefile +++ b/examples/mbxxx/mbxxx-websense/Makefile @@ -2,7 +2,6 @@ all: mbxxx-websense CONTIKI=../../.. -WITH_UIP6=1 UIP_CONF_IPV6=1 APPS += webserver webbrowser diff --git a/examples/rest-example/Makefile b/examples/rest-example/Makefile index d7d9590b7..bd020537c 100644 --- a/examples/rest-example/Makefile +++ b/examples/rest-example/Makefile @@ -6,7 +6,6 @@ endif CONTIKI=../.. -WITH_UIP6=1 UIP_CONF_IPV6=1 WITH_COAP = 1 diff --git a/examples/seedeye/powerswitch/Makefile b/examples/seedeye/powerswitch/Makefile index da5e2d82f..a7b4c9fbe 100644 --- a/examples/seedeye/powerswitch/Makefile +++ b/examples/seedeye/powerswitch/Makefile @@ -7,8 +7,6 @@ all: remotepowerswitch CONTIKI=../../../ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" -# variable for root Makefile.include -WITH_UIP6=1 # for some platforms UIP_CONF_IPV6=1 diff --git a/examples/servreg-hack/Makefile b/examples/servreg-hack/Makefile index 23a7a06d8..84e057391 100644 --- a/examples/servreg-hack/Makefile +++ b/examples/servreg-hack/Makefile @@ -1,7 +1,6 @@ CONTIKI_PROJECT = example-servreg-client all: $(CONTIKI_PROJECT) -WITH_UIP6=1 UIP_CONF_IPV6=1 APPS=servreg-hack diff --git a/examples/udp-stream/Makefile b/examples/udp-stream/Makefile index 37185ac8c..e1a1c9855 100644 --- a/examples/udp-stream/Makefile +++ b/examples/udp-stream/Makefile @@ -6,7 +6,6 @@ ifndef TARGET TARGET = sky endif -WITH_UIP6 = 1 UIP_CONF_IPV6 = 1 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" SMALL = 1 diff --git a/examples/z1/ipv6/z1-websense/Makefile b/examples/z1/ipv6/z1-websense/Makefile index 84d328bed..2f48df333 100644 --- a/examples/z1/ipv6/z1-websense/Makefile +++ b/examples/z1/ipv6/z1-websense/Makefile @@ -2,7 +2,6 @@ all: z1-websense CONTIKI=../../../.. -WITH_UIP6=1 UIP_CONF_IPV6=1 SMALL=1 diff --git a/regression-tests/11-ipv6/code/receiver/Makefile b/regression-tests/11-ipv6/code/receiver/Makefile index aafcd9278..0decf131d 100644 --- a/regression-tests/11-ipv6/code/receiver/Makefile +++ b/regression-tests/11-ipv6/code/receiver/Makefile @@ -1,6 +1,5 @@ CONTIKI=../../../.. -WITH_UIP6=1 UIP_CONF_IPV6=1 CFLAGS+= -DUIP_CONF_IPV6_RPL -DPROJECT_CONF_H=\"project-conf.h\" diff --git a/regression-tests/11-ipv6/code/sender/Makefile b/regression-tests/11-ipv6/code/sender/Makefile index aafcd9278..0decf131d 100644 --- a/regression-tests/11-ipv6/code/sender/Makefile +++ b/regression-tests/11-ipv6/code/sender/Makefile @@ -1,6 +1,5 @@ CONTIKI=../../../.. -WITH_UIP6=1 UIP_CONF_IPV6=1 CFLAGS+= -DUIP_CONF_IPV6_RPL -DPROJECT_CONF_H=\"project-conf.h\" diff --git a/regression-tests/12-rpl/code/Makefile b/regression-tests/12-rpl/code/Makefile index dd6dc3f12..cfe24a53b 100644 --- a/regression-tests/12-rpl/code/Makefile +++ b/regression-tests/12-rpl/code/Makefile @@ -1,7 +1,6 @@ all: sender-node receiver-node root-node CONTIKI=../../.. -WITH_UIP6=1 UIP_CONF_IPV6=1 CFLAGS+= -DUIP_CONF_IPV6_RPL