Move xwayland integration into xwayland subdirectory
diff --git a/configure.ac b/configure.ac
index f207c3c..ceed18d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,6 +194,7 @@
AC_CONFIG_FILES([Makefile
shared/Makefile
src/Makefile
+ src/xwayland/Makefile
clients/Makefile
data/Makefile
protocol/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index f7e3b97..794b521 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,7 @@
AM_CPPFLAGS = \
-DDATADIR='"$(datadir)"' \
-DMODULEDIR='"$(moduledir)"' \
- -DLIBEXECDIR='"$(libexecdir)"' \
- -DXSERVER_PATH='"@XSERVER_PATH@"'
+ -DLIBEXECDIR='"$(libexecdir)"'
weston_LDFLAGS = -export-dynamic
weston_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
@@ -25,6 +24,13 @@
weston-launch.h \
weston-egl-ext.h
+if ENABLE_XSERVER_LAUNCHER
+SUBDIRS = xwayland
+endif
+
+DIST_SUBDIRS = xwayland
+
+
if BUILD_WESTON_LAUNCH
weston_launch = weston-launch
weston_launch_SOURCES = weston-launch.c weston-launch.h
@@ -53,7 +59,6 @@
module_LTLIBRARIES = \
$(desktop_shell) \
$(tablet_shell) \
- $(xserver_launcher) \
$(x11_backend) \
$(drm_backend) \
$(wayland_backend) \
@@ -113,19 +118,6 @@
openwfd_backend_la_SOURCES = compositor-openwfd.c tty.c evdev.c evdev.h
endif
-if ENABLE_XSERVER_LAUNCHER
-xserver_launcher = xserver-launcher.la
-xserver_launcher_la_LDFLAGS = -module -avoid-version
-xserver_launcher_la_LIBADD = $(XSERVER_LAUNCHER_LIBS) ../shared/libshared.la
-xserver_launcher_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
-xserver_launcher_la_SOURCES = \
- xserver-launcher.c \
- xserver-protocol.c \
- xserver-server-protocol.h \
- hash.c \
- hash.h
-endif
-
if ENABLE_DESKTOP_SHELL
desktop_shell = desktop-shell.la
desktop_shell_la_LDFLAGS = -module -avoid-version
@@ -154,8 +146,6 @@
screenshooter-protocol.c \
tablet-shell-protocol.c \
tablet-shell-server-protocol.h \
- xserver-protocol.c \
- xserver-server-protocol.h \
desktop-shell-protocol.c \
desktop-shell-server-protocol.h
diff --git a/src/xwayland/Makefile.am b/src/xwayland/Makefile.am
new file mode 100644
index 0000000..db8dc05
--- /dev/null
+++ b/src/xwayland/Makefile.am
@@ -0,0 +1,27 @@
+AM_CPPFLAGS = \
+ -DDATADIR='"$(datadir)"' \
+ -DMODULEDIR='"$(moduledir)"' \
+ -DLIBEXECDIR='"$(libexecdir)"' \
+ -DXSERVER_PATH='"@XSERVER_PATH@"'
+
+moduledir = @libdir@/weston
+module_LTLIBRARIES = xserver-launcher.la
+
+xserver_launcher = xserver-launcher.la
+xserver_launcher_la_LDFLAGS = -module -avoid-version
+xserver_launcher_la_LIBADD = \
+ $(XSERVER_LAUNCHER_LIBS) \
+ $(top_builddir)/shared/libshared.la
+xserver_launcher_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
+xserver_launcher_la_SOURCES = \
+ xserver-launcher.c \
+ xserver-protocol.c \
+ xserver-server-protocol.h \
+ hash.c \
+ hash.h
+
+BUILT_SOURCES = \
+ xserver-protocol.c \
+ xserver-server-protocol.h
+
+@wayland_scanner_rules@
diff --git a/src/hash.c b/src/xwayland/hash.c
similarity index 100%
rename from src/hash.c
rename to src/xwayland/hash.c
diff --git a/src/hash.h b/src/xwayland/hash.h
similarity index 100%
rename from src/hash.h
rename to src/xwayland/hash.h
diff --git a/src/xserver-launcher.c b/src/xwayland/xserver-launcher.c
similarity index 99%
rename from src/xserver-launcher.c
rename to src/xwayland/xserver-launcher.c
index bd162b6..851983e 100644
--- a/src/xserver-launcher.c
+++ b/src/xwayland/xserver-launcher.c
@@ -38,8 +38,8 @@
#include <wayland-server.h>
-#include "../shared/cairo-util.h"
-#include "compositor.h"
+#include "../../shared/cairo-util.h"
+#include "../compositor.h"
#include "xserver-server-protocol.h"
#include "hash.h"