Don't define in Makefile things that can be defined in project-conf.h

examples/http-socket/Makefile

@@ -3,5 +3,4 @@ CONTIKI=../..
 MODULES += os/net/app-layer/http-socket
 
 CONTIKI_WITH_RPL_LITE = 0
-CFLAGS += -DUIP_CONF_TCP=1
 include $(CONTIKI)/Makefile.include

examples/http-socket/project-conf.h

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2017, George Oikonomou - http://www.spd.gr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+/*---------------------------------------------------------------------------*/
+#define UIP_CONF_TCP 1
+/*---------------------------------------------------------------------------*/
+#endif /* PROJECT_CONF_H_ */

examples/ip64-router/Makefile

@@ -1,5 +1,4 @@
 all: ip64-router
 CONTIKI=../..
 
-CFLAGS += -DUIP_CONF_TCP=1
 include $(CONTIKI)/Makefile.include

examples/ip64-router/project-conf.h

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2017, George Oikonomou - http://www.spd.gr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+/*---------------------------------------------------------------------------*/
+#define UIP_CONF_TCP 1
+/*---------------------------------------------------------------------------*/
+#endif /* PROJECT_CONF_H_ */

examples/ipv6/rpl-border-router/Makefile

@@ -16,12 +16,10 @@ PROJECT_SOURCEFILES += slip-bridge.c
 
 WITH_WEBSERVER=1
 ifeq ($(WITH_WEBSERVER),1)
-CFLAGS += -DUIP_CONF_TCP=1
 CFLAGS += -DWEBSERVER=1
 PROJECT_SOURCEFILES += httpd-simple.c
 else ifneq ($(WITH_WEBSERVER), 0)
 MODULES += $(WITH_WEBSERVER)
-CFLAGS += -DUIP_CONF_TCP=1
 CFLAGS += -DWEBSERVER=2
 endif
 

examples/ipv6/rpl-border-router/project-conf.h

@@ -39,4 +39,8 @@
 #define WEBSERVER_CONF_CFS_CONNS 2
 #endif
 
+#if WEBSERVER
+#define UIP_CONF_TCP 1
+#endif
+
 #endif /* PROJECT_ROUTER_CONF_H_ */

examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile

@@ -12,7 +12,6 @@ PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
-CFLAGS += -DUIP_CONF_TCP=0
 MODULES += os/net/app-layer/coap
 
 include $(CONTIKI)/Makefile.include

examples/platform-specific/jn516x/rpl/coap-dongle-node/project-conf.h

@@ -34,6 +34,8 @@
 #ifndef __PROJECT_CONF_H__
 #define __PROJECT_CONF_H__
 
+#define UIP_CONF_TCP 0
+
 #include "../common-conf.h"
 
 #endif /* __PROJECT_CONF_H__ */

examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile

@@ -12,7 +12,6 @@ PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
-CFLAGS += -DUIP_CONF_TCP=0
 MODULES += os/net/app-layer/coap
 
 include $(CONTIKI)/Makefile.include

examples/platform-specific/jn516x/rpl/coap-dr1175-node/project-conf.h

@@ -34,6 +34,8 @@
 #ifndef __PROJECT_CONF_H__
 #define __PROJECT_CONF_H__
 
+#define UIP_CONF_TCP 0
+
 #include "../common-conf.h"
 
 #endif /* __PROJECT_CONF_H__ */

examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile

@@ -12,7 +12,6 @@ PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
-CFLAGS += -DUIP_CONF_TCP=0
 MODULES += os/net/app-layer/coap
 
 include $(CONTIKI)/Makefile.include

examples/platform-specific/jn516x/rpl/coap-dr1199-node/project-conf.h

@@ -34,6 +34,8 @@
 #ifndef __PROJECT_CONF_H__
 #define __PROJECT_CONF_H__
 
+#define UIP_CONF_TCP 0
+
 #include "../common-conf.h"
 
 #endif /* __PROJECT_CONF_H__ */

examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile

@@ -9,7 +9,6 @@ PROJECTDIRS += .. ../../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
 MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/net/app-layer/coap
 MODULES += os/services/orchestra os/lib/json

examples/platform-specific/jn516x/tsch/simple-sensor-network/node/project-conf.h

@@ -37,6 +37,7 @@
 
 #include "../../common-conf.h"
 
+#define UIP_CONF_TCP 0
 #define UART_BAUD_RATE UART_RATE_115200
 
 #endif /* __PROJECT_CONF_H__ */

examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile

@@ -11,7 +11,6 @@ PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
 MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/net/app-layer/coap
 MODULES += os/services/orchestra os/lib/json

examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/project-conf.h

@@ -35,6 +35,8 @@
 #define UIP_FALLBACK_INTERFACE rpl_interface
 #endif
 
+#define UIP_CONF_TCP 0
+
 /* Needed for slip-bridge */
 #define SLIP_BRIDGE_CONF_NO_PUTCHAR 0
 

examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile

@@ -10,7 +10,6 @@ PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
 MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/net/app-layer/coap
 MODULES += os/services/orchestra os/lib/json

examples/platform-specific/jn516x/tsch/tx-power-verification/node/project-conf.h

@@ -36,6 +36,7 @@
 
 #include "../../common-conf.h"
 
+#define UIP_CONF_TCP 0
 #define UART_BAUD_RATE UART_RATE_115200
 
 #endif /* __PROJECT_CONF_H__ */

examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile

@@ -11,7 +11,6 @@ PROJECTDIRS += .. ../../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
-CFLAGS += -DUIP_CONF_TCP=0
 MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/net/app-layer/coap
 MODULES += os/services/orchestra os/lib/json

examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/project-conf.h

@@ -40,6 +40,7 @@
 
 #include "../../common-conf.h"
 
+#define UIP_CONF_TCP 0
 #define QUEUEBUF_CONF_NUM 16
 
 #define TSCH_QUEUE_CONF_MAX_NEIGHBOR_QUEUES 8

examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile

@@ -11,7 +11,6 @@ PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
 MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/net/app-layer/coap
 MODULES += os/services/orchestra os/lib/json

examples/platform-specific/jn516x/tsch/uart1-test-node/project-conf.h

@@ -36,6 +36,8 @@
 
 #include "../common-conf.h"
 
+#define UIP_CONF_TCP 0
+
 #define UART_BAUD_RATE UART_RATE_115200
 
 #define UART1_BAUD_RATE UART_RATE_115200

examples/platform-specific/zoul/orion/ip64-router/Makefile

@@ -6,7 +6,6 @@ CONTIKI = ../../../../..
 
 WITH_IP64 = 1
 
-DEFINES += UIP_CONF_TCP=1
 PROJECT_SOURCEFILES += httpd-simple.c
 
 include $(CONTIKI)/Makefile.include

examples/platform-specific/zoul/orion/ip64-router/project-conf.h

@@ -65,6 +65,7 @@
 #define UIP_CONF_RECEIVE_WINDOW     128
 #define WEBSERVER_CONF_CFS_CONNS    2
 #define UIP_CONF_BUFFER_SIZE        900
+#define UIP_CONF_TCP                  1
 #define UIP_CONF_TCP_MSS            128
 
 #endif /* PROJECT_CONF_H_ */