summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2012-01-09 00:14:29 -0800
committerJeremy Huddleston <jeremyhu@apple.com>2012-01-09 01:18:22 -0800
commit6152332ac89ebb49190431180a8a4e84deb1118f (patch)
treee663e4ab484301c8391a9e7e22027acc16a952fa
parent65469ffc1fbdeeb0d93271977d07df3a38b5c2c3 (diff)
xfree86: Don't link libxorgxkb against libdix.ladarwin-xfree86
libdix.a is already provided by XSERVER_LIBS. Including it in libxorgxkb results in duplicate symbols landing in the Xorg binary. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--hw/xfree86/dixmods/Makefile.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index b6eb54f16..a5be3ae00 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