Rearrange including header for apis

Change-Id: Ie5bd34dda348ee64aeb6fdf5d544ec916717786f
Signed-off-by: Inkyun Kil <inkyun.kil@samsung.com>

diff --git a/watch-holder/CMakeLists.txt b/watch-holder/CMakeLists.txt
index c21437ec541a6839800fe25787193cbe99b6252a..e7fe5e1134e42b85789316401a5deab43a1e9e1d 100644 (file)
--- a/watch-holder/CMakeLists.txt
+++ b/watch-holder/CMakeLists.txt
@@ -23,6 +23,8 @@ pkg_check_modules(watch-holder REQUIRED
        vconf
 )
 
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/api)
+
 AUX_SOURCE_DIRECTORY(src BUILD_SOURCE)
 AUX_SOURCE_DIRECTORY(api BUILD_SOURCE)
 

diff --git a/watch-holder/api/sharable_watch.cc b/watch-holder/api/sharable_watch.cc
index 430c630e114cefa9f51087ae6582c5511c186b0a..92270e4b03675df571317156221fb13397ac5097 100644 (file)
--- a/watch-holder/api/sharable_watch.cc
+++ b/watch-holder/api/sharable_watch.cc
@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "../src/watch.hh"
 
 #include "watch.h"
 #include "sharable_watch.h"
 
+#include "../src/watch.hh"
+
+
 #ifndef C_EXPORT
 #define C_EXPORT extern "C" __attribute__((visibility("default")))
 #endif

diff --git a/watch-holder/api/sharable_watch.h b/watch-holder/api/sharable_watch.h
index a1599dab1b325e400ee0bbf62c26c8717baa9f84..1f7fb6a77181155704889689ab59e953f6942c0a 100644 (file)
--- a/watch-holder/api/sharable_watch.h
+++ b/watch-holder/api/sharable_watch.h
@@ -20,7 +20,7 @@
 #include <Evas.h>
 #include <bundle.h>
 
-#include "watch_holder_error.h"
+#include <watch_holder_error.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/watch-holder/api/watch.h b/watch-holder/api/watch.h
index 114782491ceac88d815f8bf35fb8e9789d145be6..505035e9cc0eaccb73f16876f0bd35ef70a78b61 100644 (file)
--- a/watch-holder/api/watch.h
+++ b/watch-holder/api/watch.h
@@ -17,10 +17,11 @@
 #ifndef __WATCH_H__
 #define __WATCH_H__
 
-#include "watch_holder_error.h"
 #include <Evas.h>
 #include <bundle.h>
 
+#include <watch_holder_error.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/watch-holder/api/watch_holder.h b/watch-holder/api/watch_holder.h
index 62ed809aae469da9dde8447499763d6b285cbba8..b72681dc8e8d0e2d1bd7230a9624aa8e7ff745d3 100644 (file)
--- a/watch-holder/api/watch_holder.h
+++ b/watch-holder/api/watch_holder.h
@@ -21,7 +21,8 @@
 #include <bundle.h>
 #include <Evas.h>
 
-#include "watch.h"
+#include <watch.h>
+#include <watch_holder_error.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/watch-holder/api/watch_mirror.cc b/watch-holder/api/watch_mirror.cc
index 1c55a497fa28b3c562ed6049352986afef3af375..0490248f43406707c68b3e1c588d67657e9128ca 100644 (file)
--- a/watch-holder/api/watch_mirror.cc
+++ b/watch-holder/api/watch_mirror.cc
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <cstring>
-#include <list>
-
 #include "watch_mirror.h"
 #include "../src/watch_mirror.hh"
 
+#include <cstring>
+#include <list>
+
 #ifndef C_EXPORT
 #define C_EXPORT extern "C" __attribute__((visibility("default")))
 #endif

diff --git a/watch-holder/api/watch_mirror.h b/watch-holder/api/watch_mirror.h
index 18f36b96d8ef0ed7565704c48cd51059c0192145..0e3f4c8485561227ac173d2fc8f49672be24bd6c 100644 (file)
--- a/watch-holder/api/watch_mirror.h
+++ b/watch-holder/api/watch_mirror.h
@@ -20,7 +20,8 @@
 #include <Evas.h>
 #include <bundle.h>
 
-#include "sharable_watch.h"
+#include <watch_holder_error.h>
+#include <sharable_watch.h>
 
 #ifdef __cplusplus
 extern "C" {