Updated Makefiles and CMakeLists.txt to point to resource, not oic-resource

Change-Id: I6a9b95042157d2f14ca8670a17198a487fc0fc3e
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>

diff --git a/service/Notification-Manager/NotificationManager/build/linux/Makefile b/service/Notification-Manager/NotificationManager/build/linux/Makefile
index 392f6f9..9ed1f87 100644 (file)
--- a/service/Notification-Manager/NotificationManager/build/linux/Makefile
+++ b/service/Notification-Manager/NotificationManager/build/linux/Makefile
@@ -1,6 +1,6 @@
 VPATH = ../../src:../../../SampleApp/linux/sampleConsumer:../../../SampleApp/linux/sampleProvider
 
-OCPATH = ../../../../../oic-resource
+OCPATH = ../../../../../resource
 OCINCLUDE = $(OCPATH)/include
 STACKINCLUDE = $(OCPATH)/csdk/stack/include
 SOCKETINCLUDE = $(OCPATH)/csdk/ocsocket/include

diff --git a/service/Notification-Manager/build/linux/makefile/Makefile b/service/Notification-Manager/build/linux/makefile/Makefile
index 047408a..652e2ba 100644 (file)
--- a/service/Notification-Manager/build/linux/makefile/Makefile
+++ b/service/Notification-Manager/build/linux/makefile/Makefile
@@ -1,11 +1,11 @@
-OCPATH = ../../../../../oic-resource/build/linux
+OCPATH = ../../../../../resource/build/linux
 NOTIFICATIONMGRPATH = ../../../NotificationManager/build/linux
 
-.PHONY : oic-resource NotificationManager
+.PHONY : resource NotificationManager
 
 all: .PHONY
 
-oic-resource:
+resource:
        cd $(OCPATH) && $(MAKE)
 
 NotificationManager:

diff --git a/service/protocol-plugin/build/linux/Makefile b/service/protocol-plugin/build/linux/Makefile
index b4f4a06..09a335e 100644 (file)
--- a/service/protocol-plugin/build/linux/Makefile
+++ b/service/protocol-plugin/build/linux/Makefile
@@ -1,14 +1,14 @@
 PROTOCOL_ROOT = ../../
 
-.PHONY:pre oic-resource plugin-manager plugins sample-app
+.PHONY:pre resource plugin-manager plugins sample-app
 
 all: .PHONY
 
 pre:
        -mkdir release
 
-oic-resource:
-       cd $(PROTOCOL_ROOT)../../oic-resource/build/linux && $(MAKE)
+resource:
+       cd $(PROTOCOL_ROOT)../../resource/build/linux && $(MAKE)
 
 plugin-manager:
        cd $(PROTOCOL_ROOT)plugin-manager/build/linux && $(MAKE)

diff --git a/service/protocol-plugin/plugin-manager/build/linux/Makefile b/service/protocol-plugin/plugin-manager/build/linux/Makefile
index c9aac36..908d8b0 100644 (file)
--- a/service/protocol-plugin/plugin-manager/build/linux/Makefile
+++ b/service/protocol-plugin/plugin-manager/build/linux/Makefile
@@ -6,7 +6,7 @@ CXX_FLAGS = -std=c++0x -Wall
 
 CPLUFF_DIR = ../../../lib/cpluff/libcpluff
 
-LIB_DIR = ../../../../../oic-resource
+LIB_DIR = ../../../../../resource
 
 SRC = ../../src/
 

diff --git a/service/protocol-plugin/plugins/hue/build/linux/Makefile b/service/protocol-plugin/plugins/hue/build/linux/Makefile
index f361269..02c5de3 100644 (file)
--- a/service/protocol-plugin/plugins/hue/build/linux/Makefile
+++ b/service/protocol-plugin/plugins/hue/build/linux/Makefile
@@ -19,7 +19,7 @@ SRC_CPP += $(SRC_DIR)/http_curl.cpp
 SRC_CPP += $(SRC_DIR)/HueLightHandler.cpp 
 SRC_CPP += $(SRC_DIR)/HueBridge.cpp
 
-OIC_DIR = $(COMMON_DIR)/../../../../oic-resource
+OIC_DIR = $(COMMON_DIR)/../../../../resource
 OCLIB_DIR = $(OIC_DIR)/build/linux/$(BUILD)/obj
 CSDK_DIR = $(OIC_DIR)/csdk/build/linux/$(BUILD)
 

diff --git a/service/protocol-plugin/plugins/mqtt/build/linux/Makefile b/service/protocol-plugin/plugins/mqtt/build/linux/Makefile
index 6e1802a..91aa1e2 100644 (file)
--- a/service/protocol-plugin/plugins/mqtt/build/linux/Makefile
+++ b/service/protocol-plugin/plugins/mqtt/build/linux/Makefile
@@ -4,7 +4,7 @@ CXX = g++
 
 CXX_FLAGS = -std=c++0x -Wall -pthread
 
-LIB_DIR = ../../../../../../oic-resource
+LIB_DIR = ../../../../../../resource
 
 SRC_DIR = ../../src
 

diff --git a/service/protocol-plugin/sample-app/linux/fan-control/Makefile b/service/protocol-plugin/sample-app/linux/fan-control/Makefile
index ead7740..1b964ec 100644 (file)
--- a/service/protocol-plugin/sample-app/linux/fan-control/Makefile
+++ b/service/protocol-plugin/sample-app/linux/fan-control/Makefile
@@ -4,7 +4,7 @@ CXX = g++
 
 CXX_FLAGS = -std=c++0x -Wall -pthread
 
-LIB_DIR = ../../../../../oic-resource
+LIB_DIR = ../../../../../resource
 
 CXX_INC := -I$(LIB_DIR)/include/ 
 CXX_INC += -I$(LIB_DIR)/csdk/stack/include/ 

diff --git a/service/soft-sensor-manager/build/arduino/Makefile b/service/soft-sensor-manager/build/arduino/Makefile
index 71810c8..82dba85 100644 (file)
--- a/service/soft-sensor-manager/build/arduino/Makefile
+++ b/service/soft-sensor-manager/build/arduino/Makefile
@@ -47,8 +47,8 @@ post_job:
 
 clean:
        
-#      @cd ${CUR_DIR}/../../../oic-resource/ && make clean
-#      @cd ${CUR_DIR}/../../../oic-resource/csdk && make deepclean
+#      @cd ${CUR_DIR}/../../../resource/ && make clean
+#      @cd ${CUR_DIR}/../../../resource/csdk && make deepclean
 #      @cd ${CUR_DIR}/9_Arduino_THSensorApp && make clean
 #      @cd ${CUR_DIR} 
        rm -rf ./${RST_NAME}

diff --git a/service/soft-sensor-manager/build/linux/Makefile b/service/soft-sensor-manager/build/linux/Makefile
index 56c8861..ee41b51 100644 (file)
--- a/service/soft-sensor-manager/build/linux/Makefile
+++ b/service/soft-sensor-manager/build/linux/Makefile
@@ -51,8 +51,8 @@ post_job:
 
 clean:
        
-#      @cd ${CUR_DIR}/../../../oic-resource/ && make clean
-#      @cd ${CUR_DIR}/../../../oic-resource/csdk && make deepclean
+#      @cd ${CUR_DIR}/../../../resource/ && make clean
+#      @cd ${CUR_DIR}/../../../resource/csdk && make deepclean
 #      @cd ${CUR_DIR}/9_Arduino_THSensorApp && make clean
 #      @cd ${CUR_DIR} 
        rm -rf ./${RST_NAME}

diff --git a/service/soft-sensor-manager/build/tizen/SampleApp/ClientApp/CMakeLists.txt b/service/soft-sensor-manager/build/tizen/SampleApp/ClientApp/CMakeLists.txt
index e604b0e..89b15b8 100644 (file)
--- a/service/soft-sensor-manager/build/tizen/SampleApp/ClientApp/CMakeLists.txt
+++ b/service/soft-sensor-manager/build/tizen/SampleApp/ClientApp/CMakeLists.txt
@@ -3,11 +3,11 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR})
 SET(SS_SAMPLE_SSMCLIENT "SSMClient")
 SET(SS_SAMPLE_SSMCLIENT_PATH, "${SS_SAMPLE_PATH}/ClientApp");
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/csdk/stack/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/csdk/ocsocket/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/csdk/ocrandom/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/csdk/logger/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/csdk/stack/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/csdk/ocsocket/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/csdk/ocrandom/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/csdk/logger/include)
 INCLUDE_DIRECTORIES(${INCLUDE_INSTALL_DIR}/boost)
 INCLUDE_DIRECTORIES(${SS_SDK_PATH})
 INCLUDE_DIRECTORIES(${SS_SAMPLE_SSMCLIENT_PATH}/include)

diff --git a/service/soft-sensor-manager/build/tizen/SampleApp/THSensorApp/CMakeLists.txt b/service/soft-sensor-manager/build/tizen/SampleApp/THSensorApp/CMakeLists.txt
index 2c1c2d9..d74f5a5 100644 (file)
--- a/service/soft-sensor-manager/build/tizen/SampleApp/THSensorApp/CMakeLists.txt
+++ b/service/soft-sensor-manager/build/tizen/SampleApp/THSensorApp/CMakeLists.txt
@@ -3,11 +3,11 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR})
 SET(SS_SAMPLE_THSEN "THSensorApp")
 SET(SS_SAMPLE_THSEN_PATH, "${SS_SAMPLE_PATH}/THSensorApp");
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/csdk/stack/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/csdk/ocsocket/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/csdk/ocrandom/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/csdk/logger/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/csdk/stack/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/csdk/ocsocket/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/csdk/ocrandom/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/csdk/logger/include)
 INCLUDE_DIRECTORIES(${INCLUDE_INSTALL_DIR}/boost)
 INCLUDE_DIRECTORIES(${SS_SDK_PATH})
 INCLUDE_DIRECTORIES(${SS_SAMPLE_THSEN_PATH}/include)

diff --git a/service/soft-sensor-manager/build/tizen/SampleApp/THSensorApp1/CMakeLists.txt b/service/soft-sensor-manager/build/tizen/SampleApp/THSensorApp1/CMakeLists.txt
index 6e1758f..d1909c9 100644 (file)
--- a/service/soft-sensor-manager/build/tizen/SampleApp/THSensorApp1/CMakeLists.txt
+++ b/service/soft-sensor-manager/build/tizen/SampleApp/THSensorApp1/CMakeLists.txt
@@ -3,11 +3,11 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR})
 SET(SS_SAMPLE_THSEN1 "THSensorApp1")
 SET(SS_SAMPLE_THSEN1_PATH, "${SS_SAMPLE_PATH}/THSensorApp1");
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/csdk/stack/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/csdk/ocsocket/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/csdk/ocrandom/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/oic-resource/csdk/logger/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/csdk/stack/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/csdk/ocsocket/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/csdk/ocrandom/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/resource/csdk/logger/include)
 INCLUDE_DIRECTORIES(${INCLUDE_INSTALL_DIR}/boost)
 INCLUDE_DIRECTORIES(${SS_SDK_PATH})
 INCLUDE_DIRECTORIES(${SS_SAMPLE_THSEN1_PATH}/include)

diff --git a/service/things-manager/build/arduino/Makefile b/service/things-manager/build/arduino/Makefile
index fd6f459..bcf733e 100644 (file)
--- a/service/things-manager/build/arduino/Makefile
+++ b/service/things-manager/build/arduino/Makefile
@@ -1,17 +1,17 @@
-.PHONY : oic-resource SampleApp
+.PHONY : resource SampleApp
 
 all: .PHONY
 
-oic-resource: clean
-       cd ../../../../oic-resource/csdk/build/arduino && $(MAKE) PLATFORM=arduinomega ARDUINOWIFI=0 BUILD=release
+resource: clean
+       cd ../../../../resource/csdk/build/arduino && $(MAKE) PLATFORM=arduinomega ARDUINOWIFI=0 BUILD=release
 
 SampleApp:
        cd ../../sampleapp/arduino/bookmark && $(MAKE) BUILD=release
        cd ../../sampleapp/arduino/light && $(MAKE) BUILD=release
 
 clean:
-       cd ../../../../oic-resource/build/linux && make clean
-       cd ../../../../oic-resource/csdk/build/arduino && make deepclean 
+       cd ../../../../resource/build/linux && make clean
+       cd ../../../../resource/csdk/build/arduino && make deepclean 
        cd ../../sampleapp/arduino/bookmark && $(MAKE) clean
        cd ../../sampleapp/arduino/light && $(MAKE) clean
 

diff --git a/service/things-manager/build/linux/Makefile b/service/things-manager/build/linux/Makefile
index d53695a..cff5ed1 100644 (file)
--- a/service/things-manager/build/linux/Makefile
+++ b/service/things-manager/build/linux/Makefile
@@ -1,4 +1,4 @@
-.PHONY : pre oic-resource lib tgm sdk sampleapp
+.PHONY : pre resource lib tgm sdk sampleapp
 
 #.PHONY : lib tgm sdk sampleapp 
 all: .PHONY
@@ -6,8 +6,8 @@ all: .PHONY
 pre:
        -mkdir release
 
-oic-resource:
-       cd ../../../../oic-resource/build/linux && $(MAKE)
+resource:
+       cd ../../../../resource/build/linux && $(MAKE)
 
 lib:
        cd ../../lib/jsoncpp && $(MAKE)

diff --git a/service/things-manager/lib/jsoncpp/Makefile b/service/things-manager/lib/jsoncpp/Makefile
index a4bf8d4..0a14a83 100644 (file)
--- a/service/things-manager/lib/jsoncpp/Makefile
+++ b/service/things-manager/lib/jsoncpp/Makefile
@@ -1,5 +1,5 @@
 
-#IOT_BASE=../../../oic-resource
+#IOT_BASE=../../../resource
 #BOOST_ROOT=../../../
 #BOOST_DIR = $(BOOST_ROOT)boost_1_51_0
 #BOOST=${BOOST_DIR}

diff --git a/service/things-manager/lib/sqlite/Makefile b/service/things-manager/lib/sqlite/Makefile
index 867af8a..6bee3e7 100644 (file)
--- a/service/things-manager/lib/sqlite/Makefile
+++ b/service/things-manager/lib/sqlite/Makefile
@@ -1,5 +1,5 @@
 
-#IOT_BASE=../../../oic-resource
+#IOT_BASE=../../../resource
 #BOOST_ROOT=../../../
 #BOOST_DIR = $(BOOST_ROOT)boost_1_51_0
 #BOOST=${BOOST_DIR}

diff --git a/service/things-manager/sampleapp/tizen/switch/CMakeLists.txt b/service/things-manager/sampleapp/tizen/switch/CMakeLists.txt
index 3428e72..63e6e33 100644 (file)
--- a/service/things-manager/sampleapp/tizen/switch/CMakeLists.txt
+++ b/service/things-manager/sampleapp/tizen/switch/CMakeLists.txt
@@ -80,4 +80,4 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PKGNAME}.xml DESTINATION "/usr/share
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PKGNAME}.rule DESTINATION /etc/smack/accesses2.d)
 
 # added - T.G.M
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/images/ DESTINATION ${IMGDIR} FILES_MATCHING PATTERN "*.png")
\ No newline at end of file
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/images/ DESTINATION ${IMGDIR} FILES_MATCHING PATTERN "*.png")

diff --git a/service/things-manager/sdk/build/linux/Makefile b/service/things-manager/sdk/build/linux/Makefile
index 54f4d0f..71f51ec 100644 (file)
--- a/service/things-manager/sdk/build/linux/Makefile
+++ b/service/things-manager/sdk/build/linux/Makefile
@@ -1,7 +1,7 @@
 
 
-#OIC_ROOT=../../../oic-resource/
-IOT_BASE=../../../../../oic-resource
+#OIC_ROOT=../../../resource/
+IOT_BASE=../../../../../resource
 BOOST_ROOT=../../../../../../
 BOOST_DIR = $(BOOST_ROOT)boost_1_51_0
 #BOOST=${BOOST_DIR}

diff --git a/service/things-manager/tgm/build/linux/Makefile b/service/things-manager/tgm/build/linux/Makefile
index 38540fc..bf66afa 100644 (file)
--- a/service/things-manager/tgm/build/linux/Makefile
+++ b/service/things-manager/tgm/build/linux/Makefile
@@ -1,7 +1,7 @@
 
 
-#OIC_ROOT=../../../oic-resource/
-IOT_BASE=../../../../../oic-resource
+#OIC_ROOT=../../../resource/
+IOT_BASE=../../../../../resource
 BOOST_ROOT=../../../../../../
 BOOST_DIR = $(BOOST_ROOT)boost_1_51_0
 #BOOST=${BOOST_DIR}