xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit b355e55f500c18d55d0ac241e5f7e826ed62f555
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Wed Mar 28 12:17:48 2018 +0200

    automake: Fix 'make dist'
    
    Automake would skip a few meson files that would prevent to build with
    meson a dist file previously generated by automake.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Thierry Reding <treding at nvidia.com>

diff --git a/Makefile.am b/Makefile.am
index 5ddfd5b84..32d4d21e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,6 +140,7 @@ distcheck-hook:
 EXTRA_DIST += \
 	meson_options.txt \
 	include/xorg-config.h.meson.in \
+	include/xwin-config.h.meson.in \
 	hw/xfree86/loader/symbol-test.c \
 	hw/xfree86/common/xf86Build.sh \
 	composite/meson.build \
@@ -204,8 +205,10 @@ EXTRA_DIST += \
 	record/meson.build \
 	render/meson.build \
 	test/bigreq/meson.build \
+	test/bigreq/request-length.c \
 	test/meson.build \
 	test/sync/meson.build \
+	test/sync/sync.c \
 	Xext/meson.build \
 	xfixes/meson.build \
 	Xi/meson.build \