xserver: Branch 'master'

[Adam Jackson]

 test/Makefile.am |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 6f531b0cdf8c9d7f711dd46071a26c50db3f1a16
Author: Mihail Konev <k.mvc at ya.ru>
Date:   Sat Jan 14 12:51:45 2017 +0500

    tests: Fix typo
    
    Remove redundrant/incorrect automake assignment.
    
    Buglink: https://lists.x.org/archives/xorg-devel/2017-January/052320.html
    Reported-by: Michel Dänzer <michel at daenzer.net>
    Signed-off-by: Mihail Konev <k.mvc at ya.ru>
    Reviewed-by: Jon Turney <jon.turney at dronecode.org.uk>

diff --git a/test/Makefile.am b/test/Makefile.am
index e1b341c..111b607 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -225,7 +225,6 @@ endif
 
 endif !XORG
 
-tests_DEPENDENCIES = $(tests_LDADD)
 endif ENABLE_UNIT_TESTS
 
 EXTRA_DIST = \