summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>2009-10-15 01:53:42 -0500
committerPeter Hutterer <peter.hutterer@who-t.net>2009-10-19 11:20:16 +1000
commit64faf44f36b09780737c06781dadcf8fcbcaf836 (patch)
treea8a0831986a834749f7afe0c17cca6e085a32678
parent4b419c1651bbe7fbd3e87c3d71ba9fe642672ca2 (diff)
Remove duplicates from Xfake_LDADD
KDRIVE_LIBS already contains the libs in XSERVER_LIBS, so linking against both leads to multiple-definition errors when linking on Cygwin. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit a2f27b97900f335cd5f6a3e5bf8fa1d0ec9eb9ac)
-rw-r--r--hw/kdrive/fake/Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am
index 8b93e9e2f..71b24b7e6 100644
--- a/hw/kdrive/fake/Makefile.am
+++ b/hw/kdrive/fake/Makefile.am
@@ -18,8 +18,7 @@ Xfake_SOURCES = \
Xfake_LDADD = \
libfake.la \
- @KDRIVE_LIBS@ \
- @XSERVER_LIBS@
+ @KDRIVE_LIBS@
Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -Wl,-undefined=InitExtensions