Rearrange header directory structure w.r.t. context-common

Change-Id: I561191d1ca2aeeae827c58837cd7213d62949693
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d15b53..1905668 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,10 @@ PROJECT(context-store)
 INCLUDE(GNUInstallDirs)
 
 SET(DEPS "glib-2.0 gio-2.0 dlog capi-base-common")
-SET(INCDIR "context-service")
+SET(INCDIR "${CMAKE_INSTALL_INCLUDEDIR}/context-service")
 
 INCLUDE_DIRECTORIES(
+       ${CMAKE_INSTALL_PREFIX}/${INCDIR}/private
        ${CMAKE_SOURCE_DIR}/include
        ${CMAKE_SOURCE_DIR}/src/shared
 )
@@ -16,14 +17,19 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIC -Wl,--as-needed -Wl,
 
 SET(VERSION ${FULLVER})
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(PC_INCLUDE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${INCDIR}")
-SET(PC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-SET(PC_CFLAGS -I\${includedir}/${INCDIR})
+SET(PC_INCLUDE "${CMAKE_INSTALL_PREFIX}/${INCDIR}")
+SET(PC_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
 
 INSTALL(
+       FILES ${CMAKE_SOURCE_DIR}/include/ContextStoreService.h
+       DESTINATION ${INCDIR}/private
+)
+INSTALL(
        DIRECTORY ${CMAKE_SOURCE_DIR}/include/
-       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${INCDIR}
-       FILES_MATCHING PATTERN "*.h"
+       DESTINATION ${INCDIR}
+       FILES_MATCHING
+       PATTERN "*.h"
+       PATTERN "ContextStoreService.h" EXCLUDE
 )
 
 ADD_SUBDIRECTORY(src/client-dummy)

diff --git a/packaging/context-store.spec b/packaging/context-store.spec
index 7b27165..bc513fe 100644 (file)
--- a/packaging/context-store.spec
+++ b/packaging/context-store.spec
@@ -95,4 +95,5 @@ popd
 
 %files devel
 %{_includedir}/context-service/*.h
+%{_includedir}/context-service/*/*.h
 %{_libdir}/pkgconfig/*.pc