Fix makefile

Change-Id: I8371cee8f68788329d193bb9e0da052033291c48
diff --git a/mbtk/test/Makefile b/mbtk/test/Makefile
index 28cd0b4..d894df5 100755
--- a/mbtk/test/Makefile
+++ b/mbtk/test/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../..
-include ../Make.defines
+BUILD_ROOT = $(shell pwd)/..
+include $(BUILD_ROOT)/Make.defines
 
 #exclude_dirs := include bin
 #test_dirs := $(shell find . -maxdepth 1 -type d)
diff --git a/mbtk/test/liblynq_lib/Makefile b/mbtk/test/liblynq_lib/Makefile
index 55e0360..d8eea05 100755
--- a/mbtk/test/liblynq_lib/Makefile
+++ b/mbtk/test/liblynq_lib/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libmbtk_audio/Makefile b/mbtk/test/libmbtk_audio/Makefile
index 1045e71..241948d 100755
--- a/mbtk/test/libmbtk_audio/Makefile
+++ b/mbtk/test/libmbtk_audio/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libmbtk_coap/Makefile b/mbtk/test/libmbtk_coap/Makefile
index 28bf46c..8d29a6a 100755
--- a/mbtk/test/libmbtk_coap/Makefile
+++ b/mbtk/test/libmbtk_coap/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libmbtk_ecall/Makefile b/mbtk/test/libmbtk_ecall/Makefile
index 28bf46c..8d29a6a 100755
--- a/mbtk/test/libmbtk_ecall/Makefile
+++ b/mbtk/test/libmbtk_ecall/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libmbtk_factory/Makefile b/mbtk/test/libmbtk_factory/Makefile
index d93d8c5..80766f8 100755
--- a/mbtk/test/libmbtk_factory/Makefile
+++ b/mbtk/test/libmbtk_factory/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libmbtk_fota/Makefile b/mbtk/test/libmbtk_fota/Makefile
index 33a7f43..e972d28 100755
--- a/mbtk/test/libmbtk_fota/Makefile
+++ b/mbtk/test/libmbtk_fota/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libmbtk_ftp/Makefile b/mbtk/test/libmbtk_ftp/Makefile
index d520ad9..b815c36 100755
--- a/mbtk/test/libmbtk_ftp/Makefile
+++ b/mbtk/test/libmbtk_ftp/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libmbtk_gnss/Makefile b/mbtk/test/libmbtk_gnss/Makefile
index d520ad9..b815c36 100755
--- a/mbtk/test/libmbtk_gnss/Makefile
+++ b/mbtk/test/libmbtk_gnss/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libmbtk_http/Makefile b/mbtk/test/libmbtk_http/Makefile
index ad42a13..e33b144 100755
--- a/mbtk/test/libmbtk_http/Makefile
+++ b/mbtk/test/libmbtk_http/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libmbtk_lib/Makefile b/mbtk/test/libmbtk_lib/Makefile
index 844f199..99172c3 100755
--- a/mbtk/test/libmbtk_lib/Makefile
+++ b/mbtk/test/libmbtk_lib/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libmbtk_mqtt/Makefile b/mbtk/test/libmbtk_mqtt/Makefile
index 4802389..f60163a 100755
--- a/mbtk/test/libmbtk_mqtt/Makefile
+++ b/mbtk/test/libmbtk_mqtt/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libmbtk_net/Makefile b/mbtk/test/libmbtk_net/Makefile
index d172606..f113edb 100755
--- a/mbtk/test/libmbtk_net/Makefile
+++ b/mbtk/test/libmbtk_net/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libmbtk_ril/Makefile b/mbtk/test/libmbtk_ril/Makefile
index 6197845..7acd22f 100755
--- a/mbtk/test/libmbtk_ril/Makefile
+++ b/mbtk/test/libmbtk_ril/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libmbtk_tcpip/Makefile b/mbtk/test/libmbtk_tcpip/Makefile
index 0ee33e7..cc8b84a 100755
--- a/mbtk/test/libmbtk_tcpip/Makefile
+++ b/mbtk/test/libmbtk_tcpip/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/libql_lib/Makefile b/mbtk/test/libql_lib/Makefile
index 3acd13c..736aee1 100755
--- a/mbtk/test/libql_lib/Makefile
+++ b/mbtk/test/libql_lib/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=
 
diff --git a/mbtk/test/others/Makefile b/mbtk/test/others/Makefile
index 7dc5e8b..bac02a3 100755
--- a/mbtk/test/others/Makefile
+++ b/mbtk/test/others/Makefile
@@ -1,5 +1,5 @@
-ROOT = $(shell pwd)/../../..
-include $(ROOT)/mbtk/Make.defines
+BUILD_ROOT = $(shell pwd)/../..
+include $(BUILD_ROOT)/Make.defines
 
 INC_DIR +=