Fix wrong build requirements

Change-Id: I27cb956ecf5bcf6624d3953c259917aaff622023
Signed-off-by: hyunho <hhstark.kang@samsung.com>

diff --git a/packaging/libwatchface-complication.spec b/packaging/libwatchface-complication.spec
index fa2b15e..285faa0 100644 (file)
--- a/packaging/libwatchface-complication.spec
+++ b/packaging/libwatchface-complication.spec
@@ -112,7 +112,7 @@ Provide APIs to develop the watchface complication provider.
 %package -n %{name}-provider-devel
 Summary: Watchface complication provider development library (dev)
 Group: Development/Libraries
-Requires: %{name}
+Requires: %{name}-provider
 
 %description -n %{name}-provider-devel
 Header & package configuration files to support development of the watchface complication provider.
@@ -155,6 +155,7 @@ Provide APIs to develop the watchface editor.
 %package -n libwatchface-editor-devel
 Summary: Watchface editor development library (dev)
 Group: Development/Libraries
+Requires: libwatchface-editor
 
 %description -n libwatchface-editor-devel
 Header & package configuration files to support development of the watchface editor.

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
index 578acf7..0a75e42 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/unittest/CMakeLists.txt
@@ -19,6 +19,7 @@ SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-common/include)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-complication/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
 
 AUX_SOURCE_DIRECTORY(src SOURCES)

diff --git a/watchface-complication/include/watchface-complication-internal.h b/watchface-complication/include/watchface-complication-internal.h
index cc3d449..dc90dc7 100644 (file)
--- a/watchface-complication/include/watchface-complication-internal.h
+++ b/watchface-complication/include/watchface-complication-internal.h
@@ -16,7 +16,7 @@
 #ifndef WATCHFACE_COMPLICATION_INCLUDE_WATCHFACE_COMPLICATION_INTERNAL_H_
 #define WATCHFACE_COMPLICATION_INCLUDE_WATCHFACE_COMPLICATION_INTERNAL_H_
 
-#include <watchface-common/include/watchface-common.h>
+#include <watchface-common.h>
 
 #define SETUP_EDITOR_APPID_KEY "__SETUP_EDITOR_APPID_KEY__"
 #define SETUP_EDITABLE_ID_KEY "__SETUP_EDITABLE_ID_KEY__"

diff --git a/watchface-complication/include/watchface-complication.h b/watchface-complication/include/watchface-complication.h
index f419537..f3f50a4 100644 (file)
--- a/watchface-complication/include/watchface-complication.h
+++ b/watchface-complication/include/watchface-complication.h
@@ -20,7 +20,7 @@
 #include <tizen.h>
 #include <bundle.h>
 
-#include <watchface-common/include/watchface-common.h>
+#include <watchface-common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/watchface-complication/watchface-complication.pc.in b/watchface-complication/watchface-complication.pc.in
index 39e9bc8..c9f9e6a 100644 (file)
--- a/watchface-complication/watchface-complication.pc.in
+++ b/watchface-complication/watchface-complication.pc.in
@@ -7,5 +7,5 @@ Name: watchface-complication
 Description: Support development of the watchface complication library
 Version: @VERSION@
 Libs: -L${libdir} -lwatchface-complication
-Cflags: -I${includedir}
-cppflags: -I${includedir}
\ No newline at end of file
+Cflags: -I${includedir} -I${includedir}/../watchface-common/include/
+cppflags: -I${includedir} -I${includedir}/../watchface-common/include/
\ No newline at end of file

diff --git a/watchface-editor/CMakeLists.txt b/watchface-editor/CMakeLists.txt
index 53176c9..2f62fc1 100644 (file)
--- a/watchface-editor/CMakeLists.txt
+++ b/watchface-editor/CMakeLists.txt
@@ -26,6 +26,7 @@ SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-common/include)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-complication/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 

diff --git a/watchface-editor/include/watchface-editor.h b/watchface-editor/include/watchface-editor.h
index 5da0daa..ec23868 100644 (file)
--- a/watchface-editor/include/watchface-editor.h
+++ b/watchface-editor/include/watchface-editor.h
@@ -20,8 +20,8 @@
 #include <tizen.h>
 #include <glib.h>
 #include <bundle.h>
-#include "watchface-complication/include/watchface-complication.h"
-#include "watchface-complication/include/watchface-editable.h"
+#include <watchface-complication.h>
+#include <watchface-editable.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/watchface-editor/watchface-editor.pc.in b/watchface-editor/watchface-editor.pc.in
index ee086dc..bd34510 100644 (file)
--- a/watchface-editor/watchface-editor.pc.in
+++ b/watchface-editor/watchface-editor.pc.in
@@ -8,3 +8,4 @@ Version: @VERSION@
 Requires: watchface-complication
 Libs: -L${libdir} -lwatchface-editor -lwatchface-complication
 Cflags: -I${includedir}
+cppflags: -I${includedir}
\ No newline at end of file