| author | Jeremy Huddleston <jeremyhu@apple.com> | 2012-01-09 08:14:29 (GMT) |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-01-09 09:18:22 (GMT) |
| commit | 6152332ac89ebb49190431180a8a4e84deb1118f (patch) (side-by-side diff) | |
| tree | e663e4ab484301c8391a9e7e22027acc16a952fa | |
| parent | 65469ffc1fbdeeb0d93271977d07df3a38b5c2c3 (diff) | |
| download | xserver-darwin-xfree86.zip xserver-darwin-xfree86.tar.gz | |
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.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 |