Make file & spec file generalization

Signed-off-by: seungha.son <seungha.son@samsung.com>
Change-Id: Iedf4203922de47be7d0a9a3097688da51a1bf398

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e72018f..939e00c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,13 +22,8 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=hidden -flto")
 include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src)
 
 ### Build
-add_library(bundle SHARED
-               src/bundle.c
-               src/bundle_json.c
-               src/keyval_type.c
-               src/keyval.c
-               src/keyval_array.c
-               )
+aux_source_directory(src SRCS)
+add_library(bundle SHARED ${SRCS})
 set_target_properties(bundle PROPERTIES SOVERSION ${VERSION_MAJOR})
 set_target_properties(bundle PROPERTIES VERSION "${VERSION}")
 message(STATUS "Version from debian/changelog: ${VERSION},  Major version: ${VERSION_MAJOR}")
@@ -39,17 +34,7 @@ target_link_libraries(bundle ${pkgs_LDFLAGS})
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/bundle.pc.in ${CMAKE_BINARY_DIR}/bundle.pc @ONLY)
 
-
 ### Install
-install(TARGETS bundle
-    DESTINATION ${LIB_INSTALL_DIR}
-       )
-install(FILES
-       ${CMAKE_SOURCE_DIR}/include/bundle.h
-       ${CMAKE_SOURCE_DIR}/include/bundle_internal.h
-       ${CMAKE_SOURCE_DIR}/include/SLP_bundle_PG.h
-       DESTINATION include/
-               )
-install(FILES ${CMAKE_BINARY_DIR}/bundle.pc
-    DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/
-               )
+install(TARGETS bundle DESTINATION ${LIB_INSTALL_DIR})
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include/)
+install(FILES ${CMAKE_BINARY_DIR}/bundle.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/)

diff --git a/packaging/bundle.spec b/packaging/bundle.spec
index c2a4e69..90e1218 100644 (file)
--- a/packaging/bundle.spec
+++ b/packaging/bundle.spec
@@ -48,8 +48,6 @@ cp %{SOURCE1001} .
 %files devel
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{_includedir}/bundle.h
-%{_includedir}/bundle_internal.h
-%{_includedir}/SLP_bundle_PG.h
+%{_includedir}/*.h
 %{_libdir}/pkgconfig/bundle.pc
 %{_libdir}/libbundle.so