Use Gtk::ComboBoxText::clear() instead of clear_items(), which only exists in newer...

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 74b22d8519fec3907351e954f539a1de49338c48..c5aa12b6ce833940c2ac0b5fa0b1f58952ff2098 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,14 +4,19 @@ DISTCLEANFILES += config.h libintl.h version.C stamp-version version.C-tmp
 
 MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
-SUBDIRS = mathed insets graphics support frontends . client tex2lyx
+if BUILD_CLIENT_SUBDIR
+CLIENT = client
+endif
+
+SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
 
 EXTRA_DIST = config.h.in stamp-h.in version.C.in \
        Sectioning.h \
        Sectioning.C \
        Variables.C \
        Variables.h \
-       paper.h
+       paper.h \
+       pch.h
 
 LYX_PRE_LIBS = mathed/libmathed.la insets/libinsets.la \
        frontends/libfrontends.la
@@ -20,9 +25,9 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
        graphics/libgraphics.la \
        support/libsupport.la
 
-BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS)
+BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM)
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
 
 bin_PROGRAMS = lyx
 noinst_PROGRAMS = $(FRONTENDS_PROGS)
@@ -47,9 +52,21 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS)
 
 #lyx_LDFLAGS=-Wl,-O1
 
-BUILT_SOURCES = version.C
+BUILT_SOURCES = $(PCH_FILE) version.C
+
+AM_CPPFLAGS += $(PCH_FLAGS) $(BOOST_INCLUDES)
+
+if USE_ASPELL
+ASPELL = aspell.C aspell_local.h
+endif
+if USE_PSPELL
+PSPELL = pspell.C pspell.h
+endif
+if USE_ISPELL
+ISPELL = ispell.C ispell.h
+endif
+
 
-AM_CPPFLAGS = $(PCH_FLAGS) $(BOOST_INCLUDES)
 
 lyx_SOURCES = \
        Bidi.C \
@@ -101,8 +118,6 @@ lyx_SOURCES = \
        ToolbarBackend.C \
        ToolbarBackend.h \
        WordLangTuple.h \
-       aspell.C \
-       aspell_local.h \
        author.C \
        author.h \
        boost.C \
@@ -241,11 +256,8 @@ lyx_SOURCES = \
        paragraph_pimpl.h \
        pariterator.C \
        pariterator.h \
+       $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.C \
        SpellBase.h \
-       ispell.C \
-       ispell.h \
-       pspell.C \
-       pspell.h \
        rowpainter.C \
        rowpainter.h \
        sgml.C \