From ba0f5cc1961bfcfb5e7d66ac5df19d429952631d Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Mon, 9 Jan 2012 00:14:29 -0800 Subject: [PATCH] xfree86: Don't link libxorgxkb against libdix.la 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 --- hw/xfree86/dixmods/Makefile.am | 1 - 1 file changed, 1 deletion(-) 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