From 0eb86de8077f566a79e19af9e59631c75f8ab2fb Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 18 Mar 2014 20:32:02 -0400
Subject: [PATCH] Move Wayland protocols into src/wayland

---
 Makefile.am                                      |  2 +-
 configure.ac                                     |  1 -
 protocol/Makefile.am                             |  7 -------
 src/Makefile.am                                  | 12 ++++++++----
 {protocol => src/wayland/protocol}/gtk-shell.xml |  0
 {protocol => src/wayland/protocol}/xdg-shell.xml |  0
 {protocol => src/wayland/protocol}/xserver.xml   |  0
 7 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 protocol/Makefile.am
 rename {protocol => src/wayland/protocol}/gtk-shell.xml (100%)
 rename {protocol => src/wayland/protocol}/xdg-shell.xml (100%)
 rename {protocol => src/wayland/protocol}/xserver.xml (100%)

diff --git a/Makefile.am b/Makefile.am
index 19dbe9cf1..d08cc6391 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS=src protocol po doc
+SUBDIRS=src po doc
 
 EXTRA_DIST = HACKING MAINTAINERS rationales.txt
 
diff --git a/configure.ac b/configure.ac
index 6bc1ab4c2..6cc69fc0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -453,7 +453,6 @@ doc/reference/meta-docs.sgml
 src/Makefile
 src/libmutter-wayland.pc
 src/compositor/plugins/Makefile
-protocol/Makefile
 po/Makefile.in
 ])
 
diff --git a/protocol/Makefile.am b/protocol/Makefile.am
deleted file mode 100644
index 8ce700537..000000000
--- a/protocol/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-NULL =
-
-EXTRA_DIST = \
-	gtk-shell.xml \
-	xdg-shell.xml \
-	xserver.xml \
-	$(NULL)
diff --git a/src/Makefile.am b/src/Makefile.am
index a94f49e61..fff1f22dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,6 +49,11 @@ mutter_built_sources = \
 	wayland/xserver-protocol.c		\
 	wayland/xserver-server-protocol.h
 
+wayland_protocols = \
+	wayland/protocol/gtk-shell.xml		\
+	wayland/protocol/xdg-shell.xml		\
+	wayland/protocol/xserver.xml
+
 libmutter_wayland_la_SOURCES =			\
 	core/above-tab-keycode.c		\
 	core/barrier.c				\
@@ -362,6 +367,7 @@ EXTRA_DIST=$(desktopfiles_files) 	\
 	$(desktopfiles_in_files)	\
 	$(wmproperties_in_files)	\
 	$(xml_in_files)			\
+	$(wayland_protocols)		\
 	org.gnome.mutter.gschema.xml.in \
 	org.gnome.mutter.wayland.gschema.xml.in \
 	mutter-schemas.convert \
@@ -411,9 +417,7 @@ $(dbus_idle_built_sources) : Makefile.am idle-monitor.xml
 		--c-generate-object-manager						\
 		$(srcdir)/idle-monitor.xml
 
-wayland/%-protocol.c : $(top_builddir)/protocol/%.xml
-	mkdir -p wayland
+wayland/%-protocol.c : $(srcdir)/wayland/protocol/%.xml
 	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
-wayland/%-server-protocol.h : $(top_builddir)/protocol/%.xml
-	mkdir -p wayland
+wayland/%-server-protocol.h : $(srcdir)/wayland/protocol/%.xml
 	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
diff --git a/protocol/gtk-shell.xml b/src/wayland/protocol/gtk-shell.xml
similarity index 100%
rename from protocol/gtk-shell.xml
rename to src/wayland/protocol/gtk-shell.xml
diff --git a/protocol/xdg-shell.xml b/src/wayland/protocol/xdg-shell.xml
similarity index 100%
rename from protocol/xdg-shell.xml
rename to src/wayland/protocol/xdg-shell.xml
diff --git a/protocol/xserver.xml b/src/wayland/protocol/xserver.xml
similarity index 100%
rename from protocol/xserver.xml
rename to src/wayland/protocol/xserver.xml