xserver: Branch 'master'

[Adam Jackson]

 test/Makefile.am |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b1a6986395f85b0194646a34b49367086dc9239d
Author: Martin Peres <martin.peres at linux.intel.com>
Date:   Wed Jan 25 17:29:15 2017 +0200

    tests: shuffle around the linking order to please GNU ld
    
    Classic GNU ld resolves symbol dependencies only forward, while GOLD
    seems to work regardless of the specified library order.
    
    Suggested-by: Eero Tamminen <eero.t.tamminen at intel.com>
    Reviewed-by: Mihail Konev <k.mvc at ya.ru>
    Signed-off-by: Martin Peres <martin.peres at linux.intel.com>

diff --git a/test/Makefile.am b/test/Makefile.am
index 111b607..e7fe587 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -64,7 +64,7 @@ tests_LDFLAGS = \
 	-Wl,-wrap,GrabButton \
 	$()
 
-tests_LDADD = $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS)
+tests_LDADD =
 
 tests_SOURCES = \
         tests-common.c \
@@ -225,6 +225,10 @@ endif
 
 endif !XORG
 
+# GNU LD scans only in one direction, add the following dependencies at the end
+# so as they get picked up by the previously-linked libraries
+tests_LDADD += $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS)
+
 endif ENABLE_UNIT_TESTS
 
 EXTRA_DIST = \