refined package dependency

Change-Id: I30253e1ee3e27c57614dca7dff906e24230c858a
Signed-off-by: Young Ik Cho <youngik.cho@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b09bc02..18f509e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,25 +18,19 @@ INCLUDE_DIRECTORIES (
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED
        capi-appfw-application
-       capi-appfw-app-manager
        capi-system-runtime-info
        capi-system-device
        capi-system-info
-       capi-system-sensor
-       capi-location-manager
        capi-network-wifi
        capi-system-system-settings
        capi-telephony-sim
        capi-network-tethering
-       capi-system-media-key
        capi-network-bluetooth
-       capi-media-sound-manager
        pmapi
        haptic
        sysman
        aul
        vconf
-       sensor
        glib-2.0
        elementary
        icu-i18n
@@ -45,7 +39,6 @@ pkg_check_modules(pkgs REQUIRED
        osp-appfw
        osp-appfw-server
        libwbxml2
-       wifi-direct
 )
 
 FOREACH(flag ${pkgs_CFLAGS})

diff --git a/packaging/osp-app-service.spec b/packaging/osp-app-service.spec
index 454640c..0679d65 100644 (file)
--- a/packaging/osp-app-service.spec
+++ b/packaging/osp-app-service.spec
@@ -1,7 +1,7 @@
 Name:          osp-app-service
 Summary:       osp application service
 Version:       1.2.2.1
-Release:       4
+Release:       5
 Group:         System/Libraries
 License:       Apache-2.0 or Flora
 Source0:       %{name}-%{version}.tar.gz
@@ -9,11 +9,8 @@ BuildRequires: cmake
 BuildRequires: hash-signer
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(chromium)
-BuildRequires: pkgconfig(capi-system-media-key)
 BuildRequires: pkgconfig(capi-network-bluetooth)
 BuildRequires: pkgconfig(capi-appfw-application)
-BuildRequires: pkgconfig(capi-appfw-app-manager)
-BuildRequires: pkgconfig(capi-appfw-package-manager)
 BuildRequires: pkgconfig(capi-system-device)
 BuildRequires: pkgconfig(capi-system-info)
 BuildRequires: pkgconfig(alarm-service)
@@ -37,17 +34,12 @@ BuildRequires:      pkgconfig(dbus-1)
 BuildRequires: pkgconfig(edbus)
 BuildRequires: pkgconfig(calendar-service2)
 BuildRequires: pkgconfig(osp-appfw-server)
-BuildRequires: osp-appfw-internal-devel
 BuildRequires: osp-shell-internal-devel
 
 BuildRequires: pkgconfig(icu-i18n)
 BuildRequires: pkgconfig(capi-system-system-settings)
 BuildRequires: pkgconfig(capi-system-runtime-info)
-BuildRequires: pkgconfig(capi-location-manager)
-BuildRequires: pkgconfig(capi-media-sound-manager)
-BuildRequires: pkgconfig(capi-system-sensor)
 BuildRequires: pkgconfig(capi-network-wifi)
-BuildRequires: pkgconfig(sensor)
 BuildRequires: pkgconfig(pmapi)
 BuildRequires: pkgconfig(tapi)
 BuildRequires: pkgconfig(capi-telephony-sim)
@@ -58,7 +50,6 @@ BuildRequires:        pkgconfig(capi-network-tethering)
 BuildRequires: pkgconfig(haptic)
 BuildRequires: pkgconfig(ail)
 BuildRequires: pkgconfig(sysman)
-BuildRequires: pkgconfig(wifi-direct)
 BuildRequires: pkgconfig(capi-network-wifi-direct)
 BuildRequires: pkgconfig(libwbxml2)
 
@@ -77,7 +68,6 @@ Requires(post): /usr/bin/vconftool
 Requires(post): ss-server
 Requires(preun): /usr/bin/systemctl
 Requires(post): /usr/bin/systemctl
-Requires(postun): /usr/bin/systemctl
 
 %description
 osp application service

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index e54b71e..e5243bf
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -3,8 +3,27 @@ PROJECT(plugins)
 
 SET(PLUGIN_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..")
 
+INCLUDE(FindPkgConfig)
+pkg_check_modules(plugins REQUIRED
+       capi-appfw-application
+       capi-messaging-messages
+       aul
+       vconf
+       glib-2.0
+       chromium
+       osp-appfw
+       osp-appfw-server
+       calendar-service2
+)
+
+FOREACH(flag ${plugins_CFLAGS})
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+
 ADD_SUBDIRECTORY(alarm-condition-handler)
 ADD_SUBDIRECTORY(nfc-condition-handler)
 ADD_SUBDIRECTORY(accessory-condition-handler)
 ADD_SUBDIRECTORY(message-condition-handler)
 ADD_SUBDIRECTORY(calendar-condition-handler)
+

diff --git a/plugins/accessory-condition-handler/CMakeLists.txt b/plugins/accessory-condition-handler/CMakeLists.txt
index 8497981..387bbb8 100644 (file)
--- a/plugins/accessory-condition-handler/CMakeLists.txt
+++ b/plugins/accessory-condition-handler/CMakeLists.txt
@@ -1,11 +1,6 @@
 SET (this_target osp-cond-accessory)
 
 INCLUDE_DIRECTORIES (
-       /usr/include/osp
-       /usr/include/osp/app
-       /usr/include/osp/base
-       /usr/include/osp/io
-       /usr/include/osp/server
        ../../inc
        ./
        )
@@ -30,5 +25,6 @@ ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 SET_TARGET_PROPERTIES(${this_target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_INSTALL_DIR}/lib")
 
-TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -L/usr/lib/osp-server -losp-appfw-server -Wl,--no-undefined -Wl,--as-needed)
-TARGET_LINK_LIBRARIES(${this_target} "-lail")
+TARGET_LINK_LIBRARIES(${this_target} -Wl,--no-undefined -Wl,--as-needed)
+TARGET_LINK_LIBRARIES(${this_target} ${plugins_LDFLAGS})
+

diff --git a/plugins/alarm-condition-handler/CMakeLists.txt b/plugins/alarm-condition-handler/CMakeLists.txt
index 59e5067..8301035 100644 (file)
--- a/plugins/alarm-condition-handler/CMakeLists.txt
+++ b/plugins/alarm-condition-handler/CMakeLists.txt
@@ -1,21 +1,14 @@
 SET (this_target osp-cond-alarm)
 
 INCLUDE_DIRECTORIES (
-       /usr/include/osp
-       /usr/include/vconf
-       /usr/include/osp/app
-       /usr/include/osp/base
-       /usr/include/osp/io
-       /usr/include/osp/system
-       /usr/include/osp/server
-       /usr/include/appfw
        ../../inc
        )
 
 SET (${this_target}_SOURCE_FILES
        AlarmConditionHandler.cpp
        )
-       
+
+
 ## SET EXTRA COMPILER FLAGS
 SET(EXTRA_CFLAGS  "${EXTRA_CFLAGS} -fPIC -Wall" )
 
@@ -29,14 +22,7 @@ SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EX
 ## Create Library
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
-ADD_DEPENDENCIES(${this_target} osp-appfw)
-
 SET_TARGET_PROPERTIES(${this_target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_INSTALL_DIR}/lib")
-TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -L/usr/lib/osp-server -losp-appfw-server -Wl,--no-undefined -Wl,--as-needed)
-TARGET_LINK_LIBRARIES(${this_target} "-lalarm")
-TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-application")
-TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-app-manager")
-TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-package-manager")
-TARGET_LINK_LIBRARIES(${this_target} "-lvconf")
-
+TARGET_LINK_LIBRARIES(${this_target} -Wl,--no-undefined -Wl,--as-needed)
+TARGET_LINK_LIBRARIES(${this_target} ${plugins_LDFLAGS})
 

diff --git a/plugins/calendar-condition-handler/CMakeLists.txt b/plugins/calendar-condition-handler/CMakeLists.txt
index 6bbdaf0..3770a23 100644 (file)
--- a/plugins/calendar-condition-handler/CMakeLists.txt
+++ b/plugins/calendar-condition-handler/CMakeLists.txt
@@ -1,18 +1,10 @@
 SET (this_target osp-cond-calendar)
 
-INCLUDE_DIRECTORIES (
-       /usr/include/osp
-       /usr/include/osp/app
-       /usr/include/osp/base
-       /usr/include/osp/server
-       /usr/lib/glib-2.0/include
-       /usr/include/calendar-service2
-       )
-
 SET (${this_target}_SOURCE_FILES
        CalendarConditionHandler.cpp
        )
 
+
 ## SET EXTRA COMPILER FLAGS
 SET(EXTRA_CFLAGS  "${EXTRA_CFLAGS} -fPIC -Wall" )
 
@@ -26,8 +18,7 @@ SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EX
 ## Create Library
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
-ADD_DEPENDENCIES(${this_target} osp-appfw)
-
 SET_TARGET_PROPERTIES(${this_target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_INSTALL_DIR}/lib")
-TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -L/usr/lib/osp-server -losp-appfw-server -Wl,--no-undefined -Wl,--as-needed)
-TARGET_LINK_LIBRARIES(${this_target} "-lcalendar-service2" )
+TARGET_LINK_LIBRARIES(${this_target} -Wl,--no-undefined -Wl,--as-needed)
+TARGET_LINK_LIBRARIES(${this_target} ${plugins_LDFLAGS})
+

diff --git a/plugins/message-condition-handler/CMakeLists.txt b/plugins/message-condition-handler/CMakeLists.txt
index 7189fc7..48f577f 100644 (file)
--- a/plugins/message-condition-handler/CMakeLists.txt
+++ b/plugins/message-condition-handler/CMakeLists.txt
@@ -1,18 +1,10 @@
 SET (this_target osp-cond-message)
 
-INCLUDE_DIRECTORIES (
-       /usr/include/osp
-       /usr/include/osp/app
-       /usr/include/osp/base
-       /usr/include/osp/server
-       /usr/lib/glib-2.0/include
-       /usr/include/messaging
-       )
-
 SET (${this_target}_SOURCE_FILES
        MessageConditionHandler.cpp     
        )
-       
+
+
 ## SET EXTRA COMPILER FLAGS
 SET(EXTRA_CFLAGS  "${EXTRA_CFLAGS} -fPIC -Wall" )
 
@@ -26,8 +18,7 @@ SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EX
 ## Create Library
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
-ADD_DEPENDENCIES(${this_target} osp-appfw)
-
 SET_TARGET_PROPERTIES(${this_target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_INSTALL_DIR}/lib")
-TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -L/usr/lib/osp-server -losp-appfw-server -Wl,--no-undefined -Wl,--as-needed)
-TARGET_LINK_LIBRARIES(${this_target} "-lcapi-messaging-messages" )
+TARGET_LINK_LIBRARIES(${this_target} -Wl,--no-undefined -Wl,--as-needed)
+TARGET_LINK_LIBRARIES(${this_target} ${plugins_LDFLAGS})
+

diff --git a/plugins/nfc-condition-handler/CMakeLists.txt b/plugins/nfc-condition-handler/CMakeLists.txt
index 06024ce..c2b43b3 100644 (file)
--- a/plugins/nfc-condition-handler/CMakeLists.txt
+++ b/plugins/nfc-condition-handler/CMakeLists.txt
@@ -1,18 +1,14 @@
 SET (this_target osp-cond-nfc)
 
 INCLUDE_DIRECTORIES (
-       /usr/include
-       /usr/include/osp
-       /usr/include/osp/app
-       /usr/include/osp/base
-       /usr/include/osp/server
        ../../inc
        )
 
 SET (${this_target}_SOURCE_FILES
        NfcConditionHandler.cpp
        )
-       
+
+
 ## SET EXTRA COMPILER FLAGS
 SET(EXTRA_CFLAGS  "${EXTRA_CFLAGS} -fPIC -Wall" )
 
@@ -26,8 +22,7 @@ SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EX
 ## Create Library
 ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
-ADD_DEPENDENCIES(${this_target} osp-appfw)
-
 SET_TARGET_PROPERTIES(${this_target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_INSTALL_DIR}/lib")
-TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -L/usr/lib/osp-server -losp-appfw-server -lail -Wl,--no-undefined -Wl,--as-needed)
+TARGET_LINK_LIBRARIES(${this_target} -Wl,--no-undefined -Wl,--as-needed)
+TARGET_LINK_LIBRARIES(${this_target} ${plugins_LDFLAGS})
 

diff --git a/src/FSys_SystemService.cpp b/src/FSys_SystemService.cpp
index a40d4b4..79da5dd 100644 (file)
--- a/src/FSys_SystemService.cpp
+++ b/src/FSys_SystemService.cpp
@@ -20,11 +20,10 @@
  */
 #include <unique_ptr.h>
 #include <new>
-#include <time.h>
+#include <ctime>
 #include <sys/time.h>
+
 #include <system_info.h>
-#include <sysman_managed.h>
-#include <telephony_network.h>
 #include <telephony-client/ITapiModem.h>
 #include <vconf.h>