build: Move xwayland build rules to toplevel Makefile.am

4 files changed, 61 insertions, 47 deletions

diff --git a/Makefile.am b/Makefile.am
index 85d08e99..784bd4b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,9 @@ if BUILD_WCAP_TOOLS
 wcap_subdir = wcap
 endif
 
-if ENABLE_XWAYLAND
-xwayland_subdir = xwayland
-endif
-
 SUBDIRS =					\
 	shared					\
 	src					\
-	$(xwayland_subdir)			\
 	desktop-shell				\
 	clients					\
 	data					\
@@ -30,3 +25,57 @@ weston.ini : $(srcdir)/weston.ini.in
 		$< > $@
 
 all-local : weston.ini
+
+moduledir = @libdir@/weston
+module_LTLIBRARIES = $(xwayland_module)
+
+if ENABLE_XWAYLAND
+xwayland_module = xwayland.la
+
+xwayland_la_CPPFLAGS =				\
+	-I$(top_srcdir)/shared			\
+	-I$(top_srcdir)/src			\
+	-I$(top_builddir)/xwayland		\
+	-DDATADIR='"$(datadir)"'		\
+	-DMODULEDIR='"$(moduledir)"'		\
+	-DLIBEXECDIR='"$(libexecdir)"'		\
+	-DXSERVER_PATH='"@XSERVER_PATH@"'
+
+xwayland_la_LDFLAGS = -module -avoid-version
+xwayland_la_LIBADD =			\
+	$(XWAYLAND_LIBS)		\
+	$(top_builddir)/shared/libshared-cairo.la
+xwayland_la_CFLAGS =				\
+	$(GCC_CFLAGS)				\
+	$(COMPOSITOR_CFLAGS)			\
+	$(PIXMAN_CFLAGS)			\
+	$(CAIRO_CFLAGS)
+xwayland_la_SOURCES =				\
+	xwayland/xwayland.h			\
+	xwayland/window-manager.c		\
+	xwayland/selection.c			\
+	xwayland/dnd.c				\
+	xwayland/launcher.c			\
+	xwayland/xserver-protocol.c		\
+	xwayland/xserver-server-protocol.h	\
+	xwayland/hash.c				\
+	xwayland/hash.h
+
+BUILT_SOURCES =					\
+	xwayland/xserver-protocol.c		\
+	xwayland/xserver-server-protocol.h
+
+CLEANFILES = $(BUILT_SOURCES)
+
+wayland_protocoldir = $(top_srcdir)/protocol
+
+xwayland/%-protocol.c : $(wayland_protocoldir)/%.xml
+	$(AM_V_GEN)$(wayland_scanner) code < $< > $@
+
+xwayland/%-server-protocol.h : $(wayland_protocoldir)/%.xml
+	$(AM_V_GEN)$(wayland_scanner) server-header < $< > $@
+
+xwayland/%-client-protocol.h : $(wayland_protocoldir)/%.xml
+	$(AM_V_GEN)$(wayland_scanner) client-header < $< > $@
+
+endif
diff --git a/configure.ac b/configure.ac
index eb2f6f89..859a5a75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -497,7 +497,6 @@ AM_CONDITIONAL([HAVE_XMLLINT], [test "x$XMLLINT" != "x" -a "x$dtddir" != "x"])
 AC_CONFIG_FILES([Makefile
 		 shared/Makefile
 		 src/Makefile
-		 xwayland/Makefile
 		 desktop-shell/Makefile
 		 src/version.h
 		 src/weston.pc
diff --git a/xwayland/Makefile b/xwayland/Makefile
new file mode 100644
index 00000000..5332f251
--- /dev/null
+++ b/xwayland/Makefile
@@ -0,0 +1,7 @@
+all:
+	$(MAKE) -C ..
+
+clean:
+	$(MAKE) -C .. clean
+
+.PHONY: all clean
diff --git a/xwayland/Makefile.am b/xwayland/Makefile.am
deleted file mode 100644
index d41111da..00000000
--- a/xwayland/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-AM_CPPFLAGS =					\
-	-I$(top_srcdir)/shared			\
-	-I$(top_srcdir)/src			\
-	-I$(top_builddir)/xwayland		\
-	-DDATADIR='"$(datadir)"'		\
-	-DMODULEDIR='"$(moduledir)"'		\
-	-DLIBEXECDIR='"$(libexecdir)"'		\
-	-DXSERVER_PATH='"@XSERVER_PATH@"'
-
-moduledir = @libdir@/weston
-module_LTLIBRARIES = xwayland.la
-
-xwayland = xwayland.la
-xwayland_la_LDFLAGS = -module -avoid-version
-xwayland_la_LIBADD =			\
-	$(XWAYLAND_LIBS)		\
-	$(top_builddir)/shared/libshared-cairo.la
-xwayland_la_CFLAGS =				\
-	$(GCC_CFLAGS)				\
-	$(COMPOSITOR_CFLAGS)			\
-	$(PIXMAN_CFLAGS)			\
-	$(CAIRO_CFLAGS)
-xwayland_la_SOURCES =				\
-	xwayland.h				\
-	window-manager.c			\
-	selection.c				\
-	dnd.c					\
-	launcher.c				\
-	xserver-protocol.c			\
-	xserver-server-protocol.h		\
-	hash.c					\
-	hash.h
-
-BUILT_SOURCES =					\
-	xserver-protocol.c			\
-	xserver-server-protocol.h
-
-CLEANFILES = $(BUILT_SOURCES)
-
-wayland_protocoldir = $(top_srcdir)/protocol
-include $(top_srcdir)/wayland-scanner.mk