diff options
Diffstat (limited to 'service/soft-sensor-manager')
12 files changed, 4 insertions, 17 deletions
diff --git a/service/soft-sensor-manager/SSMCore/build/linux/Makefile b/service/soft-sensor-manager/SSMCore/build/linux/Makefile index 8cf72ba7d..9711461b7 100644 --- a/service/soft-sensor-manager/SSMCore/build/linux/Makefile +++ b/service/soft-sensor-manager/SSMCore/build/linux/Makefile @@ -13,7 +13,7 @@ EXCLUDE_LIST=SSMCore_JNI.cpp # C++ type Compile Flag define. CXX=g++ CXX_FLAGS=-std=c++0x -Wall -pthread -DLINUX -ldl -DNDEBUG -CXX_INC=-I${INC_PATH}/ -I${SRC_PATH}/ -I${IOT_BASE}/include/ -I${IOT_LOG_DIR}/include/ -I${IOT_BASE}/csdk/stack/include -I${IOT_BASE}/csdk/ocsocket/include -I${IOT_BASE}/csdk/ocrandom/include -I${IOT_BASE}/csdk/logger/include -I${BOOST} +CXX_INC=-I${INC_PATH}/ -I${SRC_PATH}/ -I${IOT_BASE}/include/ -I${IOT_LOG_DIR}/include/ -I${IOT_BASE}/csdk/stack/include -I${IOT_BASE}/csdk/ocrandom/include -I${IOT_BASE}/csdk/logger/include -I${BOOST} CXX_LIB=-L"" CXX_SRCPATH=${wildcard ${SRC_PATH}/**/*.cpp} @@ -25,7 +25,7 @@ CXX_OBJLIST=${CXX_USESRCS:.cpp=.o} # C type Compile Flag define. GCC=gcc GCC_FLAGS=-Wall -pthread -DLINUX -ldl -DNDEBUG -GCC_INC=-I../../ -I${INC_PATH}/ -I${IOT_BASE}/include/ -I${IOT_BASE}/csdk/stack/include -I${IOT_BASE}/csdk/ocsocket/include -I${IOT_BASE}/csdk/ocrandom/include -I${IOT_BASE}/csdk/logger/include -I${BOOST} -I${SRC_PATH} -I${SRC_PATH}/Common -I${SRC_PATH}/QueryProcessor -I${SRC_PATH}/SensorProcessor -I${SRC_PATH}/SSMInterface +GCC_INC=-I../../ -I${INC_PATH}/ -I${IOT_BASE}/include/ -I${IOT_BASE}/csdk/stack/include -I${IOT_BASE}/csdk/ocrandom/include -I${IOT_BASE}/csdk/logger/include -I${BOOST} -I${SRC_PATH} -I${SRC_PATH}/Common -I${SRC_PATH}/QueryProcessor -I${SRC_PATH}/SensorProcessor -I${SRC_PATH}/SSMInterface GCC_SRCPATH=${wildcard ${SRC_PATH}/**/*.c} GCC_SRCLIST=${notdir ${GCC_SRCPATH}} diff --git a/service/soft-sensor-manager/SampleApp/arduino/Reference_Thing/build/makefile b/service/soft-sensor-manager/SampleApp/arduino/Reference_Thing/build/makefile index 4abd7ec98..edb513604 100644 --- a/service/soft-sensor-manager/SampleApp/arduino/Reference_Thing/build/makefile +++ b/service/soft-sensor-manager/SampleApp/arduino/Reference_Thing/build/makefile @@ -19,7 +19,6 @@ TB_DIR = ../../../../../../resource/csdk LOGGER_DIR = $(TB_DIR)/logger OC_LOG_DIR = $(TB_DIR)/../oc_logger TBSTACK_DIR = $(TB_DIR)/stack -TBSOCKET_DIR = $(TB_DIR)/ocsocket include $(TB_DIR)/local.properties include $(TB_DIR)/$(PLATFORM).properties @@ -27,7 +26,6 @@ include $(TB_DIR)/$(PLATFORM).properties VPATH := $(SDIR_ARD_PLATFORM) #include directories -OCSOCK_DIR = $(TB_DIR)/ocsocket LOGGER_DIR = $(TB_DIR)/logger STACK_DIR = $(TB_DIR)/stack INC_DIRS = -I$(OCSOCK_DIR)/include/ -I$(OC_LOG_DIR)/include -I$(LOGGER_DIR)/include -I$(STACK_DIR)/include -I../include diff --git a/service/soft-sensor-manager/SampleApp/arduino/THSensorApp/build/makefile b/service/soft-sensor-manager/SampleApp/arduino/THSensorApp/build/makefile index e3203bc85..39a6e69c5 100644 --- a/service/soft-sensor-manager/SampleApp/arduino/THSensorApp/build/makefile +++ b/service/soft-sensor-manager/SampleApp/arduino/THSensorApp/build/makefile @@ -15,7 +15,6 @@ TB_DIR = ../../../../../../resource/csdk LOGGER_DIR = $(TB_DIR)/logger OC_LOG_DIR = $(TB_DIR)/../oc_logger TBSTACK_DIR = $(TB_DIR)/stack -TBSOCKET_DIR = $(TB_DIR)/ocsocket include $(TB_DIR)/local.properties include $(TB_DIR)/$(PLATFORM).properties @@ -23,7 +22,6 @@ include $(TB_DIR)/$(PLATFORM).properties VPATH := $(SDIR_ARD_PLATFORM) #include directories -OCSOCK_DIR = $(TB_DIR)/ocsocket LOGGER_DIR = $(TB_DIR)/logger STACK_DIR = $(TB_DIR)/stack INC_DIRS = -I$(OCSOCK_DIR)/include/ -I$(OC_LOG_DIR)/include -I$(LOGGER_DIR)/include -I$(STACK_DIR)/include diff --git a/service/soft-sensor-manager/SampleApp/arduino/THSensorApp1/build/makefile b/service/soft-sensor-manager/SampleApp/arduino/THSensorApp1/build/makefile index e3203bc85..39a6e69c5 100644 --- a/service/soft-sensor-manager/SampleApp/arduino/THSensorApp1/build/makefile +++ b/service/soft-sensor-manager/SampleApp/arduino/THSensorApp1/build/makefile @@ -15,7 +15,6 @@ TB_DIR = ../../../../../../resource/csdk LOGGER_DIR = $(TB_DIR)/logger OC_LOG_DIR = $(TB_DIR)/../oc_logger TBSTACK_DIR = $(TB_DIR)/stack -TBSOCKET_DIR = $(TB_DIR)/ocsocket include $(TB_DIR)/local.properties include $(TB_DIR)/$(PLATFORM).properties @@ -23,7 +22,6 @@ include $(TB_DIR)/$(PLATFORM).properties VPATH := $(SDIR_ARD_PLATFORM) #include directories -OCSOCK_DIR = $(TB_DIR)/ocsocket LOGGER_DIR = $(TB_DIR)/logger STACK_DIR = $(TB_DIR)/stack INC_DIRS = -I$(OCSOCK_DIR)/include/ -I$(OC_LOG_DIR)/include -I$(LOGGER_DIR)/include -I$(STACK_DIR)/include diff --git a/service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/build/makefile b/service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/build/makefile index 9f7905099..df83b9660 100644 --- a/service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/build/makefile +++ b/service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/build/makefile @@ -19,7 +19,6 @@ TB_DIR = ../../../../../../resource/csdk LOGGER_DIR = $(TB_DIR)/logger OC_LOG_DIR = $(TB_DIR)/../oc_logger TBSTACK_DIR = $(TB_DIR)/stack -TBSOCKET_DIR = $(TB_DIR)/ocsocket include $(TB_DIR)/local.properties include $(TB_DIR)/$(PLATFORM).properties @@ -27,7 +26,6 @@ include $(TB_DIR)/$(PLATFORM).properties VPATH := $(SDIR_ARD_PLATFORM) #include directories -OCSOCK_DIR = $(TB_DIR)/ocsocket LOGGER_DIR = $(TB_DIR)/logger STACK_DIR = $(TB_DIR)/stack INC_DIRS = -I$(OCSOCK_DIR)/include/ -I$(OC_LOG_DIR)/include -I$(LOGGER_DIR)/include -I$(STACK_DIR)/include -I../include diff --git a/service/soft-sensor-manager/SampleApp/linux/THSensorApp/build/Makefile b/service/soft-sensor-manager/SampleApp/linux/THSensorApp/build/Makefile index 28802e8d7..f2da903b4 100644 --- a/service/soft-sensor-manager/SampleApp/linux/THSensorApp/build/Makefile +++ b/service/soft-sensor-manager/SampleApp/linux/THSensorApp/build/Makefile @@ -11,7 +11,7 @@ TARGET=THSensorApp CXX=g++ CXX_FLAGS=-std=c++0x -Wall -DLINUX -CXX_INC=-I${INC_PATH}/ -I${IOT_BASE}/include/ -I${IOT_LOG_DIR}/include/ -I${IOT_BASE}/csdk/stack/include -I${IOT_BASE}/csdk/ocsocket/include -I${IOT_BASE}/csdk/ocrandom/include -I${IOT_BASE}/csdk/logger/include -I${BOOST} +CXX_INC=-I${INC_PATH}/ -I${IOT_BASE}/include/ -I${IOT_LOG_DIR}/include/ -I${IOT_BASE}/csdk/stack/include -I${IOT_BASE}/csdk/ocrandom/include -I${IOT_BASE}/csdk/logger/include -I${BOOST} CXX_LIB+=${IOT_RELEASE}/${IOT_LIB} CXX_LIB+=${IOT_CSDK_RELEASE}/${IOT_CSDK_LIB} diff --git a/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/build/Makefile b/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/build/Makefile index a195f01bc..5b449aac7 100644 --- a/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/build/Makefile +++ b/service/soft-sensor-manager/SampleApp/linux/THSensorApp1/build/Makefile @@ -11,7 +11,7 @@ TARGET=THSensorApp1 CXX=g++ CXX_FLAGS=-std=c++0x -Wall -DLINUX -CXX_INC=-I${INC_PATH}/ -I${IOT_BASE}/include/ -I${IOT_LOG_DIR}/include/ -I${IOT_BASE}/csdk/stack/include -I${IOT_BASE}/csdk/ocsocket/include -I${IOT_BASE}/csdk/ocrandom/include -I${IOT_BASE}/csdk/logger/include -I${BOOST} +CXX_INC=-I${INC_PATH}/ -I${IOT_BASE}/include/ -I${IOT_LOG_DIR}/include/ -I${IOT_BASE}/csdk/stack/include -I${IOT_BASE}/csdk/ocrandom/include -I${IOT_BASE}/csdk/logger/include -I${BOOST} CXX_LIB+=${IOT_RELEASE}/${IOT_LIB} CXX_LIB+=${IOT_CSDK_RELEASE}/${IOT_CSDK_LIB} diff --git a/service/soft-sensor-manager/SampleApp/tizen/SSMTesterApp/CMakeLists.txt b/service/soft-sensor-manager/SampleApp/tizen/SSMTesterApp/CMakeLists.txt index 7aa6d406b..7ec7d7e54 100644 --- a/service/soft-sensor-manager/SampleApp/tizen/SSMTesterApp/CMakeLists.txt +++ b/service/soft-sensor-manager/SampleApp/tizen/SSMTesterApp/CMakeLists.txt @@ -10,7 +10,6 @@ SET(CMAKE_EXE_LINKER_FLAGS " -Wl,--as-needed -Wl,--hash-style=both") #INCLUDE_DIRECTORIES(include) #INCLUDE_DIRECTORIES(csdk/stack/include) -#INCLUDE_DIRECTORIES(csdk/ocsocket/include) #INCLUDE_DIRECTORIES(csdk/ocrandom/include) #INCLUDE_DIRECTORIES(csdk/logger/include) #INCLUDE_DIRECTORIES(${INCLUDE_INSTALL_DIR}/boost) diff --git a/service/soft-sensor-manager/SampleApp/tizen/SSMTesterApp/makefile_org b/service/soft-sensor-manager/SampleApp/tizen/SSMTesterApp/makefile_org index 85ece274d..118d960e2 100644 --- a/service/soft-sensor-manager/SampleApp/tizen/SSMTesterApp/makefile_org +++ b/service/soft-sensor-manager/SampleApp/tizen/SSMTesterApp/makefile_org @@ -13,7 +13,6 @@ CXX_FLAGS.release := -std=c++0x -Wall -pthread CXX_INC := -I./include/ CXX_INC += -I./csdk/stack/include -CXX_INC += -I./csdk/ocsocket/include CXX_INC += -I./csdk/ocrandom/include CXX_INC += -I./csdk/logger/include CXX_INC += -I/usr/local/boost_1_51_0 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 89b15b876..cb0c214ba 100644 --- a/service/soft-sensor-manager/build/tizen/SampleApp/ClientApp/CMakeLists.txt +++ b/service/soft-sensor-manager/build/tizen/SampleApp/ClientApp/CMakeLists.txt @@ -5,7 +5,6 @@ SET(SS_SAMPLE_SSMCLIENT_PATH, "${SS_SAMPLE_PATH}/ClientApp"); 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) 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 d74f5a520..86c8d8939 100644 --- a/service/soft-sensor-manager/build/tizen/SampleApp/THSensorApp/CMakeLists.txt +++ b/service/soft-sensor-manager/build/tizen/SampleApp/THSensorApp/CMakeLists.txt @@ -5,7 +5,6 @@ SET(SS_SAMPLE_THSEN_PATH, "${SS_SAMPLE_PATH}/THSensorApp"); 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) 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 d1909c90d..192b8e12a 100644 --- a/service/soft-sensor-manager/build/tizen/SampleApp/THSensorApp1/CMakeLists.txt +++ b/service/soft-sensor-manager/build/tizen/SampleApp/THSensorApp1/CMakeLists.txt @@ -5,7 +5,6 @@ SET(SS_SAMPLE_THSEN1_PATH, "${SS_SAMPLE_PATH}/THSensorApp1"); 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) |