diff options
| author | seungha.son <seungha.son@samsung.com> | 2016-11-17 16:43:19 +0900 |
|---|---|---|
| committer | seungha.son <seungha.son@samsung.com> | 2016-11-17 16:44:02 +0900 |
| commit | fdab1a48c4d4116be87939c9ed13764c36a7d2af (patch) | |
| tree | aea1556ca5d527358473e095fcffbf6122ce22ed | |
| parent | 14ffea917a0f7ab0c98cc4a1dbafc46d8b6b4311 (diff) | |
| download | bundle-fdab1a48c4d4116be87939c9ed13764c36a7d2af.tar.gz bundle-fdab1a48c4d4116be87939c9ed13764c36a7d2af.tar.bz2 bundle-fdab1a48c4d4116be87939c9ed13764c36a7d2af.zip | |
Make file & spec file generalizationsubmit/tizen_3.0/20161117.054138accepted/tizen/3.0/wearable/20161118.004130accepted/tizen/3.0/tv/20161118.004107accepted/tizen/3.0/mobile/20161118.004020accepted/tizen/3.0/ivi/20161118.004150accepted/tizen/3.0/common/20161118.193002
Signed-off-by: seungha.son <seungha.son@samsung.com>
Change-Id: Iedf4203922de47be7d0a9a3097688da51a1bf398
| -rw-r--r-- | CMakeLists.txt | 25 | ||||
| -rw-r--r-- | packaging/bundle.spec | 4 |
2 files changed, 6 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e72018f..939e00c 100644 --- 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 --- 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 |