From bb5344ee6d404095ddb70195b0b4f749d460d989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Tue, 18 Feb 2014 14:55:09 -0800
Subject: [PATCH] build: Move protocol/ Makefile.am into toplevel Makefile.am

A small step towards non-recursive build system for wayland too.
---
 Makefile.am          | 7 +++++--
 configure.ac         | 1 -
 protocol/Makefile.am | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 protocol/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 99607b0d..f6ee810a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,14 @@ if BUILD_DOCS
 doc_subdir = doc
 endif
 
-SUBDIRS = protocol src $(doc_subdir) tests cursor
+SUBDIRS = src $(doc_subdir) tests cursor
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 aclocaldir = $(datadir)/aclocal
 dist_aclocal_DATA = wayland-scanner.m4
 
-dist_pkgdata_DATA = wayland-scanner.mk
+dist_pkgdata_DATA =				\
+	wayland-scanner.mk			\
+	protocol/wayland.xml			\
+	protocol/wayland.dtd
diff --git a/configure.ac b/configure.ac
index 7be5d8f3..d75dc090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,6 +142,5 @@ AC_CONFIG_FILES([Makefile
 		 src/wayland-client.pc
 		 src/wayland-scanner.pc
 		 src/wayland-version.h
-		 protocol/Makefile
 		 tests/Makefile])
 AC_OUTPUT
diff --git a/protocol/Makefile.am b/protocol/Makefile.am
deleted file mode 100644
index 9dca3247..00000000
--- a/protocol/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-dist_pkgdata_DATA = wayland.xml wayland.dtd
-- 
GitLab