remove NEED_X define from build

this used to be a marker for places where x11 functionality was needed,
but this has been simplified with the removal of wayland-only in configure
and so it is no longer needed

18 files changed, 16 insertions, 20 deletions

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 4a24ea1563..07345cfbc2 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -376,9 +376,6 @@ src/bin/e_comp_wl.c
 endif
 
 src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ @ECORE_X_CFLAGS@
-if ! HAVE_WAYLAND_ONLY
-src_bin_enlightenment_CPPFLAGS += -DNEED_X=1
-endif
 src_bin_enlightenment_SOURCES = \
 src/bin/e_main.c \
 $(enlightenment_src)
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 128f7c6708..b82853f11e 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -8,7 +8,7 @@
 #include "e_desk.h"
 #include "e_auth.h"
 #include "e_randr2.h"
-#ifdef NEED_X
+#ifndef HAVE_WAYLAND_ONLY
 # include "e_comp_x.h"
 #endif
 #include "e_pixmap.h"
diff --git a/src/modules/Makefile_access.mk b/src/modules/Makefile_access.mk
index d98733436b..19024f5f4c 100644
--- a/src/modules/Makefile_access.mk
+++ b/src/modules/Makefile_access.mk
@@ -8,7 +8,7 @@ accesspkgdir = $(MDIR)/access/$(MODULE_ARCH)
 accesspkg_LTLIBRARIES = src/modules/access/module.la
 
 src_modules_access_module_la_LIBADD = $(MOD_LIBS)
-src_modules_access_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X
+src_modules_access_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_access_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_access_module_la_SOURCES = src/modules/access/e_mod_main.c \
 			   src/modules/access/e_mod_main.h \
diff --git a/src/modules/Makefile_conf_bindings.mk b/src/modules/Makefile_conf_bindings.mk
index a13d72570a..db769524ee 100644
--- a/src/modules/Makefile_conf_bindings.mk
+++ b/src/modules/Makefile_conf_bindings.mk
@@ -8,7 +8,7 @@ conf_bindingspkgdir = $(MDIR)/conf_bindings/$(MODULE_ARCH)
 conf_bindingspkg_LTLIBRARIES = src/modules/conf_bindings/module.la
 
 src_modules_conf_bindings_module_la_LIBADD = $(MOD_LIBS)
-src_modules_conf_bindings_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_conf_bindings_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_conf_bindings_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_conf_bindings_module_la_SOURCES = src/modules/conf_bindings/e_mod_main.c \
 			     src/modules/conf_bindings/e_mod_main.h \
diff --git a/src/modules/Makefile_conf_display.mk b/src/modules/Makefile_conf_display.mk
index 2ca1cf0e19..e4e560c58a 100644
--- a/src/modules/Makefile_conf_display.mk
+++ b/src/modules/Makefile_conf_display.mk
@@ -8,7 +8,7 @@ conf_displaypkgdir = $(MDIR)/conf_display/$(MODULE_ARCH)
 conf_displaypkg_LTLIBRARIES = src/modules/conf_display/module.la
 
 src_modules_conf_display_module_la_LIBADD = $(MOD_LIBS)
-src_modules_conf_display_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_conf_display_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_conf_display_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_conf_display_module_la_SOURCES = src/modules/conf_display/e_mod_main.c \
 				 src/modules/conf_display/e_mod_main.h \
diff --git a/src/modules/Makefile_conf_randr.mk b/src/modules/Makefile_conf_randr.mk
index 280a4021b4..0e2da0529a 100644
--- a/src/modules/Makefile_conf_randr.mk
+++ b/src/modules/Makefile_conf_randr.mk
@@ -10,7 +10,7 @@ conf_randrpkgdir = $(MDIR)/conf_randr/$(MODULE_ARCH)
 conf_randrpkg_LTLIBRARIES = src/modules/conf_randr/module.la
 
 src_modules_conf_randr_module_la_LIBADD = $(MOD_LIBS)
-src_modules_conf_randr_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_conf_randr_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_conf_randr_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_conf_randr_module_la_SOURCES = src/modules/conf_randr/e_mod_main.c \
 			       src/modules/conf_randr/e_mod_main.h \
diff --git a/src/modules/Makefile_conf_theme.mk b/src/modules/Makefile_conf_theme.mk
index 1326ec85a2..6b0ca744ee 100644
--- a/src/modules/Makefile_conf_theme.mk
+++ b/src/modules/Makefile_conf_theme.mk
@@ -8,7 +8,7 @@ conf_themepkgdir = $(MDIR)/conf_theme/$(MODULE_ARCH)
 conf_themepkg_LTLIBRARIES = src/modules/conf_theme/module.la
 
 src_modules_conf_theme_module_la_LIBADD = $(MOD_LIBS)
-src_modules_conf_theme_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_conf_theme_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_conf_theme_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_conf_theme_module_la_SOURCES = src/modules/conf_theme/e_mod_main.c \
 			       src/modules/conf_theme/e_mod_main.h \
diff --git a/src/modules/Makefile_everything.mk b/src/modules/Makefile_everything.mk
index 4838af7186..b7419d19eb 100644
--- a/src/modules/Makefile_everything.mk
+++ b/src/modules/Makefile_everything.mk
@@ -15,7 +15,7 @@ EVRYHEADERS = src/modules/everything/evry_api.h \
 	      src/modules/everything/evry_types.h
 
 src_modules_everything_module_la_LIBADD = $(MOD_LIBS)
-src_modules_everything_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_everything_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_everything_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_everything_module_la_SOURCES = $(EVRYHEADERS) \
 			       src/modules/everything/e_mod_main.c \
diff --git a/src/modules/Makefile_fileman.mk b/src/modules/Makefile_fileman.mk
index d1e29dfc08..3889f58a53 100644
--- a/src/modules/Makefile_fileman.mk
+++ b/src/modules/Makefile_fileman.mk
@@ -10,7 +10,7 @@ filemanpkgdir = $(MDIR)/fileman/$(MODULE_ARCH)
 filemanpkg_LTLIBRARIES = src/modules/fileman/module.la
 
 src_modules_fileman_module_la_LIBADD = $(MOD_LIBS)
-src_modules_fileman_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_fileman_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_fileman_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_fileman_module_la_SOURCES = src/modules/fileman/e_mod_main.c \
 			    src/modules/fileman/e_mod_main.h \
diff --git a/src/modules/Makefile_pager.mk b/src/modules/Makefile_pager.mk
index 18ea68e165..a77198e848 100644
--- a/src/modules/Makefile_pager.mk
+++ b/src/modules/Makefile_pager.mk
@@ -10,7 +10,7 @@ pagerpkgdir = $(MDIR)/pager/$(MODULE_ARCH)
 pagerpkg_LTLIBRARIES = src/modules/pager/module.la
 
 src_modules_pager_module_la_LIBADD = $(MOD_LIBS)
-src_modules_pager_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_pager_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_pager_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_pager_module_la_SOURCES = src/modules/pager/e_mod_main.h \
 			  src/modules/pager/e_mod_main.c \
diff --git a/src/modules/Makefile_pager_plain.mk b/src/modules/Makefile_pager_plain.mk
index 73615843fe..d9ba717290 100644
--- a/src/modules/Makefile_pager_plain.mk
+++ b/src/modules/Makefile_pager_plain.mk
@@ -10,7 +10,7 @@ pager_plainpkgdir = $(MDIR)/pager_plain/$(MODULE_ARCH)
 pager_plainpkg_LTLIBRARIES = src/modules/pager_plain/module.la
 
 src_modules_pager_plain_module_la_LIBADD = $(MOD_LIBS)
-src_modules_pager_plain_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_pager_plain_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_pager_plain_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_pager_plain_module_la_SOURCES = src/modules/pager_plain/e_mod_main.h \
 			  src/modules/pager_plain/e_mod_main.c \
diff --git a/src/modules/Makefile_shot.mk b/src/modules/Makefile_shot.mk
index c9a7eefae6..62d224ad64 100644
--- a/src/modules/Makefile_shot.mk
+++ b/src/modules/Makefile_shot.mk
@@ -10,7 +10,7 @@ shotpkgdir = $(MDIR)/shot/$(MODULE_ARCH)
 shotpkg_LTLIBRARIES = src/modules/shot/module.la
 
 src_modules_shot_module_la_LIBADD = $(MOD_LIBS)
-src_modules_shot_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_shot_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_shot_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_shot_module_la_SOURCES = src/modules/shot/e_mod_main.c
 
diff --git a/src/modules/Makefile_systray.mk b/src/modules/Makefile_systray.mk
index f7d1cbfbc2..052688262e 100644
--- a/src/modules/Makefile_systray.mk
+++ b/src/modules/Makefile_systray.mk
@@ -10,7 +10,7 @@ systraypkgdir = $(MDIR)/systray/$(MODULE_ARCH)
 systraypkg_LTLIBRARIES = src/modules/systray/module.la
 
 src_modules_systray_module_la_LIBADD = $(MOD_LIBS)
-src_modules_systray_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_systray_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_systray_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_systray_module_la_SOURCES = src/modules/systray/e_mod_main.h \
 			    src/modules/systray/e_mod_main.c \
diff --git a/src/modules/Makefile_tiling.mk b/src/modules/Makefile_tiling.mk
index 6ece181bb2..ce3617917a 100644
--- a/src/modules/Makefile_tiling.mk
+++ b/src/modules/Makefile_tiling.mk
@@ -19,7 +19,7 @@ src/modules/tiling/%.edj: src/modules/tiling/%.edc Makefile
 	$(EDJE_CC) $(TILING_EDJE_FLAGS) $< $@
 
 src_modules_tiling_module_la_LIBADD = $(MOD_LIBS)
-src_modules_tiling_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_tiling_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_tiling_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_tiling_module_la_SOURCES = src/modules/tiling/e_mod_tiling.c \
 				       src/modules/tiling/e_mod_tiling.h \
diff --git a/src/modules/Makefile_winlist.mk b/src/modules/Makefile_winlist.mk
index b2f59e085f..7f3a4edc51 100644
--- a/src/modules/Makefile_winlist.mk
+++ b/src/modules/Makefile_winlist.mk
@@ -10,7 +10,7 @@ winlistpkgdir = $(MDIR)/winlist/$(MODULE_ARCH)
 winlistpkg_LTLIBRARIES = src/modules/winlist/module.la
 
 src_modules_winlist_module_la_LIBADD = $(MOD_LIBS)
-src_modules_winlist_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_winlist_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_winlist_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_winlist_module_la_SOURCES = src/modules/winlist/e_mod_main.h \
 			    src/modules/winlist/e_mod_main.c \
diff --git a/src/modules/Makefile_wizard.mk b/src/modules/Makefile_wizard.mk
index 8cde723dca..eac37f8322 100644
--- a/src/modules/Makefile_wizard.mk
+++ b/src/modules/Makefile_wizard.mk
@@ -128,7 +128,7 @@ src_modules_wizard_page_130_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_wizard_page_130_la_SOURCES = src/modules/wizard/page_130.c
 
 src_modules_wizard_page_150_la_LIBADD = $(MOD_LIBS)
-src_modules_wizard_page_150_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_wizard_page_150_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_wizard_page_150_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_wizard_page_150_la_SOURCES = src/modules/wizard/page_150.c
 
diff --git a/src/modules/Makefile_xkbswitch.mk b/src/modules/Makefile_xkbswitch.mk
index c7a0a63438..1b4df52875 100644
--- a/src/modules/Makefile_xkbswitch.mk
+++ b/src/modules/Makefile_xkbswitch.mk
@@ -10,7 +10,7 @@ xkbswitchpkgdir = $(MDIR)/xkbswitch/$(MODULE_ARCH)
 xkbswitchpkg_LTLIBRARIES = src/modules/xkbswitch/module.la
 
 src_modules_xkbswitch_module_la_LIBADD = $(MOD_LIBS)
-src_modules_xkbswitch_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -DNEED_X=1
+src_modules_xkbswitch_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
 src_modules_xkbswitch_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_xkbswitch_module_la_SOURCES = src/modules/xkbswitch/e_mod_main.c \
 			      src/modules/xkbswitch/e_mod_main.h \
diff --git a/src/modules/Makefile_xwayland.mk b/src/modules/Makefile_xwayland.mk
index 515bd5bb3d..5afc15b567 100644
--- a/src/modules/Makefile_xwayland.mk
+++ b/src/modules/Makefile_xwayland.mk
@@ -4,7 +4,6 @@ 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@ \