From f9bc6f63fbd4c1541f733465984ddff0dfd24e9f Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon, 27 Jan 2014 22:26:29 -0800
Subject: build: Move protocol/Makefile.am into toplevel Makefile.am

---
 Makefile.am | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 0cf30e63..526e196b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,6 @@ SUBDIRS =					\
 	shared					\
 	src					\
 	clients					\
-	protocol				\
 	tests					\
 	man
 
@@ -22,7 +21,7 @@ weston.ini : $(srcdir)/weston.ini.in
 		-e 's|@libexecdir[@]|$(libexecdir)|g' \
 		$< > $@
 
-all-local : weston.ini
+all-local : weston.ini validate-protocol-xml
 
 CLEANFILES = weston.ini $(BUILT_SOURCES)
 
@@ -128,5 +127,32 @@ BUILT_SOURCES +=				\
 	xwayland/xserver-server-protocol.h
 endif
 
+
+protocol_sources =				\
+	protocol/desktop-shell.xml		\
+	protocol/screenshooter.xml		\
+	protocol/xserver.xml			\
+	protocol/text.xml			\
+	protocol/input-method.xml		\
+	protocol/workspaces.xml			\
+	protocol/text-cursor-position.xml	\
+	protocol/wayland-test.xml		\
+	protocol/xdg-shell.xml			\
+	protocol/scaler.xml
+
+if HAVE_XMLLINT
+.PHONY : validate-protocol-xml
+
+.%.xml.valid : $(top_srcdir)/protocol/%.xml
+	$(AM_V_GEN)$(XMLLINT) --noout --dtdvalid $(dtddir)/wayland.dtd $^ > $@
+
+validate-protocol-xml : $(protocol_sources:protocol/%.xml=.%.xml.valid)
+
+CLEANFILES += $(protocol_sources:protocol/%.xml=.%.xml.valid)
+EXTRA_DIST += $(protocol_sources)
+
+endif
+
+
 wayland_protocoldir = $(top_srcdir)/protocol
 include $(top_srcdir)/wayland-scanner.mk
-- 
cgit v1.2.3