xserver: Branch 'master'

[Peter Hutterer]

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

New commits:
commit 23dc4678e9333ba0ee1a5374521905fa3f4f309c
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Sep 14 14:14:27 2009 +1000

    dmx: use top_builddir, not top_srcdir to get libxfixes.la
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Tested-by: Byeong-ryeol Kim <brofkims at gmail.com>

diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 095c542..b31fbb8 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -87,7 +87,7 @@ XDMX_LIBS = \
         config/libdmxconfig.a \
 	$(MAIN_LIB) \
 	$(XSERVER_LIBS) \
-	$(top_srcdir)/xfixes/libxfixes.la
+	$(top_builddir)/xfixes/libxfixes.la
 
 Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 Xdmx_DEPENDENCIES= $(XDMX_LIBS)