diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2012-01-09 00:14:29 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-01-15 02:28:27 -0800 |
| commit | ba0f5cc1961bfcfb5e7d66ac5df19d429952631d (patch) | |
| tree | 70d2f7ec0d98115f751adf77fbe824f6804e4913 | |
| parent | 2387fb23858d645f15061bc7bcbe4654386ba116 (diff) | |
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 <jeremyhu@apple.com>
| -rw-r--r-- | 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 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 |