drm: Branch 'master'

 tests/kmstest/Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 432e08de88a27313608cced27f133a65e8a56c52
Author: Emil Velikov <[email protected]>
Date:   Wed Jan 27 11:59:43 2016 +0000

    tests/kmstest: inverse the order of LDADD libraries
    
    The utils library depends on libdrm. Flip the order, orderwise we might
    error during link stage like below:
    
      CC       main.o
      CCLD     kmstest
    /usr/bin/ld: ../../tests/util/.libs/libutil.a(libutil_la-kms.o):
    undefined reference to symbol 'drmOpen'
    
    Reported-by: Tom Stellard <[email protected]>
    Tested-by: Tom Stellard <[email protected]>
    Signed-off-by: Emil Velikov <[email protected]>

diff --git a/tests/kmstest/Makefile.am b/tests/kmstest/Makefile.am
index 100662e..ced541b 100644
--- a/tests/kmstest/Makefile.am
+++ b/tests/kmstest/Makefile.am
@@ -17,9 +17,9 @@ kmstest_SOURCES = \
 	main.c
 
 kmstest_LDADD = \
-	$(top_builddir)/libdrm.la \
+	$(top_builddir)/tests/util/libutil.la \
 	$(top_builddir)/libkms/libkms.la \
-	$(top_builddir)/tests/util/libutil.la
+	$(top_builddir)/libdrm.la
 
 run: kmstest
 	./kmstest

------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
--