xserver: Branch 'master'

[Keith Packard]

 hw/xwayland/Makefile.am |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 3573855514557a518de40a93b3c578f28c7d9c2b
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Wed Dec 3 13:49:37 2014 +0100

    Remove explicit dependency on $(WAYLAND_LIBS)
    
    Xwayland Makefile explicitely set its dependencies on
    WAYLAND_LIBS. If the ibrairies are installed in a non-standard
    path, WAYLAND_LIBS contains '-L/path/to/the/lib' which will fail
    at build time with:
    
    "No rule to make target '-L/path/to/the/lib', needed by 'Xwayland'.
     Stop"
    
    Remove that explicit dependency to avoid the problem (LDADD ought
    to be enough to get the right libraries linked).
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
index 4e0e1bb..9945540 100644
--- a/hw/xwayland/Makefile.am
+++ b/hw/xwayland/Makefile.am
@@ -26,7 +26,6 @@ Xwayland_LDADD =				\
 	$(XWAYLAND_LIBS)			\
 	$(XWAYLAND_SYS_LIBS)			\
 	$(XSERVER_SYS_LIBS)
-Xwayland_DEPENDENCIES = $(XWAYLAND_LIBS)
 Xwayland_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)