Renaming libsensord folder to client

updated the cmake files etc correspondingly

Change-Id: I47e4cc1abbaf8218ac6f4ec299a2b70a00d8ee19

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1087d73..c3b2022 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -88,6 +88,6 @@ ENDIF()
 
 add_subdirectory(plugins/rotation_vector)
 add_subdirectory(server)
-add_subdirectory(libsensord)
+add_subdirectory(client)
 add_subdirectory(shared)
 

diff --git a/src/libsensord/CMakeLists.txt b/src/client/CMakeLists.txt
similarity index 100%
rename from src/libsensord/CMakeLists.txt
rename to src/client/CMakeLists.txt

diff --git a/src/libsensord/client.cpp b/src/client/client.cpp
similarity index 100%
rename from src/libsensord/client.cpp
rename to src/client/client.cpp

diff --git a/src/libsensord/client_common.cpp b/src/client/client_common.cpp
similarity index 100%
rename from src/libsensord/client_common.cpp
rename to src/client/client_common.cpp

diff --git a/src/libsensord/client_common.h b/src/client/client_common.h
similarity index 100%
rename from src/libsensord/client_common.h
rename to src/client/client_common.h

diff --git a/src/libsensord/command_channel.cpp b/src/client/command_channel.cpp
similarity index 100%
rename from src/libsensord/command_channel.cpp
rename to src/client/command_channel.cpp

diff --git a/src/libsensord/command_channel.h b/src/client/command_channel.h
similarity index 100%
rename from src/libsensord/command_channel.h
rename to src/client/command_channel.h

diff --git a/src/libsensord/creg_event_info.h b/src/client/creg_event_info.h
similarity index 100%
rename from src/libsensord/creg_event_info.h
rename to src/client/creg_event_info.h

diff --git a/src/libsensord/csensor_event_listener.cpp b/src/client/csensor_event_listener.cpp
similarity index 100%
rename from src/libsensord/csensor_event_listener.cpp
rename to src/client/csensor_event_listener.cpp

diff --git a/src/libsensord/csensor_event_listener.h b/src/client/csensor_event_listener.h
similarity index 100%
rename from src/libsensord/csensor_event_listener.h
rename to src/client/csensor_event_listener.h

diff --git a/src/libsensord/csensor_handle_info.cpp b/src/client/csensor_handle_info.cpp
similarity index 100%
rename from src/libsensord/csensor_handle_info.cpp
rename to src/client/csensor_handle_info.cpp

diff --git a/src/libsensord/csensor_handle_info.h b/src/client/csensor_handle_info.h
similarity index 100%
rename from src/libsensord/csensor_handle_info.h
rename to src/client/csensor_handle_info.h

diff --git a/src/libsensord/poller.cpp b/src/client/poller.cpp
similarity index 100%
rename from src/libsensord/poller.cpp
rename to src/client/poller.cpp

diff --git a/src/libsensord/poller.h b/src/client/poller.h
similarity index 100%
rename from src/libsensord/poller.h
rename to src/client/poller.h

diff --git a/src/libsensord/sensor.pc.in b/src/client/sensor.pc.in
similarity index 100%
rename from src/libsensord/sensor.pc.in
rename to src/client/sensor.pc.in

diff --git a/src/libsensord/sensor_info_manager.cpp b/src/client/sensor_info_manager.cpp
similarity index 100%
rename from src/libsensord/sensor_info_manager.cpp
rename to src/client/sensor_info_manager.cpp

diff --git a/src/libsensord/sensor_info_manager.h b/src/client/sensor_info_manager.h
similarity index 100%
rename from src/libsensord/sensor_info_manager.h
rename to src/client/sensor_info_manager.h

diff --git a/src/plugins/accel/CMakeLists.txt b/src/plugins/accel/CMakeLists.txt
index 4fcaf97..cab1ebf 100755 (executable)
--- a/src/plugins/accel/CMakeLists.txt
+++ b/src/plugins/accel/CMakeLists.txt
@@ -4,7 +4,7 @@ project(accel CXX)
 SET(SENSOR_NAME accel_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 FOREACH(flag ${accel_pkgs_LDFLAGS})
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")

diff --git a/src/plugins/auto_rotation/CMakeLists.txt b/src/plugins/auto_rotation/CMakeLists.txt
index 13b56e5..ff0610b 100644 (file)
--- a/src/plugins/auto_rotation/CMakeLists.txt
+++ b/src/plugins/auto_rotation/CMakeLists.txt
@@ -4,7 +4,7 @@ project(auto_rotation CXX)
 SET(SENSOR_NAME auto_rotation_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 FOREACH(flag ${auto_rotation_pkgs_LDFLAGS})
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")

diff --git a/src/plugins/bio_led_red/CMakeLists.txt b/src/plugins/bio_led_red/CMakeLists.txt
index 1911384..51b3db8 100644 (file)
--- a/src/plugins/bio_led_red/CMakeLists.txt
+++ b/src/plugins/bio_led_red/CMakeLists.txt
@@ -4,7 +4,7 @@ project(bio_led_red CXX)
 SET(SENSOR_NAME bio_led_red_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 FOREACH(flag ${bio_led_red_pkgs_LDFLAGS})
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")

diff --git a/src/plugins/fusion/CMakeLists.txt b/src/plugins/fusion/CMakeLists.txt
index 131a2a8..4554eae 100755 (executable)
--- a/src/plugins/fusion/CMakeLists.txt
+++ b/src/plugins/fusion/CMakeLists.txt
@@ -4,7 +4,7 @@ project(fusion CXX)
 SET(SENSOR_NAME fusion_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
 
 FOREACH(flag ${fusion_pkgs_LDFLAGS})

diff --git a/src/plugins/geo/CMakeLists.txt b/src/plugins/geo/CMakeLists.txt
index ee97dc7..4ecac57 100755 (executable)
--- a/src/plugins/geo/CMakeLists.txt
+++ b/src/plugins/geo/CMakeLists.txt
@@ -4,7 +4,7 @@ project(geo CXX)
 SET(SENSOR_NAME geo_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 FOREACH(flag ${geo_pkgs_LDFLAGS})
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")

diff --git a/src/plugins/gravity/CMakeLists.txt b/src/plugins/gravity/CMakeLists.txt
index 5491c47..66bf3fa 100755 (executable)
--- a/src/plugins/gravity/CMakeLists.txt
+++ b/src/plugins/gravity/CMakeLists.txt
@@ -4,7 +4,7 @@ project(gravity CXX)
 SET(SENSOR_NAME gravity_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
 
 FOREACH(flag ${gravity_pkgs_LDFLAGS})

diff --git a/src/plugins/gyro/CMakeLists.txt b/src/plugins/gyro/CMakeLists.txt
index c8e6d38..6f7edd6 100755 (executable)
--- a/src/plugins/gyro/CMakeLists.txt
+++ b/src/plugins/gyro/CMakeLists.txt
@@ -4,7 +4,7 @@ project(gyro CXX)
 SET(SENSOR_NAME gyro_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 FOREACH(flag ${gyro_pkgs_LDFLAGS})
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")

diff --git a/src/plugins/light/CMakeLists.txt b/src/plugins/light/CMakeLists.txt
index 71ffd6a..44dc3bb 100755 (executable)
--- a/src/plugins/light/CMakeLists.txt
+++ b/src/plugins/light/CMakeLists.txt
@@ -4,7 +4,7 @@ project(light CXX)
 SET(SENSOR_NAME light_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 FOREACH(flag ${light_pkgs_LDFLAGS})
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")

diff --git a/src/plugins/linear_accel/CMakeLists.txt b/src/plugins/linear_accel/CMakeLists.txt
index c819bf7..586dad0 100755 (executable)
--- a/src/plugins/linear_accel/CMakeLists.txt
+++ b/src/plugins/linear_accel/CMakeLists.txt
@@ -4,7 +4,7 @@ project(linear_accel CXX)
 SET(SENSOR_NAME linear_accel_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
 
 FOREACH(flag ${linear_accel_pkgs_LDFLAGS})

diff --git a/src/plugins/orientation/CMakeLists.txt b/src/plugins/orientation/CMakeLists.txt
index 455f0f4..15a5054 100755 (executable)
--- a/src/plugins/orientation/CMakeLists.txt
+++ b/src/plugins/orientation/CMakeLists.txt
@@ -4,7 +4,7 @@ project(orientation CXX)
 SET(SENSOR_NAME orientation_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
 
 FOREACH(flag ${orientation_pkgs_LDFLAGS})

diff --git a/src/plugins/pressure/CMakeLists.txt b/src/plugins/pressure/CMakeLists.txt
index db0c209..955f393 100755 (executable)
--- a/src/plugins/pressure/CMakeLists.txt
+++ b/src/plugins/pressure/CMakeLists.txt
@@ -4,7 +4,7 @@ project(pressure CXX)
 SET(SENSOR_NAME pressure_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 FOREACH(flag ${pressure_pkgs_LDFLAGS})
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")

diff --git a/src/plugins/proxi/CMakeLists.txt b/src/plugins/proxi/CMakeLists.txt
index 7cd377e..1b9d4e3 100755 (executable)
--- a/src/plugins/proxi/CMakeLists.txt
+++ b/src/plugins/proxi/CMakeLists.txt
@@ -4,7 +4,7 @@ project(proxi CXX)
 SET(SENSOR_NAME proxi_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 FOREACH(flag ${proxi_pkgs_LDFLAGS})
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")

diff --git a/src/plugins/rotation_vector/gaming_rv/CMakeLists.txt b/src/plugins/rotation_vector/gaming_rv/CMakeLists.txt
index 2d13a9f..da5bc7b 100755 (executable)
--- a/src/plugins/rotation_vector/gaming_rv/CMakeLists.txt
+++ b/src/plugins/rotation_vector/gaming_rv/CMakeLists.txt
@@ -4,7 +4,7 @@ project(gaming_rv CXX)
 SET(SENSOR_NAME gaming_rv_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
 
 FOREACH(flag ${gaming_rv_pkgs_LDFLAGS})

diff --git a/src/plugins/rotation_vector/geomagnetic_rv/CMakeLists.txt b/src/plugins/rotation_vector/geomagnetic_rv/CMakeLists.txt
index 56bd3c1..7055dc7 100755 (executable)
--- a/src/plugins/rotation_vector/geomagnetic_rv/CMakeLists.txt
+++ b/src/plugins/rotation_vector/geomagnetic_rv/CMakeLists.txt
@@ -4,7 +4,7 @@ project(geomagnetic_rv CXX)
 SET(SENSOR_NAME geomagnetic_rv_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
 
 FOREACH(flag ${geomagnetic_rv_pkgs_LDFLAGS})

diff --git a/src/plugins/rotation_vector/rv/CMakeLists.txt b/src/plugins/rotation_vector/rv/CMakeLists.txt
index 4cbb90f..dd785ff 100755 (executable)
--- a/src/plugins/rotation_vector/rv/CMakeLists.txt
+++ b/src/plugins/rotation_vector/rv/CMakeLists.txt
@@ -4,7 +4,7 @@ project(rv CXX)
 SET(SENSOR_NAME rv_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
 
 FOREACH(flag ${rv_pkgs_LDFLAGS})

diff --git a/src/plugins/rotation_vector/rv_raw/CMakeLists.txt b/src/plugins/rotation_vector/rv_raw/CMakeLists.txt
index 99c993f..d4cdfa1 100755 (executable)
--- a/src/plugins/rotation_vector/rv_raw/CMakeLists.txt
+++ b/src/plugins/rotation_vector/rv_raw/CMakeLists.txt
@@ -4,7 +4,7 @@ project(rv_raw CXX)
 SET(SENSOR_NAME rv_raw_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES(rv_raw_pkgs REQUIRED vconf)

diff --git a/src/plugins/sensor_fusion/CMakeLists.txt b/src/plugins/sensor_fusion/CMakeLists.txt
index 627d6ec..5779576 100755 (executable)
--- a/src/plugins/sensor_fusion/CMakeLists.txt
+++ b/src/plugins/sensor_fusion/CMakeLists.txt
@@ -6,7 +6,7 @@ SET(EXEC_PREFIX "\${prefix}")
 SET(VERSION 1.0)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 set(PROJECT_MAJOR_VERSION "0")
 set(PROJECT_MINOR_VERSION "0")

diff --git a/src/plugins/temperature/CMakeLists.txt b/src/plugins/temperature/CMakeLists.txt
index a2e02a5..e230207 100755 (executable)
--- a/src/plugins/temperature/CMakeLists.txt
+++ b/src/plugins/temperature/CMakeLists.txt
@@ -4,7 +4,7 @@ project(temperature CXX)
 SET(SENSOR_NAME temperature_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES(temp_pkgs REQUIRED vconf)

diff --git a/src/plugins/tilt/CMakeLists.txt b/src/plugins/tilt/CMakeLists.txt
index 6bd9b97..727727c 100755 (executable)
--- a/src/plugins/tilt/CMakeLists.txt
+++ b/src/plugins/tilt/CMakeLists.txt
@@ -4,7 +4,7 @@ project(tilt CXX)
 SET(SENSOR_NAME tilt_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
 
 FOREACH(flag ${tilt_pkgs_LDFLAGS})

diff --git a/src/plugins/ultraviolet/CMakeLists.txt b/src/plugins/ultraviolet/CMakeLists.txt
index 609fa5f..b711897 100644 (file)
--- a/src/plugins/ultraviolet/CMakeLists.txt
+++ b/src/plugins/ultraviolet/CMakeLists.txt
@@ -4,7 +4,7 @@ project(ultraviolet CXX)
 SET(SENSOR_NAME ultraviolet_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 FOREACH(flag ${uv_pkgs_LDFLAGS})
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")

diff --git a/src/plugins/uncal_gyro/CMakeLists.txt b/src/plugins/uncal_gyro/CMakeLists.txt
index 056962a..d983a91 100644 (file)
--- a/src/plugins/uncal_gyro/CMakeLists.txt
+++ b/src/plugins/uncal_gyro/CMakeLists.txt
@@ -4,7 +4,7 @@ project(uncal_gyro CXX)
 SET(SENSOR_NAME uncal_gyro_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 include_directories(${CMAKE_SOURCE_DIR}/src/plugins/sensor_fusion)
 
 FOREACH(flag ${gravity_pkgs_LDFLAGS})

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 0a55dec..4d4ebfb 100755 (executable)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -13,7 +13,7 @@ FOREACH(flag ${server_pkgs_CFLAGS})
 ENDFOREACH(flag)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lrt -ldl -pthread -fPIE")
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")

diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index 70b421d..b11b4b1 100644 (file)
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -15,7 +15,7 @@ ENDFOREACH(flag)
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 
 add_library(sensord-server SHARED
        worker_thread.cpp

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a59c341..66d24d9 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,7 +14,7 @@ add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
 configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
+include_directories(${CMAKE_SOURCE_DIR}/src/client)
 include_directories(${CMAKE_SOURCE_DIR}/src/shared)
 
 FOREACH(flag ${pkgs_CFLAGS})
@@ -23,7 +23,7 @@ ENDFOREACH(flag)
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 
-link_directories(../src/libsensord/)
+link_directories(../src/client/)
 
 add_executable(api-test src/api-test.c)
 add_executable(sensor-test src/sensor-test.c src/check-sensor.c)