refined appfw pc file

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6480bf3..0f3f5bb 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,7 @@ LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
 ADD_SUBDIRECTORY(src)
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/osp-appfw.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/osp-appfw-server.pc DESTINATION lib/pkgconfig)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/common/etc/ld.so.conf.d/osp.conf DESTINATION ../etc/ld.so.conf.d)
 
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/cmake_build_tmp/output/target/generic/root/usr/share/locale DESTINATION share)

diff --git a/osp-appfw-server.pc.in b/osp-appfw-server.pc.in
new file mode 100755 (executable)
index 0000000..23414e0
--- /dev/null
+++ b/osp-appfw-server.pc.in
@@ -0,0 +1,13 @@
+# Package Information for pkg-config
+
+prefix=@PREFIX@
+exec_prefix=/usr
+libdir=/usr/lib/osp-server
+includedir=/usr/include/osp/server
+
+Name: @PC_NAME@
+Description: @PACKAGE_DESCRIPTION@
+Version: @VERSION@
+Requires: @PC_REQUIRED@ 
+Libs: -L${libdir} @PC_LDFLAGS@ -losp-appfw-server
+Cflags: -I${includedir}

diff --git a/osp-appfw.pc.in b/osp-appfw.pc.in
index 185cb63..e0eedad 100755 (executable)
--- a/osp-appfw.pc.in
+++ b/osp-appfw.pc.in
@@ -3,13 +3,11 @@
 prefix=@PREFIX@
 exec_prefix=/usr
 libdir=/usr/lib/osp
-libserverdir=/usr/lib/osp-server
 includedir=/usr/include/osp
-includeserverdir=/usr/include/osp/server
 
 Name: @PC_NAME@
 Description: @PACKAGE_DESCRIPTION@
 Version: @VERSION@
 Requires: @PC_REQUIRED@ 
 Libs: -L${libdir} @PC_LDFLAGS@
-Cflags: -I${includedir}
\ No newline at end of file
+Cflags: -I${includedir}

diff --git a/packaging/osp-appfw.spec b/packaging/osp-appfw.spec
index 738641a..e1518da 100755 (executable)
--- a/packaging/osp-appfw.spec
+++ b/packaging/osp-appfw.spec
@@ -198,6 +198,7 @@ chown -R 5000:5000 /opt/usr/media
 %{_includedir}/osp/system/*
 %{_includedir}/osp/text/*
 %{_includedir}/osp/server/*
+%{_libdir}/pkgconfig/osp-appfw-server.pc
 
 %files debug
 %{_libdir}/osp/debug/libosp-appfw.so*

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 4ef4f23..bc2063e 100644 (file)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -47,4 +47,12 @@ ADD_CUSTOM_COMMAND(TARGET ${this_target}
                COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${MAJORVER}
                COMMAND ${CMAKE_STRIP} --strip-unneeded ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}
                COMMENT "strip ${this_target}"
-) 
+)
+
+SET(PC_NAME ${this_target})
+SET(PC_REQUIRED ${pc_requires})
+SET(PC_LDFLAGS -l${this_target})
+
+# pkgconfig file
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${this_target}.pc.in ${CMAKE_SOURCE_DIR}/${this_target}.pc @ONLY)
+