From e2325ddba4caf334a2736a53e37101a3bdfe1a61 Mon Sep 17 00:00:00 2001
From: Leandro Lanzieri <leandro.lanzieri@haw-hamburg.de>
Date: Tue, 17 Dec 2019 14:05:44 +0100
Subject: [PATCH] examples/wakaama: Configure server only if not set by Kconfig

---
 examples/wakaama/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/examples/wakaama/Makefile b/examples/wakaama/Makefile
index 0fabee86d7..5243e62224 100644
--- a/examples/wakaama/Makefile
+++ b/examples/wakaama/Makefile
@@ -31,10 +31,6 @@ DEVELHELP ?= 1
 # Specific the server URI  address (NOTE: Domain names not supported yet)
 SERVER_URI ?= '"coap://[fd00:dead:beef::1]"'
 
-ifneq (,$(SERVER_URI))
-  CFLAGS += -DCONFIG_LWM2M_SERVER_URI=$(SERVER_URI)
-endif
-
 # NOTE: Add the package for wakaama
 USEPKG += wakaama
 # Uncomment to enable Wakaama debug log
@@ -47,3 +43,8 @@ USEPKG += wakaama
 CFLAGS += -DLWM2M_CLIENT_MODE
 
 include $(RIOTBASE)/Makefile.include
+
+# Configure server via CFLAGS only if not done via Kconfig
+ifndef CONFIG_LWM2M_SERVER_URI
+  CFLAGS += -DCONFIG_LWM2M_SERVER_URI=$(SERVER_URI)
+endif