xserver: Branch 'master'

[Adam Jackson]

 test/Makefile.am |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 646bc74cded8b77d57312ae858a2ed01b0d17c21
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Mar 3 14:51:51 2017 -0500

    test: Fix distcheck failures
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/test/Makefile.am b/test/Makefile.am
index cb37cc9..b9c8fb3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,9 +8,11 @@ CLEANFILES=
 
 tests_SOURCES = \
         tests-common.c \
+	tests-common.h \
         list.c \
         string.c \
-        tests.c
+        tests.c \
+	tests.h
 
 noinst_PROGRAMS = simple-xinit tests
 
@@ -92,7 +94,8 @@ tests_SOURCES += \
 	xi2/protocol-xipassivegrabdevice.c \
 	xi2/protocol-xiwarppointer.c \
 	xi2/protocol-eventconvert.c \
-	xi2/xi2.c
+	xi2/xi2.c \
+	xi2/protocol-common.h
 
 tests_LDFLAGS = \
 	-Wl,-wrap,dixLookupWindow \