Update Makefiles to be compatible with the new build system and restrict them to specific platforms where needed

2018-02-23 17:38:52 +00:00 · 2018-02-23 17:38:52 +00:00 · 074b797e88
commit 074b797e88
parent b024ff46c1
43 changed files with 112 additions and 12 deletions
--- a/examples/6tisch/6p-packet/Makefile
+++ b/examples/6tisch/6p-packet/Makefile
@ -1,10 +1,13 @@
-CONTIKI_PROJECT      = sixp-node.c
+CONTIKI_PROJECT      = sixp-node
 PROJECT_SOURCEFILES += test-sf.c

+PLATFORMS_EXCLUDE = sky nrf52dk native
+
 CONTIKI  = ../../../

 MAKE_MAC = MAKE_MAC_TSCH
 MAKE_ROUTING = MAKE_ROUTING_NULLROUTING
 MODULES += os/net/mac/tsch/sixtop

+all: $(CONTIKI_PROJECT)
 include $(CONTIKI)/Makefile.include
--- a/examples/6tisch/etsi-plugtest-2017/Makefile
+++ b/examples/6tisch/etsi-plugtest-2017/Makefile
@ -1,6 +1,8 @@
 CONTIKI_PROJECT = node
 all: $(CONTIKI_PROJECT)

+PLATFORMS_EXCLUDE = sky nrf52dk native
+
 MAKE_WITH_SECURITY   ?= 0 # force Security from command line
 ifeq ($(MAKE_WITH_SECURITY),1)
 CFLAGS += -DWITH_SECURITY=1
--- a/examples/6tisch/simple-node/Makefile
+++ b/examples/6tisch/simple-node/Makefile
@ -1,6 +1,8 @@
 CONTIKI_PROJECT = node
 all: $(CONTIKI_PROJECT)

+PLATFORMS_EXCLUDE = sky nrf52dk native
+
 CONTIKI=../../..

 # force Orchestra from command line
--- a/examples/6tisch/sixtop/Makefile
+++ b/examples/6tisch/sixtop/Makefile
@ -1,6 +1,8 @@
 CONTIKI_PROJECT = node-sixtop
 all: $(CONTIKI_PROJECT)

+PLATFORMS_EXCLUDE = sky nrf52dk native
+
 PROJECT_SOURCEFILES += sf-simple.c
 CONTIKI=../../..

--- a/examples/coap/Makefile
+++ b/examples/coap/Makefile
@ -1,8 +1,13 @@
-all: coap-example-server coap-example-client
+CONTIKI_PROJECT = coap-example-server coap-example-client
 # use target "plugtest-server" explicitly when required

+all: $(CONTIKI_PROJECT)
+
 CONTIKI=../..

+# Do not try to build on Sky because of code size limitation
+PLATFORMS_EXCLUDE = sky
+
 # build RESTful resources
 include $(CONTIKI)/Makefile.identify-target
 ifeq ($(TARGET),native)
--- a/examples/dev/gpio-hal/Makefile
+++ b/examples/dev/gpio-hal/Makefile
@ -1,6 +1,8 @@
 CONTIKI_PROJECT = gpio-hal-example
 CONTIKI = ../../..

+PLATFORMS_ONLY = srf06-cc26xx cc2538dk openmote-cc2538 zoul
+
 include $(CONTIKI)/Makefile.identify-target

 MODULES_REL += $(TARGET)
--- a/examples/http-socket/Makefile
+++ b/examples/http-socket/Makefile
@ -1,5 +1,8 @@
-all: http-example websocket-example
+CONTIKI_PROJECT = http-example websocket-example
+all: $(CONTIKI_PROJECT)
 CONTIKI=../..
 MODULES += os/net/app-layer/http-socket

+PLATFORMS_EXCLUDE = sky
+
 include $(CONTIKI)/Makefile.include
--- a/examples/http-socket/websocket-node/Makefile
+++ b/examples/http-socket/websocket-node/Makefile
@ -4,3 +4,10 @@ install:

 run:
 	nodejs example-server.js
+
+# Needed by the build all script
+all:
+	true
+
+clean:
+	rm -rf node_modules
--- a/examples/ip64-router/Makefile
+++ b/examples/ip64-router/Makefile
@ -1,4 +1,5 @@
-all: ip64-router
+CONTIKI_PROJECT = ip64-router
+all: $(CONTIKI_PROJECT)
 CONTIKI=../..

 include $(CONTIKI)/Makefile.include
--- a/examples/ipso-objects/Makefile
+++ b/examples/ipso-objects/Makefile
@ -2,6 +2,8 @@ CONTIKI_PROJECT = example-ipso-objects

 CONTIKI_SOURCEFILES += serial-protocol.c example-ipso-temperature.c

+PLATFORMS_EXCLUDE = sky
+
 all: $(CONTIKI_PROJECT)

 MODULES += os/net/app-layer/coap
--- a/examples/ipv6-hooks/Makefile
+++ b/examples/ipv6-hooks/Makefile
@ -1,4 +1,5 @@
-all: ipv6-hooks
+CONTIKI_PROJECT = ipv6-hooks
+all: $(CONTIKI_PROJECT)

 CONTIKI=../..
 include $(CONTIKI)/Makefile.include
--- a/examples/libs/logging/Makefile
+++ b/examples/libs/logging/Makefile
@ -1,5 +1,8 @@
 CONTIKI_PROJECT = logging
 all: $(CONTIKI_PROJECT)

+# Does not fit on Sky
+PLATFORMS_EXCLUDE = sky
+
 CONTIKI = ../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/libs/stack-check/Makefile
+++ b/examples/libs/stack-check/Makefile
@ -1,5 +1,7 @@
 CONTIKI_PROJECT = example-stack-check
 all: $(CONTIKI_PROJECT)

+PLATFORMS_EXCLUDE = native cooja
+
 CONTIKI = ../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/nullnet/Makefile
+++ b/examples/nullnet/Makefile
@ -3,6 +3,8 @@ all: $(CONTIKI_PROJECT)

 CONTIKI = ../..

+PLATFORMS_EXCLUDE = nrf52dk
+
 #use this to enable TSCH: MAKE_MAC = MAKE_MAC_TSCH
 MAKE_MAC ?= MAKE_MAC_CSMA
 MAKE_NET = MAKE_NET_NULLNET
--- a/examples/platform-specific/cc2538-common/Makefile
+++ b/examples/platform-specific/cc2538-common/Makefile
@ -2,5 +2,7 @@ CONTIKI_PROJECT = test-pwm timer-test test-uart

 all: $(CONTIKI_PROJECT)

+PLATFORMS_ONLY = cc2538dk openmote-cc2538 zoul
+
 CONTIKI = ../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/cc2538-common/crypto/Makefile
+++ b/examples/platform-specific/cc2538-common/crypto/Makefile
@ -3,5 +3,7 @@ CONTIKI_PROJECT += sha256-test

 all: $(CONTIKI_PROJECT)

+PLATFORMS_ONLY = cc2538dk openmote-cc2538 zoul
+
 CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/cc2538-common/mqtt-demo/Makefile
+++ b/examples/platform-specific/cc2538-common/mqtt-demo/Makefile
@ -1,5 +1,7 @@
-all: mqtt-demo
+CONTIKI_PROJECT = mqtt-demo
+all: $(CONTIKI_PROJECT)

+PLATFORMS_ONLY = cc2538dk openmote-cc2538 zoul

 MODULES += os/net/app-layer/mqtt

--- a/examples/platform-specific/cc2538-common/pka/Makefile
+++ b/examples/platform-specific/cc2538-common/pka/Makefile
@ -2,5 +2,7 @@ CONTIKI_PROJECT = ecc-ecdh ecc-sign ecc-verify

 all: $(CONTIKI_PROJECT)

+PLATFORMS_ONLY = cc2538dk openmote-cc2538 zoul
+
 CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/cc26xx/Makefile
+++ b/examples/platform-specific/cc26xx/Makefile
@ -1,5 +1,7 @@
 CONTIKI_PROJECT = cc26xx-demo

+PLATFORMS_ONLY = srf06-cc26xx
+
 all: $(CONTIKI_PROJECT)

 CONTIKI = ../../..
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile
+++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile
@ -1,4 +1,7 @@
-all: cc26xx-web-demo
+CONTIKI_PROJECT = cc26xx-web-demo
+all: $(CONTIKI_PROJECT)
+
+PLATFORMS_ONLY = srf06-cc26xx

 MODULES_REL += ./resources

--- a/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile
+++ b/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile
@ -1,5 +1,7 @@
 CONTIKI_PROJECT = very-sleepy-demo

+PLATFORMS_ONLY = srf06-cc26xx
+
 all: $(CONTIKI_PROJECT)

 MODULES += os/net/app-layer/coap
--- a/examples/platform-specific/jn516x/dr1175-sensors/Makefile
+++ b/examples/platform-specific/jn516x/dr1175-sensors/Makefile
@ -1,6 +1,8 @@
 CONTIKI=../../../..
 CONTIKI_PROJECT = node

+PLATFORMS_ONLY = jn516x
+
 TARGET ?= jn516x
 JN516x_WITH_DR1175 = 1

--- a/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
@ -1,6 +1,8 @@
 CONTIKI_PROJECT = dongle-node
 all: $(CONTIKI_PROJECT)

+PLATFORMS_ONLY = jn516x
+
 TARGET ?= jn516x
 JN516x_WITH_DONGLE = 1

--- a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
@ -1,6 +1,8 @@
 CONTIKI_PROJECT = dr1175-node
 all: $(CONTIKI_PROJECT)

+PLATFORMS_ONLY = jn516x
+
 TARGET ?= jn516x
 JN516x_WITH_DR1175 = 1

--- a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
@ -1,6 +1,8 @@
 CONTIKI_PROJECT = dr1199-node
 all: $(CONTIKI_PROJECT)

+PLATFORMS_ONLY = jn516x
+
 TARGET ?= jn516x
 JN516x_WITH_DR1199 = 1

--- a/examples/platform-specific/jn516x/rpl/node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/node/Makefile
@ -1,6 +1,8 @@
 CONTIKI_PROJECT = node
 all: $(CONTIKI_PROJECT)

+PLATFORMS_ONLY = jn516x
+
 TARGET ?= jn516x

 CONTIKI=../../../../..
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
@ -1,5 +1,7 @@
 CONTIKI_PROJECT = node

+PLATFORMS_ONLY = jn516x
+
 TARGET ?= jn516x
 JN516x_WITH_DONGLE = 1

--- a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
@ -1,5 +1,7 @@
 CONTIKI_PROJECT = node

+PLATFORMS_ONLY = jn516x
+
 TARGET ?= jn516x
 JN516x_WITH_DONGLE = 1

--- a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
@ -1,5 +1,7 @@
 CONTIKI_PROJECT=rpl-border-router

+PLATFORMS_ONLY = jn516x
+
 TARGET ?= jn516x
 JN516x_WITH_DONGLE = 1

--- a/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
@ -1,5 +1,7 @@
 CONTIKI_PROJECT = uart1-test-node

+PLATFORMS_ONLY = jn516x
+
 TARGET = jn516x
 JN516x_WITH_DR1174 = 1
 TARGET_WITH_UART1 = 1
--- a/examples/platform-specific/nrf52dk/blink-hello/Makefile
+++ b/examples/platform-specific/nrf52dk/blink-hello/Makefile
@ -6,5 +6,7 @@ NRF52_WITHOUT_SOFTDEVICE=1

 all: $(CONTIKI_PROJECT)

+PLATFORMS_ONLY = nrf52dk
+
 CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/nrf52dk/mqtt-demo/Makefile
+++ b/examples/platform-specific/nrf52dk/mqtt-demo/Makefile
@ -1,4 +1,7 @@
-all: mqtt-demo
+CONTIKI_PROJECT = mqtt-demo
+all: $(CONTIKI_PROJECT)
+
+PLATFORMS_ONLY = nrf52dk

 MAKE_ROUTING = MAKE_ROUTING_NULLROUTING

--- a/examples/platform-specific/nrf52dk/timer-test/Makefile
+++ b/examples/platform-specific/nrf52dk/timer-test/Makefile
@ -1,5 +1,7 @@
 CONTIKI_PROJECT = timer-test

+PLATFORMS_ONLY = nrf52dk
+
 MAKE_ROUTING = MAKE_ROUTING_NULLROUTING
 MAKE_MAC=MAKE_MAC_NULLMAC
 NRF52_WITHOUT_SOFTDEVICE=1
--- a/examples/platform-specific/zoul/Makefile
+++ b/examples/platform-specific/zoul/Makefile
@ -15,5 +15,7 @@ MODULES += arch/dev/bme280

 all: $(CONTIKI_PROJECT)

+PLATFORMS_ONLY = zoul
+
 CONTIKI = ../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/zoul/at-test/Makefile
+++ b/examples/platform-specific/zoul/at-test/Makefile
@ -2,5 +2,7 @@ CONTIKI_PROJECT = at-master-test
 MODULES = os/services/at-master
 all: $(CONTIKI_PROJECT)

+PLATFORMS_ONLY = zoul
+
 CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/zoul/orion/client/Makefile
+++ b/examples/platform-specific/zoul/orion/client/Makefile
@ -7,5 +7,7 @@ MODULES += os/net/app-layer/http-socket

 WITH_IP64 = 1

+PLATFORMS_ONLY = zoul
+
 CONTIKI = ../../../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/zoul/orion/ip64-router/Makefile
+++ b/examples/platform-specific/zoul/orion/ip64-router/Makefile
@ -1,4 +1,5 @@
-all: ip64-router
+CONTIKI_PROJECT = ip64-router
+all: $(CONTIKI_PROJECT)

 BOARD = orion

@ -8,4 +9,6 @@ WITH_IP64 = 1

 PROJECT_SOURCEFILES += httpd-simple.c

+PLATFORMS_ONLY = zoul
+
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/zoul/rev-b/Makefile
+++ b/examples/platform-specific/zoul/rev-b/Makefile
@ -4,5 +4,7 @@ BOARD ?= remote-revb

 all: $(CONTIKI_PROJECT)

+PLATFORMS_ONLY = zoul
+
 CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/zoul/rtcc/Makefile
+++ b/examples/platform-specific/zoul/rtcc/Makefile
@ -4,5 +4,7 @@ TARGET = zoul

 all: $(CONTIKI_PROJECT)

+PLATFORMS_ONLY = zoul
+
 CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
--- a/examples/rpl-udp/Makefile
+++ b/examples/rpl-udp/Makefile
@ -1,4 +1,5 @@
-all: udp-client udp-server
+CONTIKI_PROJECT = udp-client udp-server
+all: $(CONTIKI_PROJECT)

 .PHONY: renode
 renode: all
--- a/examples/sensniff/Makefile
+++ b/examples/sensniff/Makefile
@ -1,6 +1,8 @@
 CONTIKI_PROJECT = sensniff
 CONTIKI = ../..

+PLATFORMS_ONLY = cc2538dk openmote-cc2538 zoul srf06-cc26xx jn516x
+
 PROJECT_SOURCEFILES += sensniff-mac.c netstack.c
 MODULES_REL += pool $(TARGET)

--- a/examples/storage/antelope-shell/Makefile
+++ b/examples/storage/antelope-shell/Makefile
@ -2,6 +2,10 @@ CONTIKI = ../../..

 MODULES += os/storage/antelope os/services/unit-test

-all: shell-db
+# does not fit on Sky
+PLATFORMS_ONLY= cc2538
+
+CONTIKI_PROJECT = shell-db
+all: $(CONTIKI_PROJECT)

 include $(CONTIKI)/Makefile.include
--- a/examples/storage/cfs-coffee/Makefile
+++ b/examples/storage/cfs-coffee/Makefile
@ -1,7 +1,10 @@
 CONTIKI = ../../..

+PLATFORMS_ONLY= cc2538 sky
+
 MODULES += os/services/unit-test

-all: test-cfs test-coffee example-coffee
+CONTIKI_PROJECT = test-cfs test-coffee example-coffee
+all: $(CONTIKI_PROJECT)

 include $(CONTIKI)/Makefile.include