Fix for building OIC code. Makefile was pointing to ccf-utilities which was incorrect...

Change-Id: Ic2944a890d9856bb32f940946d6fd5e3c42d3300

diff --git a/RELEASE.txt b/RELEASE.txt
index c8cd4a4..de7a8fd 100644 (file)
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -75,8 +75,8 @@ Other Notes:
 \r
 \r
 How to build:\r
-1.     In repo oic-core, root folder ccf-resource consists of \91OIC\92 folder.  Inside OIC folder there is a Makefile. \r
-2.     Before building, make sure to have contents from oic-utilities repo at the folder level where oic-core is. This would be ccf-utilities. \r
+1.     Root folder oic-resource consists of \91OIC\92 folder.  Inside OIC folder there is a Makefile. \r
+2.     Before building, make sure to have contents from oic-utilities repo at the folder level where oic-resource is.  \r
 3.     Use \91make\92 to build the entire OIC code. This would build the C++ SDK, stack and samples. \r
 \r
 Samples:\r

diff --git a/csdk/makefile b/csdk/makefile
index 18fc996..622d0af 100644 (file)
--- a/csdk/makefile
+++ b/csdk/makefile
@@ -18,7 +18,7 @@ OCSOCKET_DIR  = $(ROOT_DIR)/ocsocket
 LCOAP_DIR      = $(ROOT_DIR)/libcoap-4.1.1
 OCCOAP_DIR     = $(ROOT_DIR)/occoap
 OCTBSTACK_DIR  = $(ROOT_DIR)/stack
-UTILS_DIR      = $(ROOT_DIR)/../../ccf-utilities/tb
+UTILS_DIR      = $(ROOT_DIR)/../../oic-utilities/tb
 CJSON_DIR      = $(UTILS_DIR)/cJSON
 
 OCCOAP_SRC     = $(OCCOAP_DIR)/src

diff --git a/csdk/stack/test/arduino/Makefile b/csdk/stack/test/arduino/Makefile
index 4a5a102..9d949ff 100644 (file)
--- a/csdk/stack/test/arduino/Makefile
+++ b/csdk/stack/test/arduino/Makefile
@@ -6,7 +6,7 @@ OCSOCK_DIR = $(ROOT_DIR)/ocsocket
 OCCOAP_DIR = $(ROOT_DIR)/occoap
 LOGGER_DIR = $(ROOT_DIR)/logger
 RANDOM_DIR = $(ROOT_DIR)/ocrandom
-JSON_DIR = $(ROOT_DIR)/../../../ccf-utilities/tb/cJSON
+JSON_DIR = $(ROOT_DIR)/../../../oic-utilities/tb/cJSON
 OCSTACK_DIR = $(ROOT_DIR)/stack
 BIN_DIR = $(OCSTACK_DIR)/bin/arduino/
 OBJ_DIR = $(OCSTACK_DIR)/obj/arduino/

diff --git a/csdk/stack/test/linux/Makefile b/csdk/stack/test/linux/Makefile
index 57aeadb..b771ec6 100644 (file)
--- a/csdk/stack/test/linux/Makefile
+++ b/csdk/stack/test/linux/Makefile
@@ -11,7 +11,7 @@ OCCOAP_DIR = $(ROOT_DIR)/occoap
 OCSTACK_DIR = $(ROOT_DIR)/stack
 LOGGER_DIR = $(ROOT_DIR)/logger
 RANDOM_DIR = $(ROOT_DIR)/ocrandom
-JSON_DIR = $(ROOT_DIR)/../../../ccf-utilities/tb/cJSON
+JSON_DIR = $(ROOT_DIR)/../../../oic-utilities/tb/cJSON
 
 OBJ_DIR = ./
 INC_DIRS = -I$(LOGGER_DIR)/include/ -I$(OCCOAP_DIR)/include/ \