Auto-include project-conf.h whenever found

2017-10-07 08:53:04 +02:00 · 2017-10-07 08:53:04 +02:00 · 20559fd308
parent 68d75edfd2
commit 20559fd308
49 changed files with 8 additions and 63 deletions
--- a/Makefile.include
+++ b/Makefile.include
@ -74,6 +74,11 @@ endif

 MODULES += os os/sys os/dev os/lib os/services

+# Automatically include project-conf.h if found
+ifneq ("$(wildcard project-conf.h)","")
+CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
+endif
+
 # Configure MAC layer

 # The different options
--- a/examples/6tisch/6p-packet/Makefile
+++ b/examples/6tisch/6p-packet/Makefile
@ -2,7 +2,6 @@ CONTIKI_PROJECT      = sixp-node.c
 PROJECT_SOURCEFILES += test-sf.c

 CONTIKI  = ../../../
-CFLAGS  += -DPROJECT_CONF_H=\"project-conf.h\"

 MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/net/mac/tsch/sixtop
--- a/examples/6tisch/etsi-plugtest-2017/Makefile
+++ b/examples/6tisch/etsi-plugtest-2017/Makefile
@ -9,7 +9,7 @@ endif
 MODULES             += os/services/shell
 MODULES             += os/net/mac/tsch os/net/mac/tsch/sixtop
 PROJECT_SOURCEFILES += sf-plugtest.c
-CFLAGS              += -DPROJECT_CONF_H=\"project-conf.h\" -Wno-nonnull-compare
+CFLAGS              += -Wno-nonnull-compare

 ifeq ($(BOARD),launchpad/cc2650)
 # Enable DAP and TAP by default for ETSI Plugtest
--- a/examples/cfs-coffee/Makefile
+++ b/examples/cfs-coffee/Makefile
@ -1,4 +1,3 @@
-DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
 CONTIKI = ../..

 MODULES += os/services/unit-test
--- a/examples/ipso-objects/Makefile
+++ b/examples/ipso-objects/Makefile
@ -4,8 +4,6 @@ CONTIKI_SOURCEFILES += serial-protocol.c example-ipso-temperature.c

 all: $(CONTIKI_PROJECT)

-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
-
 MODULES += os/net/app-layer/coap
 MODULES += os/services/lwm2m
 MODULES += os/services/ipso-objects
--- a/examples/ipv6/coap-example/Makefile
+++ b/examples/ipv6/coap-example/Makefile
@ -3,8 +3,6 @@ all: coap-example-server coap-example-client

 CONTIKI=../../..

-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
-
 # automatically build RESTful resources
 REST_RESOURCES_DIR = ./resources
 ifndef TARGET
--- a/examples/ipv6/json-ws/Makefile
+++ b/examples/ipv6/json-ws/Makefile
@ -13,8 +13,6 @@ endif

 MODULES += os/lib/json os/net/app-layer/httpd-ws

-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
-
 ifeq ($(TARGET),)
 -include Makefile.target
 endif
--- a/examples/ipv6/multicast/Makefile
+++ b/examples/ipv6/multicast/Makefile
@ -1,5 +1,3 @@
-DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
-
 CONTIKI_PROJECT = root intermediate sink
 all: $(CONTIKI_PROJECT)

--- a/examples/ipv6/native-border-router/Makefile
+++ b/examples/ipv6/native-border-router/Makefile
@ -4,7 +4,6 @@ MODULES += os/services/slip-cmd

 CONTIKI=../../..

-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 PROJECT_SOURCEFILES += border-router-cmds.c tun-bridge.c border-router-mac.c \
 slip-config.c slip-dev.c

--- a/examples/ipv6/rpl-border-router/Makefile
+++ b/examples/ipv6/rpl-border-router/Makefile
@ -3,7 +3,6 @@ all: $(CONTIKI_PROJECT)

 CONTIKI=../../..

-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 PROJECT_SOURCEFILES += slip-bridge.c

 #Simple built-in webserver is the default.
--- a/examples/ipv6/rpl-simple/Makefile
+++ b/examples/ipv6/rpl-simple/Makefile
@ -1,8 +1,6 @@
 all: node
 CONTIKI=../../..

-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
-
 # Set MAKE_MAC = MAKE_MAC_TSCH to run TSCH instead
 MAKE_MAC = MAKE_MAC_CSMA

--- a/examples/ipv6/rpl-tsch-sixtop/Makefile
+++ b/examples/ipv6/rpl-tsch-sixtop/Makefile
@ -3,7 +3,6 @@ all: $(CONTIKI_PROJECT)

 PROJECT_SOURCEFILES += sf-simple.c
 CONTIKI=../../..
-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

 MAKE_WITH_SECURITY ?= 0 # force Security from command line

--- a/examples/ipv6/rpl-tsch/Makefile
+++ b/examples/ipv6/rpl-tsch/Makefile
@ -2,7 +2,6 @@ CONTIKI_PROJECT = node
 all: $(CONTIKI_PROJECT)

 CONTIKI=../../..
-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

 MAKE_WITH_ORCHESTRA ?= 0 # force Orchestra from command line
 MAKE_WITH_SECURITY ?= 0 # force Security from command line
--- a/examples/ipv6/slip-radio/Makefile
+++ b/examples/ipv6/slip-radio/Makefile
@ -8,7 +8,6 @@ endif

 CONTIKI=../../..

-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 PROJECT_SOURCEFILES += slip-net.c
 ifeq ($(TARGET),sky)
  PROJECT_SOURCEFILES += slip-radio-cc2420.c slip-radio-sky-sensors.c
--- a/examples/logging/Makefile
+++ b/examples/logging/Makefile
@ -1,6 +1,5 @@
 CONTIKI_PROJECT = logging
 all: $(CONTIKI_PROJECT)

-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 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,3 @@
-DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
-
 all: mqtt-demo


--- a/examples/platform-specific/cc26xx/Makefile
+++ b/examples/platform-specific/cc26xx/Makefile
@ -1,4 +1,3 @@
-DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
 CONTIKI_PROJECT = cc26xx-demo

 all: $(CONTIKI_PROJECT)
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile
+++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile
@ -1,5 +1,3 @@
-DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
-
 all: cc26xx-web-demo

 REST_RESOURCES_DIR = ./resources
--- a/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile
+++ b/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile
@ -1,4 +1,3 @@
-DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
 CONTIKI_PROJECT = very-sleepy-demo

 all: $(CONTIKI_PROJECT)
--- a/examples/platform-specific/jn516x/rpl/border-router/Makefile
+++ b/examples/platform-specific/jn516x/rpl/border-router/Makefile
@ -8,7 +8,6 @@ CONTIKI=../../../../..
 MAKE_MAC = MAKE_MAC_TSCH
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 PROJECT_SOURCEFILES += slip-bridge.c slip.c

 ifeq ($(PREFIX),)
--- a/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
@ -10,7 +10,6 @@ MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/lib/json
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

 CFLAGS += -DWITH_COAP
 CFLAGS += -DUIP_CONF_TCP=0
--- a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
@ -10,7 +10,6 @@ MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/lib/json
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

 CFLAGS += -DWITH_COAP
 CFLAGS += -DUIP_CONF_TCP=0
--- a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
@ -10,7 +10,6 @@ MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/lib/json
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

 CFLAGS += -DWITH_COAP
 CFLAGS += -DUIP_CONF_TCP=0
--- a/examples/platform-specific/jn516x/rpl/node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/node/Makefile
@ -8,6 +8,5 @@ CONTIKI=../../../../..
 MAKE_MAC = MAKE_MAC_TSCH
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

 include $(CONTIKI)/Makefile.include
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
@ -5,7 +5,6 @@ JN516x_WITH_DONGLE = 1

 CONTIKI=../../../../../..

-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 PROJECTDIRS += .. ../../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
@ -4,7 +4,6 @@ TARGET ?= jn516x
 JN516x_WITH_DONGLE = 1
 CONTIKI=../../../../../..

-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 PROJECT_SOURCEFILES += slip-bridge.c slip.c

 PROJECTDIRS += .. ../../tools
--- a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
@ -5,7 +5,6 @@ JN516x_WITH_DONGLE = 1

 CONTIKI=../../../../../..

-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 PROJECTDIRS += .. ../../tools
 PROJECT_SOURCEFILES += rpl-tools.c

--- 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
@ -5,7 +5,6 @@ JN516x_WITH_DONGLE = 1

 CONTIKI=../../../../../..

-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 PROJECT_SOURCEFILES += slip-bridge.c slip.c

 PROJECTDIRS += .. ../../tools
--- a/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
@ -6,7 +6,6 @@ TARGET_WITH_UART1 = 1

 CONTIKI=../../../../..

-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c

--- a/examples/platform-specific/nrf52dk/coap-demo/Makefile
+++ b/examples/platform-specific/nrf52dk/coap-demo/Makefile
@ -1,5 +1,4 @@
 CONTIKI=../../../..
-CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

 ifeq ($(MAKECMDGOALS),)
 $(error Please specify whether coap-client or coap-server should be built)
--- a/examples/platform-specific/nrf52dk/mqtt-demo/Makefile
+++ b/examples/platform-specific/nrf52dk/mqtt-demo/Makefile
@ -1,5 +1,3 @@
-DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
-
 all: mqtt-demo

 CONTIKI_WITH_RPL = 0
--- a/examples/platform-specific/zoul/Makefile
+++ b/examples/platform-specific/zoul/Makefile
@ -1,5 +1,3 @@
-DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
-
 CONTIKI_PROJECT = test-tsl256x test-sht25 test-servo.c
 CONTIKI_PROJECT += test-bmp085-bmp180 test-motion test-rotation-sensor
 CONTIKI_PROJECT += test-grove-light-sensor test-grove-loudness-sensor
--- a/examples/platform-specific/zoul/at-test/Makefile
+++ b/examples/platform-specific/zoul/at-test/Makefile
@ -1,4 +1,3 @@
-DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
 CONTIKI_PROJECT = at-master-test
 MODULES = os/services/at-master
 all: $(CONTIKI_PROJECT)
--- a/examples/platform-specific/zoul/orion/client/Makefile
+++ b/examples/platform-specific/zoul/orion/client/Makefile
@ -1,4 +1,3 @@
-CFLAGS+=-DPROJECT_CONF_H=\"project-conf.h\"
 CONTIKI_PROJECT = client ifttt_client
 all: $(CONTIKI_PROJECT)

--- a/examples/platform-specific/zoul/orion/ip64-router/Makefile
+++ b/examples/platform-specific/zoul/orion/ip64-router/Makefile
@ -1,5 +1,3 @@
-DEFINES += PROJECT_CONF_H=\"project-conf.h\"
-
 all: ip64-router

 BOARD = orion
--- a/examples/platform-specific/zoul/rev-b/Makefile
+++ b/examples/platform-specific/zoul/rev-b/Makefile
@ -1,5 +1,3 @@
-DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
-
 CONTIKI_PROJECT = test-power-mgmt

 BOARD ?= remote-revb
--- a/examples/platform-specific/zoul/rtcc/Makefile
+++ b/examples/platform-specific/zoul/rtcc/Makefile
@ -1,4 +1,3 @@
-DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
 CONTIKI_PROJECT = test-rtcc

 TARGET = zoul
--- a/examples/sensniff/Makefile
+++ b/examples/sensniff/Makefile
@ -1,5 +1,3 @@
-DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
-
 CONTIKI_PROJECT = sensniff

 PROJECT_SOURCEFILES += sensniff-mac.c netstack.c
--- a/os/lib/heapmem.c
+++ b/os/lib/heapmem.c
@ -50,7 +50,7 @@

 #ifdef PROJECT_CONF_H
 /* Load the heapmem configuration from a project configuration file. */
-#include "project-conf.h"
+#include PROJECT_CONF_H
 #endif

 #include <stdint.h>
--- a/tests/07-base/code/Makefile
+++ b/tests/07-base/code/Makefile
@ -1,6 +1,5 @@
 all: test-ringbufindex

-CFLAGS  += -D PROJECT_CONF_H=\"project-conf.h\"
 MODULES += os/services/unit-test

 CONTIKI = ../../..
--- a/tests/08-ipv6/code/receiver/Makefile
+++ b/tests/08-ipv6/code/receiver/Makefile
@ -1,5 +1,3 @@
 CONTIKI=../../../..

-CFLAGS+= -DPROJECT_CONF_H=\"project-conf.h\"
-
 include $(CONTIKI)/Makefile.include
--- a/tests/08-ipv6/code/sender/Makefile
+++ b/tests/08-ipv6/code/sender/Makefile
@ -1,5 +1,3 @@
 CONTIKI=../../../..

-CFLAGS+= -DPROJECT_CONF_H=\"project-conf.h\"
-
 include $(CONTIKI)/Makefile.include
--- a/tests/13-ieee802154/code-flush-nbr-queue/Makefile
+++ b/tests/13-ieee802154/code-flush-nbr-queue/Makefile
@ -1,6 +1,5 @@
 all:

-CFLAGS  += -D PROJECT_CONF_H=\"project-conf.h\"
 MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/net/mac/tsch/sixtop os/services/unit-test

--- a/tests/13-ieee802154/code/Makefile
+++ b/tests/13-ieee802154/code/Makefile
@ -2,7 +2,6 @@ all: test-panid-handling test-tcsh-create-packet

 MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/services/unit-test
-CFLAGS  += -D PROJECT_CONF_H=\"project-conf.h\"

 TEST_CONFIG_TYPE ?= DEFAULT

--- a/tests/14-rpl-lite/code/Makefile
+++ b/tests/14-rpl-lite/code/Makefile
@ -1,6 +1,4 @@
 all: sender-node receiver-node root-node
 CONTIKI=../../..

-CFLAGS+=-DPROJECT_CONF_H=\"project-conf.h\"
-
 include $(CONTIKI)/Makefile.include
--- a/tests/15-rpl-classic/code/Makefile
+++ b/tests/15-rpl-classic/code/Makefile
@ -1,7 +1,5 @@
 all: sender-node receiver-node root-node
 CONTIKI=../../..

-CFLAGS+=-DPROJECT_CONF_H=\"project-conf.h\"
-
 CONTIKI_WITH_RPL_LITE = 0
 include $(CONTIKI)/Makefile.include
--- a/tests/16-6tisch/code/Makefile
+++ b/tests/16-6tisch/code/Makefile
@ -1,6 +1,5 @@
 all:

-CFLAGS  += -D PROJECT_CONF_H=\"project-conf.h\"
 APPS    += unit-test
 MODULES += os/net/mac/tsch os/net/mac/tsch/sixtop

--- a/tools/sky/uip6-bridge/Makefile
+++ b/tools/sky/uip6-bridge/Makefile
@ -6,7 +6,7 @@ CONTIKI=../../..
 endif
 endif

-DEFINES=WITH_SLIP=1,PROJECT_CONF_H=\"bridge-conf.h\"
+DEFINES=WITH_SLIP=1

 ifndef TARGET
 TARGET=sky
--- a/tools/sky/uip6-bridge/project-conf.h
+++ b/tools/sky/uip6-bridge/project-conf.h