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 e7f34aa47f85645180956b24edf6beb4b0c936a5..bae813ca5f05933afd05003bf1ccdf448d946af1 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 6bb72d7b6d657a0438eec1aedd1158ba66853ccf..282a3e7b8559be78a6decd72bc6ada8dbccc2001 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 304ec9ce0993f0cc03e40be881133b7d86818dc2..61e7c751165fa07c91486289bb2b07bfc55c6032 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 fe1ab50509ca309e691fdcd762ed989ed71d1c6a..7bf556e35b3b70939d94338bf20505057ab62da2 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 05176b72c2cac29d08dcc01bde6d2c3dbd32a7b8..3798f9095f50f14bfa83485056a791656a80c856 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 383af51bbe3413bb79cf950494ac2d63ecb716cc..6b582e59bc8c8375a2da06c14e0eacabc7b156ff 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)