Change the framework-internal header path

All framework-internal headers are placed in
/usr/include/context-service/private.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06fccde..698a90d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(context-common)
 INCLUDE(GNUInstallDirs)
 
 SET(DEPS "glib-2.0 gio-2.0 json-glib-1.0 capi-base-common dlog")
-SET(INCDIR "context-service")
+SET(INCDIR "${CMAKE_INSTALL_INCLUDEDIR}/context-service")
 
 INCLUDE_DIRECTORIES(
        ${CMAKE_SOURCE_DIR}/include
@@ -16,13 +16,12 @@ 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(
        DIRECTORY ${CMAKE_SOURCE_DIR}/include/
-       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${INCDIR}
+       DESTINATION ${INCDIR}/private
        FILES_MATCHING PATTERN "*.h"
 )
 

diff --git a/packaging/context-common.spec b/packaging/context-common.spec
index e6cd5be..9579006 100644 (file)
--- a/packaging/context-common.spec
+++ b/packaging/context-common.spec
@@ -60,5 +60,5 @@ Requires:     %{name} = %{version}-%{release}
 Tizen Context-Service Internal Shared Library (Development)
 
 %files devel
-%{_includedir}/context-service/*.h
+%{_includedir}/context-service/*/*.h
 %{_libdir}/pkgconfig/*.pc

diff --git a/context-common.pc.in b/pkg-config.pc.in
similarity index 100%
rename from context-common.pc.in
rename to pkg-config.pc.in

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 917e80b..2ea4d7e 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -24,7 +24,7 @@ SET(PC_REQUIRED ${DEPS})
 SET(PC_LDFLAGS "-l${target} -l${target_shared} -l${target_database}")
 
 CONFIGURE_FILE(
-       ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in
+       ${CMAKE_SOURCE_DIR}/pkg-config.pc.in
        ${CMAKE_SOURCE_DIR}/${PC_NAME}.pc
        @ONLY
 )

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index ea9bd3c..3ecf139 100644 (file)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -24,7 +24,7 @@ SET(PC_REQUIRED ${DEPS})
 SET(PC_LDFLAGS "-l${target} -l${target_shared} -l${target_database}")
 
 CONFIGURE_FILE(
-       ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in
+       ${CMAKE_SOURCE_DIR}/pkg-config.pc.in
        ${CMAKE_SOURCE_DIR}/${PC_NAME}.pc
        @ONLY
 )