Move xwayland up one directory level

Makefile.am

@@ -2,7 +2,20 @@ if BUILD_WCAP_TOOLS
 wcap_subdir = wcap
 endif
 
-SUBDIRS = shared src clients data protocol tests $(wcap_subdir) man
+if ENABLE_XWAYLAND
+xwayland_subdir = xwayland
+endif
+
+SUBDIRS =					\
+	shared					\
+	src					\
+	$(xwayland_subdir)			\
+	clients					\
+	data					\
+	protocol				\
+	tests					\
+	$(wcap_subdir)				\
+	man
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
 

configure.ac

@@ -490,7 +490,7 @@ AM_CONDITIONAL([HAVE_XMLLINT], [test "x$XMLLINT" != "x" -a "x$dtddir" != "x"])
 AC_CONFIG_FILES([Makefile
 		 shared/Makefile
 		 src/Makefile
-		 src/xwayland/Makefile
+		 xwayland/Makefile
 		 src/version.h
 		 src/weston.pc
 		 clients/Makefile

src/Makefile.am

@@ -75,13 +75,6 @@ git-version.h : .FORCE
 
 .FORCE :
 
-if ENABLE_XWAYLAND
-SUBDIRS = xwayland
-endif
-
-DIST_SUBDIRS = xwayland
-
-
 if BUILD_WESTON_LAUNCH
 weston_launch = weston-launch
 weston_launch_SOURCES = weston-launch.c weston-launch.h

xwayland/Makefile.am

@@ -1,6 +1,8 @@
 AM_CPPFLAGS =					\
 	-I$(top_srcdir)/shared			\
+	-I$(top_srcdir)/src			\
 	-I$(top_builddir)/src			\
+	-I$(top_builddir)/xwayland		\
 	-DDATADIR='"$(datadir)"'		\
 	-DMODULEDIR='"$(moduledir)"'		\
 	-DLIBEXECDIR='"$(libexecdir)"'		\

xwayland/dnd.c

@@ -35,8 +35,8 @@
 
 #include "xwayland.h"
 
-#include "../../shared/cairo-util.h"
+#include "cairo-util.h"
-#include "../compositor.h"
+#include "compositor.h"
 #include "xserver-server-protocol.h"
 #include "hash.h"
 

xwayland/window-manager.c

@@ -36,8 +36,8 @@
 
 #include "xwayland.h"
 
-#include "../../shared/cairo-util.h"
+#include "cairo-util.h"
-#include "../compositor.h"
+#include "compositor.h"
 #include "xserver-server-protocol.h"
 #include "hash.h"
 

xwayland/xwayland.h

@@ -26,7 +26,7 @@
 #include <xcb/composite.h>
 #include <cairo/cairo-xcb.h>
 
-#include "../compositor.h"
+#include "compositor.h"
 
 #define SEND_EVENT_MASK (0x80)
 #define EVENT_TYPE(event) ((event)->response_type & ~SEND_EVENT_MASK)