|
 |
973c76f |
From b207060d767d908eb4b70607f280d67854a4f161 Mon Sep 17 00:00:00 2001
|
|
|
15e2ab3 |
From: Daniel Stone <daniel@fooishbar.org>
|
|
|
15e2ab3 |
Date: Wed, 7 Nov 2012 17:15:13 +1100
|
|
|
973c76f |
Subject: [PATCH 20/39] XWayland: Don't hardcode DRM libs and -lwayland-client
|
|
|
15e2ab3 |
|
|
|
15e2ab3 |
Take -lwayland-client from configure.ac, and only use DRM if we've
|
|
|
15e2ab3 |
actually asked for it.
|
|
|
15e2ab3 |
|
|
|
15e2ab3 |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
15e2ab3 |
---
|
|
|
15e2ab3 |
hw/xfree86/xwayland/Makefile.am | 8 +++++---
|
|
|
15e2ab3 |
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
15e2ab3 |
|
|
|
15e2ab3 |
diff --git a/hw/xfree86/xwayland/Makefile.am b/hw/xfree86/xwayland/Makefile.am
|
|
|
15e2ab3 |
index b739145..22ab154 100644
|
|
|
15e2ab3 |
--- a/hw/xfree86/xwayland/Makefile.am
|
|
|
15e2ab3 |
+++ b/hw/xfree86/xwayland/Makefile.am
|
|
|
15e2ab3 |
@@ -7,13 +7,13 @@ AM_CPPFLAGS = \
|
|
|
15e2ab3 |
-I$(srcdir)/../modes
|
|
|
15e2ab3 |
|
|
|
15e2ab3 |
libxwayland_la_LTLIBRARIES = libxwayland.la
|
|
|
15e2ab3 |
-libxwayland_la_CFLAGS = \
|
|
|
15e2ab3 |
+AM_CFLAGS = \
|
|
|
15e2ab3 |
-DHAVE_XORG_CONFIG_H \
|
|
|
15e2ab3 |
- @DIX_CFLAGS@ @XORG_CFLAGS@ @LIBDRM_CFLAGS@ \
|
|
|
15e2ab3 |
+ @DIX_CFLAGS@ @XORG_CFLAGS@ @XWAYLAND_CFLAGS@ \
|
|
|
15e2ab3 |
-I$(top_srcdir)/hw/xfree86/common \
|
|
|
15e2ab3 |
-I$(top_srcdir)/hw/xfree86/os-support/bus
|
|
|
15e2ab3 |
|
|
|
15e2ab3 |
-libxwayland_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@ -lwayland-client
|
|
|
15e2ab3 |
+libxwayland_la_LDFLAGS = -module -avoid-version @XWAYLAND_LIBS@
|
|
|
15e2ab3 |
libxwayland_ladir = $(moduledir)/extensions
|
|
|
15e2ab3 |
libxwayland_la_SOURCES = \
|
|
|
15e2ab3 |
xwayland.c \
|
|
|
15e2ab3 |
@@ -28,6 +28,8 @@ libxwayland_la_SOURCES = \
|
|
|
15e2ab3 |
xserver-protocol.c
|
|
|
15e2ab3 |
|
|
|
15e2ab3 |
if DRM
|
|
|
15e2ab3 |
+AM_CFLAGS += @LIBDRM_CFLAGS@
|
|
|
15e2ab3 |
+libxwayland_la_LDFLAGS += @LIBDRM_LIBS@
|
|
|
15e2ab3 |
libxwayland_la_SOURCES += xwayland-drm.c
|
|
|
15e2ab3 |
endif
|
|
|
15e2ab3 |
|
|
|
15e2ab3 |
--
|
|
|
15e2ab3 |
1.8.3.1
|
|
|
15e2ab3 |
|