xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 3ef16dfb9830bd6b41ae428f4f213ae0c35c1056
Author: Mihail Konev <k.mvc at ya.ru>
Date:   Sat Feb 4 00:03:24 2017 +0500

    dmx: fix linking
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index eef84cb..38d6ac4 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -80,7 +80,8 @@ XDMX_LIBS = \
 
 Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 Xdmx_DEPENDENCIES= $(XDMX_LIBS)
-Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS)
+Xdmx_LDADD = $(XDMX_LIBS) $(XDMX_SYS_LIBS) $(XSERVER_SYS_LIBS) \
+             $(top_builddir)/render/librender.la
 
 relink:
 	$(AM_V_at)rm -f Xdmx$(EXEEXT) && $(MAKE) Xdmx$(EXEEXT)