Rename libaskuser-notification-ipc to libaskuser-notification

Keep the names simple. The CMake name conflict can be avoided.
Additionally fixed some coupling:
- don't include local copy of procotocol headers in plugin and agent code
- do a pkg-config module check on libaskuser-notification in plugin CMake

Change-Id: I539fe5a5325ac45575d2a19de0c9e39aeae5bca0
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>

diff --git a/packaging/askuser-notification.spec b/packaging/askuser-notification.spec
index aefca39..6582d20 100644 (file)
--- a/packaging/askuser-notification.spec
+++ b/packaging/askuser-notification.spec
@@ -114,12 +114,12 @@ systemctl daemon-reload
 %files libs
 %manifest default.manifest
 %license LICENSE
-%{_libdir}/libaskuser-notification-ipc.so.*
+%{_libdir}/libaskuser-notification.so.*
 
 %files devel
-%{_libdir}/libaskuser-notification-ipc.so
+%{_libdir}/libaskuser-notification.so
 %{_includedir}/askuser-notification
-%{_libdir}/pkgconfig/askuser-notification-ipc.pc
+%{_libdir}/pkgconfig/askuser-notification.pc
 
 %files test
 %attr(755,root,root) %{_bindir}/askuser-notification-test

diff --git a/packaging/askuser.spec b/packaging/askuser.spec
index 36cae99..fe0170e 100644 (file)
--- a/packaging/askuser.spec
+++ b/packaging/askuser.spec
@@ -19,6 +19,7 @@ BuildRequires: pkgconfig(security-manager)
 BuildRequires: pkgconfig(security-privilege-manager)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(pkgmgr-info)
+BuildRequires: askuser-notification-devel
 
 %if !%{defined build_type}
 %define build_type RELEASE

diff --git a/src/agent/CMakeLists.txt b/src/agent/CMakeLists.txt
index c3120ac..17f0dd7 100644 (file)
--- a/src/agent/CMakeLists.txt
+++ b/src/agent/CMakeLists.txt
@@ -39,7 +39,6 @@ SET(ASKUSER_SOURCES
 
 INCLUDE_DIRECTORIES(
     ${ASKUSER_PATH}/common
-    ${ASKUSER_PATH}/common/protocol
     ${AGENT_DEP_INCLUDE_DIRS}
     ${ASKUSER_AGENT_PATH}
     )

diff --git a/src/common/protocol/CMakeLists.txt b/src/common/protocol/CMakeLists.txt
index 90b11ca..805c753 100644 (file)
--- a/src/common/protocol/CMakeLists.txt
+++ b/src/common/protocol/CMakeLists.txt
@@ -21,7 +21,7 @@ SET(PROTOCOL_PATH ${ASKUSER_PATH}/common/protocol)
 SET(ASKUSER_NOTIFICATION_VERSION_MAJOR 0)
 SET(ASKUSER_NOTIFICATION_VERSION ${ASKUSER_NOTIFICATION_VERSION_MAJOR}.1.0)
 
-SET(PC_FILE "askuser-notification-ipc.pc")
+SET(PC_FILE "askuser-notification.pc")
 
 PKG_CHECK_MODULES(ASKUSER_NOTIFICATION_DEP
     REQUIRED
@@ -54,6 +54,7 @@ SET_TARGET_PROPERTIES(${TARGET_ASKUSER_NOTIFICATION_LIB}
     PROPERTIES
         SOVERSION ${ASKUSER_NOTIFICATION_VERSION_MAJOR}
         VERSION ${ASKUSER_NOTIFICATION_VERSION}
+        OUTPUT_NAME "askuser-notification"
     )
 
 LINK_DIRECTORIES(${ASKUSER_NOTIFICATION_DEP_LIBRARY_DIRS})

diff --git a/src/common/protocol/askuser-notification-ipc.pc.in b/src/common/protocol/askuser-notification.pc.in
similarity index 87%
rename from src/common/protocol/askuser-notification-ipc.pc.in
rename to src/common/protocol/askuser-notification.pc.in
index 88bbbed..dca3398 100644 (file)
--- a/src/common/protocol/askuser-notification-ipc.pc.in
+++ b/src/common/protocol/askuser-notification.pc.in
@@ -8,5 +8,5 @@ includedir=@INCLUDE_INSTALL_DIR@
 Name: askuser-notification
 Description: askuser-notification library
 Version: @ASKUSER_NOTIFICATION_VERSION@
-Libs: -L${libdir} -laskuser-notification-ipc
+Libs: -L${libdir} -laskuser-notification
 Cflags: -I${includedir}/askuser-notification

diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt
index b02000a..27a2f3e 100644 (file)
--- a/src/plugin/CMakeLists.txt
+++ b/src/plugin/CMakeLists.txt
@@ -62,11 +62,11 @@ PKG_CHECK_MODULES(PDP_DEP
     REQUIRED
     cynara-plugin
     security-manager
+    askuser-notification
     )
 
 INCLUDE_DIRECTORIES(
     ${ASKUSER_PATH}/common/config
-    ${ASKUSER_PATH}/common/protocol
     SYSTEM
     ${PDP_DEP_INCLUDE_DIRS}
     )
@@ -84,7 +84,7 @@ LINK_DIRECTORIES(${PDP_DEP_LIBRARY_DIRS})
 ADD_LIBRARY(${TARGET_PRIVACYDENIED_PLUGIN_SERVICE} SHARED ${PDP_SERVICE_SOURCES})
 ADD_LIBRARY(${TARGET_PRIVACYDENIED_PLUGIN_CLIENT} SHARED ${PDP_CLIENT_SOURCES})
 
-TARGET_LINK_LIBRARIES(${TARGET_PRIVACYDENIED_PLUGIN_SERVICE} ${PDP_DEP_LIBRARIES} ${TARGET_ASKUSER_NOTIFICATION_LIB})
+TARGET_LINK_LIBRARIES(${TARGET_PRIVACYDENIED_PLUGIN_SERVICE} ${PDP_DEP_LIBRARIES})
 TARGET_LINK_LIBRARIES(${TARGET_PRIVACYDENIED_PLUGIN_CLIENT} ${PDP_DEP_LIBRARIES})
 
 INSTALL(TARGETS ${TARGET_PRIVACYDENIED_PLUGIN_SERVICE}