From 15e87f2c2b7874583687ee232985ab76c599dda1 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Wed, 5 Oct 2016 19:14:32 +0900 Subject: [PATCH] Fix CMakeLists and spec files Change-Id: Ie54d22d8a973357feb300d03ab98c9d17672c7dd Signed-off-by: Hwankyu Jhun --- CMakeLists.txt | 13 +++++-------- packaging/capi-appfw-app-manager.spec | 5 +---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd5de74..968364d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(capi-appfw-app-manager C) -SET(SOURCES src/app_context.c - src/app_info.c - src/app_manager_event.c - src/app_manager.c) +AUX_SOURCE_DIRECTORY(src SOURCES) INCLUDE(FindPkgConfig) pkg_check_modules(PKGS REQUIRED @@ -37,10 +34,10 @@ SET(PC_PREFIX ${CMAKE_INSTALL_PREFIX}) CONFIGURE_FILE(capi-appfw-app-manager.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) -INSTALL(FILES ${INC_DIR}/app_context.h DESTINATION include/appfw) -INSTALL(FILES ${INC_DIR}/app_manager_extension.h DESTINATION include/appfw) -INSTALL(FILES ${INC_DIR}/app_manager.h DESTINATION include/appfw) -INSTALL(FILES ${INC_DIR}/app_info.h DESTINATION include/appfw) + +INSTALL(DIRECTORY ${INC_DIR}/ DESTINATION include/appfw + FILES_MATCHING + PATTERN "${INC_DIR}/*.h") INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) diff --git a/packaging/capi-appfw-app-manager.spec b/packaging/capi-appfw-app-manager.spec index d37e372..485f226 100644 --- a/packaging/capi-appfw-app-manager.spec +++ b/packaging/capi-appfw-app-manager.spec @@ -54,10 +54,7 @@ rm -rf %{buildroot} %license LICENSE %files devel -%{_includedir}/appfw/app_context.h -%{_includedir}/appfw/app_manager_extension.h -%{_includedir}/appfw/app_manager.h -%{_includedir}/appfw/app_info.h +%{_includedir}/appfw/*.h %{_libdir}/libcapi-appfw-app-manager.so %{_libdir}/pkgconfig/*.pc -- 2.7.4