Fix the rest of bug 5010.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f19da7cfa6efe329037e935b5b23468c438fbe4e..297a296e0edc6e86c4a375bd4d47d1c139abb9eb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,11 @@ MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
 
-SUBDIRS = support frontends .
+if BUILD_CLIENT_SUBDIR
+CLIENT = client
+endif
+
+SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
 EXTRA_DIST = config.h.in \
        Section.h \
@@ -18,7 +22,7 @@ EXTRA_DIST = config.h.in \
        paper.h \
        pch.h
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
 
 noinst_LTLIBRARIES = liblyxcore.la
 bin_PROGRAMS = lyx
@@ -61,6 +65,8 @@ endif
 lyx_SOURCES = \
        main.cpp \
        $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
+       BiblioInfo.h \
+       BiblioInfo.cpp \
        Box.cpp \
        Box.h \
        Dimension.cpp \
@@ -76,7 +82,6 @@ endif
 
 SOURCEFILESCORE = \
        Author.cpp \
-       BiblioInfo.cpp \
        Bidi.cpp \
        boost.cpp \
        BranchList.cpp \
@@ -99,7 +104,6 @@ SOURCEFILESCORE = \
        CutAndPaste.cpp \
        DepTable.cpp \
        DocIterator.cpp \
-       EmbeddedFiles.cpp \
        Encoding.cpp \
        ErrorList.cpp \
        Exporter.cpp \
@@ -107,7 +111,6 @@ SOURCEFILESCORE = \
        Floating.cpp \
        FloatList.cpp \
        FontInfo.cpp \
-       FontIterator.cpp \
        FontList.cpp \
        Font.cpp \
        Format.cpp \
@@ -122,15 +125,16 @@ SOURCEFILESCORE = \
        Language.cpp \
        LaTeX.cpp \
        LaTeXFeatures.cpp \
+       LayoutFile.cpp \
        Length.cpp \
        lengthcommon.cpp \
        Lexer.cpp \
        LyX.cpp \
+       LyXAction.cpp \
        lyxfind.cpp \
        LyXFunc.cpp \
        LyXRC.cpp \
        LyXVC.cpp \
-       MenuBackend.cpp \
        MetricsInfo.cpp \
        ModuleList.cpp \
        Mover.cpp \
@@ -141,6 +145,7 @@ SOURCEFILESCORE = \
        output_plaintext.cpp \
        Paragraph.cpp \
        paragraph_funcs.cpp \
+       ParagraphMetrics.cpp \
        ParagraphParameters.cpp \
        ParIterator.cpp \
        PDFOptions.cpp \
@@ -156,21 +161,18 @@ SOURCEFILESCORE = \
        Text2.cpp \
        Text3.cpp \
        TexStream.cpp \
-       TextClassList.cpp \
+       TextClass.cpp \
        TextMetrics.cpp \
        TocBackend.cpp \
-       ToolbarBackend.cpp \
        Trans.cpp \
        Undo.cpp \
        VCBackend.cpp \
        version.cpp \
        VSpace.cpp \
-       ParagraphMetrics.cpp \
-       LyXAction.cpp
+       WordList.cpp
 
 HEADERFILESCORE = \
        Author.h \
-       BiblioInfo.h \
        Bidi.h \
        BranchList.h \
        buffer_funcs.h \
@@ -179,11 +181,13 @@ HEADERFILESCORE = \
        BufferParams.h \
        BufferView.h \
        Bullet.h \
+       Citation.h \
        Changes.h \
        Chktex.h \
        CmdDef.h \
        ColorCode.h \
        Color.h \
+       CompletionList.h \
        config.h.in \
        ConverterCache.h \
        Converter.h \
@@ -195,7 +199,6 @@ HEADERFILESCORE = \
        DepTable.h \
        DispatchResult.h \
        DocIterator.h \
-       EmbeddedFiles.h \
        Encoding.h \
        ErrorList.h \
        Exporter.h \
@@ -205,9 +208,9 @@ HEADERFILESCORE = \
        Font.h \
        FontEnums.h \
        FontInfo.h \
-       FontIterator.h \
        FontList.h \
        Format.h \
+       FuncCode.h \
        FuncRequest.h \
        FuncStatus.h \
        Graph.h \
@@ -220,18 +223,16 @@ HEADERFILESCORE = \
        LaTeXFeatures.h \
        LaTeX.h \
        Layout.h \
-       LayoutPtr.h \
        LayoutEnums.h \
+       LayoutFile.h \
        Length.h \
        Lexer.h \
-       lfuns.h \
        LyXAction.h \
        lyxfind.h \
        LyXFunc.h \
        LyX.h \
        LyXRC.h \
        LyXVC.h \
-       MenuBackend.h \
        MetricsInfo.h \
        ModuleList.h \
        Mover.h \
@@ -260,28 +261,26 @@ HEADERFILESCORE = \
        TexStream.h \
        Text.h \
        TextClass.h \
-       TextClassList.h \
-       TextClassPtr.h \
        TextMetrics.h \
        TocBackend.h \
-       ToolbarBackend.h \
        Trans.h \
        Undo.h \
        update_flags.h \
        VCBackend.h \
        version.h \
+       VSpace.h \
        WordLangTuple.h \
-       VSpace.h
+       WordList.h
 
 STANDALONEFILES = \
-       Layout.cpp \
-       TextClass.cpp
+       Layout.cpp
 
-if MONOLITHIC_CORE
 
 lyxcore.cpp:
        @echo -e '$(SOURCEFILESCORE:%=\n#include "%")\n' > $@
 
+if MONOLITHIC_CORE
+
 BUILT_SOURCES += lyxcore.cpp $(STANDALONEFILES)
 CLEANFILES += lyxcore.cpp
 
@@ -444,6 +443,7 @@ HEADERFILESMATHED = \
        mathed/MathAtom.h \
        mathed/MathAutoCorrect.h \
        mathed/MathData.h \
+       mathed/MathCompletionList.h \
        mathed/MathExtern.h \
        mathed/MathFactory.h \
        mathed/MathGridInfo.h \
@@ -456,11 +456,11 @@ HEADERFILESMATHED = \
        mathed/MathSupport.h \
        mathed/TextPainter.h 
 
-if MONOLITHIC_MATHED
-
 lyxmathed.cpp:
        @echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@
 
+if MONOLITHIC_MATHED
+
 BUILT_SOURCES += lyxmathed.cpp
 CLEANFILES += lyxmathed.cpp
 
@@ -476,12 +476,7 @@ endif
 
 noinst_LTLIBRARIES += liblyxinsets.la
 
-EXTRA_DIST += \
-       insets/InsetTheorem.cpp \
-       insets/InsetTheorem.h
-
 SOURCEFILESINSETS = \
-       insets/MailInset.cpp \
        insets/ExternalSupport.cpp \
        insets/ExternalTemplate.cpp \
        insets/ExternalTransforms.cpp \
@@ -498,7 +493,6 @@ SOURCEFILESINSETS = \
        insets/InsetCollapsable.cpp \
        insets/InsetCommand.cpp \
        insets/InsetCommandParams.cpp \
-       insets/InsetEnvironment.cpp \
        insets/InsetERT.cpp \
        insets/InsetExternal.cpp \
        insets/InsetFlex.cpp \
@@ -508,12 +502,12 @@ SOURCEFILESINSETS = \
        insets/InsetFootlike.cpp \
        insets/InsetGraphicsParams.cpp \
        insets/InsetGraphics.cpp \
-       insets/InsetHFill.cpp \
        insets/InsetHyperlink.cpp \
        insets/InsetInclude.cpp \
        insets/InsetIndex.cpp \
        insets/InsetInfo.cpp \
        insets/InsetLabel.cpp \
+       insets/InsetLayout.cpp \
        insets/InsetLine.cpp \
        insets/InsetListings.cpp \
        insets/InsetListingsParams.cpp \
@@ -534,7 +528,6 @@ SOURCEFILESINSETS = \
        insets/InsetWrap.cpp
 
 HEADERFILESINSETS = \
-       insets/MailInset.h \
        insets/ExternalSupport.h \
        insets/ExternalTemplate.h \
        insets/ExternalTransforms.h \
@@ -554,7 +547,6 @@ HEADERFILESINSETS = \
        insets/InsetCommand.h \
        insets/InsetCommandParams.h \
        insets/InsetERT.h \
-       insets/InsetEnvironment.h \
        insets/InsetExternal.h \
        insets/InsetFlex.h \
        insets/InsetFloat.h \
@@ -563,7 +555,6 @@ HEADERFILESINSETS = \
        insets/InsetFootlike.h \
        insets/InsetGraphicsParams.h \
        insets/InsetGraphics.h \
-       insets/InsetHFill.h \
        insets/InsetHyperlink.h \
        insets/InsetInclude.h \
        insets/InsetIndex.h \
@@ -592,15 +583,13 @@ HEADERFILESINSETS = \
 #      insets/InsetList.cpp \
 #      insets/InsetList.h \
 #      insets/InsetSection.h \
-#      insets/InsetSection.cpp \
-#      insets/InsetTheorem.cpp \
-#      insets/InsetTheorem.h
-
-if MONOLITHIC_INSETS
+#      insets/InsetSection.cpp
 
 lyxinsets.cpp:
        @echo -e '$(SOURCEFILESINSETS:%=\n#include "%")\n' > $@
 
+if MONOLITHIC_INSETS
+
 BUILT_SOURCES += lyxinsets.cpp
 CLEANFILES += lyxinsets.cpp