summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2012-11-19 17:11:58 -0500
committerKristian Høgsberg <krh@bitplanet.net>2012-11-19 17:11:58 -0500
commit173e1606322675149c09443e6037737748dd72f7 (patch)
tree1d8c34777308b6f1121eaeee33257b8272708f75
parent3a671b4d3db6dd03bcc6e266484d30b9f3f4fd8b (diff)
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.
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
-rw-r--r--protocol/Makefile.am1
3 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 7f35034..306d7b3 100644
--- 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
--- 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
index 0000000..08690b3
--- /dev/null
+++ b/protocol/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = wayland.xml