From 76b12b85af3ec5d870d8ac1cdc78430dfe2d415a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Tue, 14 Aug 2007 00:25:45 +0000 Subject: [PATCH] add ugly hack to make client link again git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19533 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ISpell.cpp | 4 ++-- src/client/Makefile.am | 30 +++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/ISpell.cpp b/src/ISpell.cpp index 73ee01cd1f..c0cfe5e441 100644 --- a/src/ISpell.cpp +++ b/src/ISpell.cpp @@ -220,7 +220,7 @@ docstring const from_iconv_encoding(string const & s, string const & encoding) ISpell::ISpell(BufferParams const & params, string const & lang) : in(0), out(0), inerr(0), str(0) { - LYXERR(Debug::GUI) << "Created ispell" << endl; + //LYXERR(Debug::GUI) << "Created ispell" << endl; encoding = params.encoding().iconvName(); @@ -314,7 +314,7 @@ ISpell::ISpell(BufferParams const & params, string const & lang) ISpell::~ISpell() { - LYXERR(Debug::GUI) << "Killing ispell" << endl; + //LYXERR(Debug::GUI) << "Killing ispell" << endl; if (in) fclose(in); diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 896e24bdfa..e719282d0c 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -23,6 +23,24 @@ lyxclient_LDADD = \ $(top_builddir)/src/support/liblyxsupport.la \ $(BOOST_LIBS) $(INTLLIBS) @LIBS@ $(SOCKET_LIBS) $(QT4_LIB) $(AIKSAURUS_LIBS) +# everything below the line containing a single backslash and the +# spellchecker stuff is an ugly hack and needed because of the +# linking problems described in ../Makefile.am +# These four objects are linked as object files as they are not +# referenced within the core and therefore are not picked up +# by the linker without looping over libs. We do not want that, +# and in fact libtools seems not able to do that. + +if USE_ASPELL +ASPELL = ../ASpell.cpp ../ASpell_local.h +endif +if USE_PSPELL +PSPELL = ../PSpell.cpp ../PSpell.h +endif +if USE_ISPELL +ISPELL = ../ISpell.cpp ../ISpell.h +endif + lyxclient_SOURCES = \ boost.cpp \ client.cpp \ @@ -30,7 +48,17 @@ lyxclient_SOURCES = \ debug.h \ gettext.cpp \ Messages.cpp \ - Messages.h + Messages.h \ + \ + $(ASPELL) $(PSPELL) $(ISPELL) ../SpellBase.cpp \ + ../Box.cpp \ + ../Box.h \ + ../Dimension.cpp \ + ../Dimension.h \ + ../PrinterParams.cpp \ + ../PrinterParams.h \ + ../Thesaurus.cpp \ + ../Thesaurus.h lyxclient.1: cp -p $(srcdir)/lyxclient.man lyxclient.1 -- 2.39.5