Move xwayland integration into xwayland subdirectory

configure.ac

@@ -194,6 +194,7 @@ WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol'])
 AC_CONFIG_FILES([Makefile
 		 shared/Makefile
 		 src/Makefile
+		 src/xwayland/Makefile
 		 clients/Makefile
 		 data/Makefile
 		 protocol/Makefile

src/Makefile.am

@@ -4,8 +4,7 @@ bin_PROGRAMS = weston				\
 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_SOURCES =				\
 	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 @@ moduledir = @libdir@/weston
 module_LTLIBRARIES =				\
 	$(desktop_shell)			\
 	$(tablet_shell)				\
-	$(xserver_launcher)			\
 	$(x11_backend)				\
 	$(drm_backend)				\
 	$(wayland_backend)			\
@@ -113,19 +118,6 @@ openwfd_backend_la_CFLAGS = $(OPENWFD_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
 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 @@ BUILT_SOURCES =					\
 	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
 

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@

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"