fix crash when collapsing ert with cursor inside

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index bac6639a517f2c846679813da0dbe73ba243da04..6b556d44d14584a76323fbc43671321c174f1f10 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,11 @@ 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 \
@@ -20,7 +24,7 @@ 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@
 
@@ -51,6 +55,18 @@ BUILT_SOURCES = 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
+
+
+
 lyx_SOURCES = \
        Bidi.C \
        Bidi.h \
@@ -101,8 +117,6 @@ lyx_SOURCES = \
        ToolbarBackend.C \
        ToolbarBackend.h \
        WordLangTuple.h \
-       aspell.C \
-       aspell_local.h \
        author.C \
        author.h \
        boost.C \
@@ -241,11 +255,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 \
@@ -277,22 +288,6 @@ lyx_SOURCES = \
        vspace.C \
        vspace.h
 
-dist_noinst_DATA = \
-       cheaders/ChangeLog \
-       cheaders/cassert \
-       cheaders/cctype \
-       cheaders/cerrno \
-       cheaders/climits \
-       cheaders/clocale \
-       cheaders/cmath \
-       cheaders/csignal \
-       cheaders/cstdarg \
-       cheaders/cstddef \
-       cheaders/cstdio \
-       cheaders/cstdlib \
-       cheaders/cstring \
-       cheaders/ctime
-
 version.C: stamp-version
        @: