[PATCH RFC wayland 1/4] Move dtddata include out of subdirectory

[Daniel Stone]

meson refuses to countenance generating files in subdirectories, so just
move the dtddata include into the top-level directory.

Signed-off-by: Daniel Stone <daniels at collabora.com>
---
 .gitignore     | 1 +
 configure.ac   | 2 +-
 src/.gitignore | 1 -
 src/dtddata.S  | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8da9861..ba17a96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ exec-fd-leak-checker
 fixed-benchmark
 /wayland-scanner
 protocol/*.[ch]
+/wayland.dtd.embed
diff --git a/configure.ac b/configure.ac
index 6cda418..edf7141 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,7 +125,7 @@ AM_CONDITIONAL([DTD_VALIDATION], [test "x$enable_dtd_validation" = "xyes"])
 if test "x$enable_dtd_validation" = "xyes"; then
 	PKG_CHECK_MODULES(LIBXML, [libxml-2.0])
 	AC_DEFINE(HAVE_LIBXML, 1, [libxml-2.0 is available])
-	AC_CONFIG_LINKS([src/wayland.dtd.embed:protocol/wayland.dtd])
+	AC_CONFIG_LINKS([wayland.dtd.embed:protocol/wayland.dtd])
 fi
 
 AC_PATH_PROG(XSLTPROC, xsltproc)
diff --git a/src/.gitignore b/src/.gitignore
index 128e4f7..4421b46 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,2 +1 @@
-*.dtd.embed
 /wayland-version.h
diff --git a/src/dtddata.S b/src/dtddata.S
index ce51133..3fae312 100644
--- a/src/dtddata.S
+++ b/src/dtddata.S
@@ -44,4 +44,4 @@
 .endm
 
 .section .rodata
-binfile DTD_DATA src/wayland.dtd.embed
+binfile DTD_DATA wayland.dtd.embed
-- 
2.9.3