Allows editing when the Prefs dialog is opened; fix bug 3140:

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7a9aa96eec4c2c6a5877833e4a4a0320a07da1d0..247d37b6a3686577367a5ddb3ade20ed43b3bd57 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 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,31 +25,17 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
        graphics/libgraphics.la \
        support/libsupport.la
 
-if USE_INCLUDED_BOOST
-BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
-       ../boost/libs/signals/src/libboostsignals.la
-else
-BOOST_LIBS = -lboost_regex -lboost_signals
-endif
+BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM) $(BOOST_IOSTREAMS)
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@
+OTHERLIBS = $(BOOST_LIBS) $(LIBICONV) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
 
 bin_PROGRAMS = lyx
 noinst_PROGRAMS = $(FRONTENDS_PROGS)
-EXTRA_PROGRAMS = lyx-xforms lyx-qt lyx-gtk
-
-lyx_xforms_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
-       frontends/xforms/libxforms.la $(LYX_POST_LIBS) $(OTHERLIBS)
-
-lyx_xforms_SOURCES = main.C
-
-lyx_qt_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
-       frontends/qt2/libqt2.la $(LYX_POST_LIBS) $(OTHERLIBS)
-lyx_qt_SOURCES = main.C
+EXTRA_PROGRAMS = lyx-qt4
 
-lyx_gtk_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
-       frontends/gtk/libgtk.la $(LYX_POST_LIBS) $(OTHERLIBS)
-lyx_gtk_SOURCES = main.C
+lyx_qt4_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
+       frontends/qt4/libqt4.la $(LYX_POST_LIBS) $(OTHERLIBS)
+lyx_qt4_SOURCES = main.C
 
 lyx$(EXEEXT): $(FRONTENDS_PROGS)
        rm -f $@
@@ -52,23 +43,37 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS)
 
 #lyx_LDFLAGS=-Wl,-O1
 
-INCLUDES = $(BOOST_INCLUDES)
+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
+
 
-BUILT_SOURCES = version.C
 
 lyx_SOURCES = \
        Bidi.C \
        Bidi.h \
        BufferView.C \
        BufferView.h \
-       BufferView_pimpl.C \
-       BufferView_pimpl.h \
        Bullet.C \
        Bullet.h \
        BranchList.C \
        BranchList.h \
        Chktex.C \
        Chktex.h \
+       Color.C \
+       Color.h \
+       ConverterCache.C \
+       ConverterCache.h \
        CutAndPaste.C \
        CutAndPaste.h \
        DepTable.C \
@@ -93,28 +98,26 @@ lyx_SOURCES = \
        LyXAction.h \
        MenuBackend.C \
        MenuBackend.h \
+       ParagraphList.h \
        ParagraphList_fwd.h \
        ParagraphParameters.C \
        ParagraphParameters.h \
        PrinterParams.C \
        PrinterParams.h \
        RowList_fwd.h \
-       ShareContainer.h \
        Spacing.C \
        Spacing.h \
        Thesaurus.C \
        Thesaurus.h \
        ToolbarBackend.C \
        ToolbarBackend.h \
+       UpdateFlags.h \
        WordLangTuple.h \
-       aspell.C \
-       aspell_local.h \
        author.C \
        author.h \
        boost.C \
        box.h \
        box.C \
-       broken_headers.h \
        buffer.C \
        buffer.h \
        buffer_funcs.C \
@@ -175,8 +178,8 @@ lyx_SOURCES = \
        kbsequence.h \
        language.C \
        language.h \
-       lastfiles.C \
-       lastfiles.h \
+       session.C \
+       session.h \
        layout.h \
        lengthcommon.C \
        lengthcommon.h \
@@ -208,8 +211,6 @@ lyx_SOURCES = \
        lyxrc.h \
        lyxrow.C \
        lyxrow.h \
-       lyxrow_funcs.C \
-       lyxrow_funcs.h \
        lyxserver.C \
        lyxserver.h \
        lyxsocket.C \
@@ -225,6 +226,8 @@ lyx_SOURCES = \
        messages.h \
        metricsinfo.C \
        metricsinfo.h \
+       mover.C \
+       mover.h \
        output.C \
        output.h \
        outputparams.C \
@@ -233,24 +236,21 @@ lyx_SOURCES = \
        output_docbook.h \
        output_latex.C \
        output_latex.h \
-       output_linuxdoc.C \
-       output_linuxdoc.h \
        output_plaintext.C \
        output_plaintext.h \
        paper.h \
        paragraph.C \
        paragraph.h \
+       ParagraphMetrics.C \
+       ParagraphMetrics.h \
        paragraph_funcs.C \
        paragraph_funcs.h \
        paragraph_pimpl.C \
        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 \
@@ -266,6 +266,10 @@ lyx_SOURCES = \
        text.C \
        text2.C \
        text3.C \
+       TextMetrics.C \
+       TextMetrics.h \
+       TocBackend.C \
+       TocBackend.h \
        toc.C \
        toc.h \
        trans.C \
@@ -282,22 +286,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
        @: