Change rpk-manifest-handlers library type shared to static

Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/packaging/rpk-installer.spec b/packaging/rpk-installer.spec
index cab81f0..a9a3b25 100755 (executable)
--- a/packaging/rpk-installer.spec
+++ b/packaging/rpk-installer.spec
@@ -56,7 +56,7 @@ find . -name '*.gcno' -exec cp '{}' gcov-obj ';'
 %endif
 
 %check
-export LD_LIBRARY_PATH=../../src/rpk:../../src/rpk_manifest_handlers
+export LD_LIBRARY_PATH=../../src/rpk
 ctest -V
 %if 0%{?gcov:1}
 lcov -c --ignore-errors graph --no-external -q -d . -o rpk-insatller.info
@@ -88,10 +88,7 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
 %files devel
 %{_includedir}/app-installers/rpk/*.h
 #%{_includedir}/app-installers/rpk/*/*/*.h
-%{_includedir}/rpk_manifest_handlers/*.h
-%{_libdir}/librpk-manifest-handlers.so
 %{_libdir}/pkgconfig/rpk-installer.pc
-%{_libdir}/pkgconfig/rpk-manifest-handlers.pc
 
 
 #################################################

diff --git a/src/rpk_manifest_handlers/CMakeLists.txt b/src/rpk_manifest_handlers/CMakeLists.txt
index 282b2ef..5b4a49b 100644 (file)
--- a/src/rpk_manifest_handlers/CMakeLists.txt
+++ b/src/rpk_manifest_handlers/CMakeLists.txt
@@ -2,7 +2,7 @@
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SRCS)
 
 # Target - definition
-ADD_LIBRARY(${TARGET_LIBNAME_RPK_MANIFEST_HANDLERS} SHARED
+ADD_LIBRARY(${TARGET_LIBNAME_RPK_MANIFEST_HANDLERS} STATIC
        ${SRCS}
 )
 
@@ -21,11 +21,3 @@ SET_TARGET_PROPERTIES(${TARGET_LIBNAME_RPK_MANIFEST_HANDLERS} PROPERTIES SOVERSI
 
 # Install
 INSTALL(TARGETS ${TARGET_LIBNAME_RPK_MANIFEST_HANDLERS} DESTINATION ${LIB_INSTALL_DIR})
-
-# Install includes
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDEDIR}
-        FILES_MATCHING PATTERN "*.h")
-
-# Configure and install pkgconfig file
-CONFIGURE_FILE(rpk-manifest-handlers.pc.in rpk-manifest-handlers.pc @ONLY)
-INSTALL(FILES rpk-manifest-handlers.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)

diff --git a/src/rpk_manifest_handlers/rpk-manifest-handlers.pc.in b/src/rpk_manifest_handlers/rpk-manifest-handlers.pc.in
deleted file mode 100644 (file)
index a83d008..0000000
--- a/src/rpk_manifest_handlers/rpk-manifest-handlers.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@PREFIX@
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
-
-Name: rpk-manifest-handlers
-Description: Manifest handlers for rpk manifest file parser
-Version: @FULLVER@
-Requires: manifest-parser
-Libs: -L${libdir} -lrpk-manifest-handlers
-Cflags: -I${includedir}