xserver: Branch 'master'

[GitLab Mirror]

 include/Makefile.am |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 82ed89c0f8b18d8214430580dc80c8d3e37bef33
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Nov 29 14:48:11 2018 -0500

    automake: Distribute meson's configure header templates
    
    Fixes: xorg/xserver#17

diff --git a/include/Makefile.am b/include/Makefile.am
index 0ce7faa6e..9c22ce113 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -79,5 +79,8 @@ EXTRA_DIST = 	\
 	swapreq.h \
 	systemd-logind.h \
         vidmodestr.h \
+	xorg-config.h.meson.in \
 	xorg-server.h.meson.in \
+	xwayland-config.h.meson.in \
+	xwin-config.h.meson.in \
 	xsha1.h