[PATCH xserver resend 1/2] xfree86: Don't link libxorgxkb against libdix.la
Jeremy Huddleston
jeremyhu at apple.com
Fri Jan 13 13:43:00 PST 2012
libdix.a is already provided by XSERVER_LIBS. Including it in libxorgxkb
results can result in duplicate symbols landing in the Xorg binary on some
configurations (buggy glibtool on darwin).
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
hw/xfree86/dixmods/Makefile.am | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index b6eb54f..a5be3ae 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -65,4 +65,3 @@ libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
-libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la
--
1.7.7.4
More information about the xorg-devel
mailing list