xserver: Branch 'master'

[Keith Packard]

 hw/dmx/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 780754050bc9cb1489f92a2a890ab5665e3e6358
Author: Cyril Brulebois <kibi at debian.org>
Date:   Fri Nov 12 12:18:59 2010 +0100

    Fix GLX_LIBS vs. DMX_LIBS order.
    
    If glxproxy needs symbols which aren't pulled in by dmx itself, glxproxy
    fails to link because of undefined references.
    
    Signed-off-by: Cyril Brulebois <kibi at debian.org>
    Reviewed-by: Julien Cristau <jcristau at debian.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 0d06346..5c16dc3 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -81,8 +81,8 @@ Xdmx_SOURCES = dmx.c \
 #endif
 
 XDMX_LIBS = \
-	@XDMX_LIBS@ \
 	$(GLX_LIBS) \
+	@XDMX_LIBS@ \
         input/libdmxinput.a \
         config/libdmxconfig.a