From 173e1606322675149c09443e6037737748dd72f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 19 Nov 2012 17:11:58 -0500 Subject: [PATCH] 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. --- Makefile.am | 2 +- configure.ac | 1 + protocol/Makefile.am | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 protocol/Makefile.am diff --git a/Makefile.am b/Makefile.am index 7f35034f..306d7b33 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 a451948f..f681fc9d 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 00000000..08690b3c --- /dev/null +++ b/protocol/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = wayland.xml