Fix distcheck by adding back protocol/Makefile.am

5909dddc78573774bd3a93c280831a7d18d82994 removed protocol/Makefile.am
which meant protocol/wayland.xml no longer got included in the tarball.
Add back protocol/Makefile.am and configure.ac bits and add protocol to
subdirs in Makefile.am to fix this.

diff --git a/Makefile.am b/Makefile.am
index 7f35034..306d7b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ if BUILD_DOCS
 doc_subdir = doc
 endif
 
-SUBDIRS = src $(doc_subdir) tests cursor
+SUBDIRS = src protocol $(doc_subdir) tests cursor
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 

diff --git a/configure.ac b/configure.ac
index a451948..f681fc9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -116,5 +116,6 @@ AC_CONFIG_FILES([Makefile
                 src/wayland-server.pc
                 src/wayland-client.pc
                 src/wayland-version.h
+                protocol/Makefile
                 tests/Makefile])
 AC_OUTPUT

diff --git a/protocol/Makefile.am b/protocol/Makefile.am
new file mode 100644 (file)
index 0000000..08690b3
--- /dev/null
+++ b/protocol/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = wayland.xml