Repo Merge: Modified makefile for the soft sensor manager

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

diff --git a/service/soft-sensor-manager/build/arduino/environment.mk b/service/soft-sensor-manager/build/arduino/environment.mk
index d132eea..7e16a38 100644 (file)
--- a/service/soft-sensor-manager/build/arduino/environment.mk
+++ b/service/soft-sensor-manager/build/arduino/environment.mk
@@ -1,8 +1,8 @@
 # root path of each PC.
 ROOT_DIR=/home/choi/tmp/test/upload/Iotivity-Candidate
 
-# oic-service folder path.
-FD_SSM=${ROOT_DIR}/oic-service/SoftSensorManager
+# service folder path.
+FD_SSM=${ROOT_DIR}/service/SoftSensorManager
 FD_SAMPLEAPP=${FD_SSM}/SampleApp
 FD_BUILD=${FD_SSM}/build
 
@@ -10,8 +10,8 @@ FD_BUILD=${FD_SSM}/build
 OUTPUTS_DIR=${FD_BUILD}/arduino/release
 
 # ioc-resource folder path.
-# IOT_BASE=${FD_SAMPLEAPP}/arduino/oic-resource_a
-IOT_BASE=${ROOT_DIR}/oic-resource
+# IOT_BASE=${FD_SAMPLEAPP}/arduino/resource_a
+IOT_BASE=${ROOT_DIR}/resource
 IOT_MAKE_PATH=${IOT_BASE}
 IOT_RELEASE=${IOT_BASE}/release/obj
 IOT_CSDK_RELEASE=${IOT_BASE}/csdk/release

diff --git a/service/soft-sensor-manager/build/linux/environment.mk b/service/soft-sensor-manager/build/linux/environment.mk
index 1cb753b..c10c51f 100644 (file)
--- a/service/soft-sensor-manager/build/linux/environment.mk
+++ b/service/soft-sensor-manager/build/linux/environment.mk
@@ -1,19 +1,19 @@
 # root path of each PC.
-ROOT_DIR=/home/iotivity/Desktop/Project/Iotivity-Candidate
+ROOT_DIR=${PWD}/../../../..
 
 # boost folder path.
 BOOST_BASE=/home/iotivity/Desktop/boost_1_56_0
 
 # ioc-resource folder path.
-IOT_BASE=${ROOT_DIR}/oic-resource
-IOT_MAKE_PATH=${IOT_BASE}/build/linux
+IOT_BASE=${ROOT_DIR}/resource
+IOT_MAKE_PATH=${IOT_BASE}
 IOT_RELEASE=${IOT_MAKE_PATH}/release/obj
-IOT_CSDK_RELEASE=${IOT_BASE}/csdk/build/linux/release
+IOT_CSDK_RELEASE=${IOT_BASE}/csdk/release
 IOT_LIB=liboc.a
 IOT_CSDK_LIB=liboctbstack.a
 
-# oic-service folder path.
-FD_SSM=${ROOT_DIR}/oic-service/soft-sensor-manager
+# service folder path.
+FD_SSM=${ROOT_DIR}/service/soft-sensor-manager
 FD_SDK=${FD_SSM}/SDK
 FD_SSMCORE=${FD_SSM}/SSMCore
 FD_SAMPLEAPP=${FD_SSM}/SampleApp