Add osp-wifi.pc.in / Modify CMakeList & spec.

Change-Id: Ie43742fc15f0aa08d5c1ff79b5e26afd5bc6caec
Signed-off-by: Sinyoung Hwang <shiny.hwang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89e0209..3ddadfa 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,9 +30,6 @@ LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(src/wifi)
 
-# pkgconfig file
-CONFIGURE_FILE(osp-net.pc.in ${CMAKE_SOURCE_DIR}/osp-net.pc @ONLY)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/osp-net.pc DESTINATION lib/pkgconfig)
 
 INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp
                FILES_MATCHING PATTERN "*.so*" 

diff --git a/osp-net.pc.in b/osp-net.pc.in
index c064287..3d49fbc 100755 (executable)
--- a/osp-net.pc.in
+++ b/osp-net.pc.in
@@ -8,6 +8,6 @@ includedir=/usr/include/osp
 Name: @PC_NAME@
 Description: @PACKAGE_DESCRIPTION@
 Version: @VERSION@
-Requires: @PC_REQUIRED@ 
+Requires: @PC_REQUIRED@
 Libs: -L${libdir} @PC_LDFLAGS@
 Cflags: -I${includedir}
\ No newline at end of file

diff --git a/osp-wifi.pc.in b/osp-wifi.pc.in
new file mode 100755 (executable)
index 0000000..3d49fbc
--- /dev/null
+++ b/osp-wifi.pc.in
@@ -0,0 +1,13 @@
+# Package Information for pkg-config
+
+prefix=@PREFIX@
+exec_prefix=/usr
+libdir=/usr/lib/osp
+includedir=/usr/include/osp
+
+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

diff --git a/packaging/osp-net.spec b/packaging/osp-net.spec
index a5f9ae7..96743ff 100755 (executable)
--- a/packaging/osp-net.spec
+++ b/packaging/osp-net.spec
@@ -101,6 +101,7 @@ cat %{_builddir}/%{name}-%{version}/LICENSE.APLv2 >> %{buildroot}/usr/share/lice
 %files devel
 %{_includedir}/osp/*.h
 %{_libdir}/pkgconfig/osp-net.pc
+%{_libdir}/pkgconfig/osp-wifi.pc
 
 %files internal-devel
 %{_includedir}/osp/net/*

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e43f08f..73c8bd8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -170,4 +170,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(VERSION ${FULLVER})
+SET(PC_LDFLAGS -l${this_target})
+
+# pkgconfig file
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${this_target}.pc.in ${CMAKE_SOURCE_DIR}/${this_target}.pc @ONLY)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/${this_target}.pc DESTINATION lib/pkgconfig)

diff --git a/src/wifi/CMakeLists.txt b/src/wifi/CMakeLists.txt
index b9b81bd..b34e65e 100755 (executable)
--- a/src/wifi/CMakeLists.txt
+++ b/src/wifi/CMakeLists.txt
@@ -99,4 +99,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(VERSION ${FULLVER})
+SET(PC_LDFLAGS -l${this_target})
+
+# pkgconfig file
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${this_target}.pc.in ${CMAKE_SOURCE_DIR}/${this_target}.pc @ONLY)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/${this_target}.pc DESTINATION lib/pkgconfig)