video: Added 'src/bin/video' directory to CFLAGS and remove relative path for video...

this fixes build break of modules.

Change-Id: I3250a14b88e22483d1d5a13a71068eebed0f939e

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index e632d263f3ee7ca75a41734baba084ecfc078686..2c06d3d8edfb8afd96b1e2dfc930b110c207bbc0 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -17,6 +17,10 @@ E_CPPFLAGS = \
 -DLOCALE_DIR=\"@LOCALE_DIR@\" \
 -DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\"
 
+E_VIDEO_CPPFLAGS= \
+-I$(top_builddir)/src/bin/video \
+-I$(top_srcdir)/src/bin/video
+
 bin_PROGRAMS = \
 src/bin/enlightenment \
 src/bin/enlightenment_info
@@ -263,7 +267,7 @@ src/bin/e_devicemgr_input.c \
 src/bin/e_devicemgr_inputgen.c \
 src/bin/e_devicemgr_wl.c
 
-src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=1 @WAYLAND_CFLAGS@ $(TTRACE_CFLAGS) $(DLOG_CFLAGS) $(PIXMAN_CFLAGS) $(POLICY_CFLAGS) @TIZEN_REMOTE_SURFACE_CFLAGS@
+src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) $(E_VIDEO_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=1 @WAYLAND_CFLAGS@ $(TTRACE_CFLAGS) $(DLOG_CFLAGS) $(PIXMAN_CFLAGS) $(POLICY_CFLAGS) @TIZEN_REMOTE_SURFACE_CFLAGS@
 if HAVE_LIBGOMP
 src_bin_enlightenment_CPPFLAGS += -fopenmp
 endif

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 9ac2e82a6db969c96e4221047c87c4ae0c890e3a..0bd76ce694f2a397a1f82f3423397a841ad9c205 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -82,9 +82,8 @@
 #include "e_dbus_conn.h"
 #include "e_xdg_shell_v6.h"
 #include "e_devicemgr.h"
-
-#include "video/e_video_debug.h"
-#include "video/e_client_video.h"
-#include "video/e_zone_video.h"
-#include "video/e_comp_wl_video.h"
-#include "video/e_comp_wl_video_buffer.h"
+#include "e_video_debug.h"
+#include "e_client_video.h"
+#include "e_zone_video.h"
+#include "e_comp_wl_video.h"
+#include "e_comp_wl_video_buffer.h"

diff --git a/src/bin/video/e_video_internal.h b/src/bin/video/e_video_internal.h
index de39dc1b16c035c8c72838852557382a8a92ef7e..c5097c2924ff5ed540e2284a94994bf91bacc510 100644 (file)
--- a/src/bin/video/e_video_internal.h
+++ b/src/bin/video/e_video_internal.h
@@ -3,10 +3,6 @@
 
 #include "e.h"
 
-#include "e_video_debug.h"
-#include "e_zone_video.h"
-#include "e_comp_wl_video_buffer.h"
-
 #include <tdm.h>
 #include <values.h>
 #include <tdm_helper.h>

diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk
index d0ff26cc1d48e1d856d2f79fc147a1dfc035cd41..0732a98fc78f959b8430d85bdced6bd7a8cfa9de 100644 (file)
--- a/src/modules/Makefile.mk
+++ b/src/modules/Makefile.mk
@@ -3,7 +3,9 @@ MOD_LDFLAGS = -module -avoid-version
 MOD_CPPFLAGS = -I. -DE_LOGGING=1 \
 -I$(top_srcdir) \
 -I$(top_srcdir)/src/bin \
+-I$(top_srcdir)/src/bin/video \
 -I$(top_builddir)/src/bin \
+-I$(top_builddir)/src/bin/video \
 -I$(top_srcdir)/src/modules \
 @e_cflags@ \
 @WAYLAND_CFLAGS@ \