e_comp_wl: Removed dependency on tizen extensions in e_comp_wl header file

Now, pkg-config for the tizen extension is no longer required when building
e's sub-modules.

Change-Id: Ief2bbd4994f3b9c92a3a086f79a15baa0165693e

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index f84c3563e713f276ef7f7b08929b9218b9918b29..3a962ba99d1bd1df96cd013ac34c9c0602c003d6 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "Eeze.h"
+#include <tizen-extension-server-protocol.h>
 
 #define PATH "/org/enlightenment/wm"
 #define IFACE "org.enlightenment.wm.screen_rotation"

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 798f61563207e2a33e7e3ffbccab7e3ed9ebd7a5..9060c09a2624776f8cd73f981200cc33f54d7573 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include <tizen-extension-server-protocol.h>
 
 #include <wayland-tbm-server.h>
 

diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index 1341056c13f0b64bce40905e1dad5a2fee6737c0..d5ae7e9c346f2b88bb3d2957658a6589dfc5c7b9 100644 (file)
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -8,7 +8,6 @@
 #  pragma GCC diagnostic ignored "-Wshadow"
 #  define WL_HIDE_DEPRECATED
 #  include <wayland-server.h>
-#  include <tizen-extension-server-protocol.h>
 #  pragma GCC diagnostic pop
 
 #  include <xkbcommon/xkbcommon.h>

diff --git a/src/bin/e_comp_wl_rsm.c b/src/bin/e_comp_wl_rsm.c
index 2e06cc6a0e4dc42fba830b3392abec06c7273dec..3f0c9393c1bb423210e60c954011c58a8a4681bc 100644 (file)
--- a/src/bin/e_comp_wl_rsm.c
+++ b/src/bin/e_comp_wl_rsm.c
@@ -6,6 +6,7 @@
 #include <tbm_surface.h>
 #include <tbm_surface_internal.h>
 #include <wayland-tbm-server.h>
+#include <tizen-extension-server-protocol.h>
 
 #include <pixman.h>
 

diff --git a/src/bin/e_comp_wl_screenshooter.c b/src/bin/e_comp_wl_screenshooter.c
index bc9302369b2d4d7bfbfeede1d4eb353ae2697db2..f82589068b350b715c724d43b48d0ba0771da47e 100644 (file)
--- a/src/bin/e_comp_wl_screenshooter.c
+++ b/src/bin/e_comp_wl_screenshooter.c
@@ -6,6 +6,7 @@
 #include <wayland-server.h>
 #include <screenshooter-server-protocol.h>
 #include <tizen-extension-server-protocol.h>
+#include <wayland-tbm-server.h>
 
 #define DUMP_FPS     30
 

diff --git a/src/bin/e_comp_wl_video.c b/src/bin/e_comp_wl_video.c
index 1151662f1b2587bf4775dc7e61ded481a8a3e4b2..300c12f9b17050f1297e5f009591c401009fba8a 100644 (file)
--- a/src/bin/e_comp_wl_video.c
+++ b/src/bin/e_comp_wl_video.c
@@ -6,6 +6,8 @@
 #include <tdm.h>
 #include <values.h>
 #include <tdm_helper.h>
+#include <wayland-tbm-server.h>
+#include <tizen-extension-server-protocol.h>
 
 //#define DUMP_BUFFER
 #define CHECKING_PRIMARY_ZPOS

diff --git a/src/bin/e_comp_wl_video_buffer.c b/src/bin/e_comp_wl_video_buffer.c
index d1a10751eceae8cfa5691d8dac08399a67697c4b..8b65ef038ceb8320f9ea05e2f2f67b625e841a44 100644 (file)
--- a/src/bin/e_comp_wl_video_buffer.c
+++ b/src/bin/e_comp_wl_video_buffer.c
@@ -3,6 +3,7 @@
 #endif
 
 #include "e.h"
+#include <wayland-tbm-server.h>
 #include <sys/mman.h>
 #include <pixman.h>
 #include <tdm_helper.h>

diff --git a/src/bin/e_comp_wl_video_buffer.h b/src/bin/e_comp_wl_video_buffer.h
index b32c19f64ca56a17e0c8321515f2f7ad97d9e9a5..c2d980e29d8748342d6a1008f2ed70cda94e016a 100644 (file)
--- a/src/bin/e_comp_wl_video_buffer.h
+++ b/src/bin/e_comp_wl_video_buffer.h
@@ -13,9 +13,6 @@ typedef struct _E_Comp_Wl_Video_Buf E_Comp_Wl_Video_Buf;
 #define E_COMP_WL_VIDEO_BUFFER_H
 
 #include "e_comp_wl_tbm.h"
-#include <wayland-tbm-server.h>
-#include <tizen-extension-server-protocol.h>
-#include <tdm.h>
 
 struct _E_Comp_Wl_Video_Buf
 {

diff --git a/src/bin/e_comp_wl_viewport.c b/src/bin/e_comp_wl_viewport.c
index 195792c27f9fb5e1881781cc2d49a6cef7ba57e5..c9e3c70e987571bb647c18f6d0fce16a3a0e26dd 100644 (file)
--- a/src/bin/e_comp_wl_viewport.c
+++ b/src/bin/e_comp_wl_viewport.c
@@ -6,6 +6,7 @@
 #include <wayland-server.h>
 #include <wayland-tbm-server.h>
 #include <scaler-server-protocol.h>
+#include <tizen-extension-server-protocol.h>
 
 #define PER(fmt,arg...)   ERR("window(0x%08"PRIxPTR") ec(%p) epc(%p): "fmt, \
                               viewport->window, viewport->ec, viewport->epc, ##arg)