aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2016-11-01 15:46:35 -0500
committerDerek Foreman <derekf@osg.samsung.com>2016-11-02 13:37:01 -0500
commitaf4a71bcf0975a4a986c4b1901b795850d1192ae (patch)
treeba77c1ead7eceecf193c2ca2030f9b304a577a57 /src/Makefile_Evas.am
parentecore_evas_wayland: Don't include Evas_Engine_Wayland_Egl.h (diff)
downloadefl-af4a71bcf0975a4a986c4b1901b795850d1192ae.tar.gz
wayland evas engines: share engine info structure
These engines are incredibly similar - by sharing the same engine info structure we'll be able to simplify the wayland ecore_evas bits and make them much more maintainable.
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 26cdd79820..a7bb362814 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1207,8 +1207,11 @@ modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
endif
+if BUILD_ENGINE_WAYLAND_COMMON
+dist_installed_evasmainheaders_DATA += modules/evas/engines/wayland_common/Evas_Engine_Wayland.h
+endif
+
if BUILD_ENGINE_WAYLAND_EGL
-dist_installed_evasmainheaders_DATA += modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
WAYLAND_EGL_SOURCES = \
modules/evas/engines/wayland_egl/evas_engine.c \
modules/evas/engines/wayland_egl/evas_wl_main.c \
@@ -1231,6 +1234,7 @@ modules_evas_engines_wayland_egl_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \
+-I$(top_srcdir)/src/modules/evas/engines/wayland_common \
@EVAS_CFLAGS@ \
@evas_engine_wayland_egl_cflags@
modules_evas_engines_wayland_egl_module_la_LIBADD = \
@@ -1243,9 +1247,8 @@ endif
endif
if BUILD_ENGINE_WAYLAND_SHM
-dist_installed_evasmainheaders_DATA += modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h
WAYLAND_SHM_SOURCES = \
-modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h \
+modules/evas/engines/wayland_common/Evas_Engine_Wayland.h \
modules/evas/engines/wayland_shm/evas_engine.c \
modules/evas/engines/wayland_shm/evas_engine.h \
modules/evas/engines/wayland_shm/evas_shm.c \
@@ -1280,6 +1283,7 @@ modules_evas_engines_wayland_shm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/lib/ecore_wl2 \
-I$(top_srcdir)/src/static_libs/libdrm \
+-I$(top_srcdir)/src/modules/evas/engines/wayland_common \
@EVAS_CFLAGS@ \
@evas_engine_wayland_shm_cflags@
modules_evas_engines_wayland_shm_module_la_LIBADD = \