discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=9e104dfca113eff99ec1592810c2892a9a8ba430

commit 9e104dfca113eff99ec1592810c2892a9a8ba430
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Jun 25 18:55:00 2015 -0400

    simplify e build and add X headers for xwayland module
---
 src/bin/Makefile.mk              | 5 -----
 src/modules/Makefile_xwayland.mk | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 3917170..8fe0706 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -363,11 +363,6 @@ src/bin/e_comp_x.c \
 src/bin/e_comp_x_randr.c \
 src/bin/e_alert.c \
 src/bin/e_xsettings.c
-else
-if USE_MODULE_WL_X11
-enlightenment_src += \
-src/bin/e_comp_x_randr.c
-endif
 endif
 
 if HAVE_WAYLAND
diff --git a/src/modules/Makefile_xwayland.mk b/src/modules/Makefile_xwayland.mk
index 5afc15b..515bd5b 100644
--- a/src/modules/Makefile_xwayland.mk
+++ b/src/modules/Makefile_xwayland.mk
@@ -4,6 +4,7 @@ xwaylandpkg_LTLIBRARIES = src/modules/xwayland/module.la
 
 src_modules_xwayland_module_la_DEPENDENCIES = $(MDEPENDENCIES)
 src_modules_xwayland_module_la_CPPFLAGS  = \
+-DNEED_X \
 $(MOD_CPPFLAGS) \
 @XWAYLAND_CFLAGS@ \
 @WAYLAND_CFLAGS@ \

-- 


Reply via email to