discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=829865b4f40bd287602b97ab55f7b7927df03e49
commit 829865b4f40bd287602b97ab55f7b7927df03e49
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Tue Apr 28 13:14:34 2015 -0400
remove xwayland .desktop and .edj files
---
configure.ac | 1 -
src/modules/Makefile_xwayland.mk | 11 ++---------
src/modules/xwayland/e-module-xwayland.edj | Bin 13048 -> 0 bytes
src/modules/xwayland/module.desktop.in | 7 -------
4 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/configure.ac b/configure.ac
index 26e31bd..c9cb96b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1084,7 +1084,6 @@ src/modules/music-control/module.desktop
src/modules/packagekit/module.desktop
src/modules/wl_desktop_shell/module.desktop
src/modules/wl_screenshot/module.desktop
-src/modules/xwayland/module.desktop
data/xsession/enlightenment.desktop
data/etc/sysactions.conf
data/units/enlightenment.service
diff --git a/src/modules/Makefile_xwayland.mk b/src/modules/Makefile_xwayland.mk
index aa7abff..15e7eac 100644
--- a/src/modules/Makefile_xwayland.mk
+++ b/src/modules/Makefile_xwayland.mk
@@ -1,11 +1,4 @@
-EXTRA_DIST += src/modules/xwayland/module.desktop.in \
-src/modules/xwayland/e-module-xwayland.edj \
-src/modules/xwayland/module.desktop.in
if USE_MODULE_XWAYLAND
-xwaylanddir = $(MDIR)/xwayland
-xwayland_DATA = src/modules/xwayland/e-module-xwayland.edj \
- src/modules/xwayland/module.desktop
-
xwaylandpkgdir = $(MDIR)/xwayland/$(MODULE_ARCH)
xwaylandpkg_LTLIBRARIES = src/modules/xwayland/module.la
@@ -21,6 +14,6 @@ src_modules_xwayland_module_la_SOURCES = \
src/modules/xwayland/e_mod_main.c
PHONIES += xwayland install-xwayland
-xwayland: $(xwaylandpkg_LTLIBRARIES) $(xwayland_DATA)
-install-xwayland: install-xwaylandDATA install-xwaylandpkgLTLIBRARIES
+xwayland: $(xwaylandpkg_LTLIBRARIES)
+install-xwayland: install-xwaylandpkgLTLIBRARIES
endif
diff --git a/src/modules/xwayland/e-module-xwayland.edj
b/src/modules/xwayland/e-module-xwayland.edj
deleted file mode 100644
index 2c1f4d2..0000000
Binary files a/src/modules/xwayland/e-module-xwayland.edj and /dev/null differ
diff --git a/src/modules/xwayland/module.desktop.in
b/src/modules/xwayland/module.desktop.in
deleted file mode 100644
index c177edb..0000000
--- a/src/modules/xwayland/module.desktop.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Link
-Name=XWayland
-Comment=Enlightenment XWayland
-Icon=e-module-xwayland
-X-Enlightenment-ModuleType=look
--
