Fix layout bug. Pasting text into a cell tried to set Standard layout, because

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 005acf0209084db64ad03dbe229b66c477657637..88b1e11e4911978f29f01e3483b3e3841dc3ab09 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,14 +4,15 @@ include $(top_srcdir)/config/common.am
 
 DISTCLEANFILES += config.h libintl.h
 
-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 \
+EXTRA_DIST = Section.h \
        Section.cpp \
        Variables.cpp \
        Variables.h \
@@ -61,10 +62,10 @@ endif
 lyx_SOURCES = \
        main.cpp \
        $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
+       BiblioInfo.h \
+       BiblioInfo.cpp \
        Box.cpp \
        Box.h \
-       MenuBackend.cpp \
-       MenuBackend.h \
        Dimension.cpp \
        Dimension.h \
        PrinterParams.cpp \
@@ -78,8 +79,6 @@ endif
 
 SOURCEFILESCORE = \
        Author.cpp \
-       BaseClassList.cpp \
-       BiblioInfo.cpp \
        Bidi.cpp \
        boost.cpp \
        BranchList.cpp \
@@ -102,7 +101,6 @@ SOURCEFILESCORE = \
        CutAndPaste.cpp \
        DepTable.cpp \
        DocIterator.cpp \
-       EmbeddedFiles.cpp \
        Encoding.cpp \
        ErrorList.cpp \
        Exporter.cpp \
@@ -110,7 +108,6 @@ SOURCEFILESCORE = \
        Floating.cpp \
        FloatList.cpp \
        FontInfo.cpp \
-       FontIterator.cpp \
        FontList.cpp \
        Font.cpp \
        Format.cpp \
@@ -125,6 +122,7 @@ SOURCEFILESCORE = \
        Language.cpp \
        LaTeX.cpp \
        LaTeXFeatures.cpp \
+       LayoutFile.cpp \
        Length.cpp \
        lengthcommon.cpp \
        Lexer.cpp \
@@ -163,7 +161,6 @@ SOURCEFILESCORE = \
        TextClass.cpp \
        TextMetrics.cpp \
        TocBackend.cpp \
-       ToolbarBackend.cpp \
        Trans.cpp \
        Undo.cpp \
        VCBackend.cpp \
@@ -173,8 +170,6 @@ SOURCEFILESCORE = \
 
 HEADERFILESCORE = \
        Author.h \
-       BaseClassList.h \
-       BiblioInfo.h \
        Bidi.h \
        BranchList.h \
        buffer_funcs.h \
@@ -183,12 +178,13 @@ HEADERFILESCORE = \
        BufferParams.h \
        BufferView.h \
        Bullet.h \
+       Citation.h \
        Changes.h \
        Chktex.h \
        CmdDef.h \
        ColorCode.h \
        Color.h \
-       config.h.in \
+       CompletionList.h \
        ConverterCache.h \
        Converter.h \
        CoordCache.h \
@@ -199,7 +195,6 @@ HEADERFILESCORE = \
        DepTable.h \
        DispatchResult.h \
        DocIterator.h \
-       EmbeddedFiles.h \
        Encoding.h \
        ErrorList.h \
        Exporter.h \
@@ -209,9 +204,9 @@ HEADERFILESCORE = \
        Font.h \
        FontEnums.h \
        FontInfo.h \
-       FontIterator.h \
        FontList.h \
        Format.h \
+       FuncCode.h \
        FuncRequest.h \
        FuncStatus.h \
        Graph.h \
@@ -224,11 +219,10 @@ 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 \
@@ -265,7 +259,6 @@ HEADERFILESCORE = \
        TextClass.h \
        TextMetrics.h \
        TocBackend.h \
-       ToolbarBackend.h \
        Trans.h \
        Undo.h \
        update_flags.h \
@@ -313,7 +306,6 @@ liblyxgraphics_la_SOURCES = \
        graphics/GraphicsParams.cpp \
        graphics/GraphicsParams.h \
        graphics/GraphicsTypes.h \
-       graphics/GraphicsTypes.cpp \
        graphics/PreviewImage.h \
        graphics/PreviewImage.cpp \
        graphics/PreviewLoader.h \
@@ -332,7 +324,6 @@ SOURCEFILESMATHED = \
        mathed/InsetMathAMSArray.cpp \
        mathed/InsetMathArray.cpp \
        mathed/InsetMathBig.cpp \
-       mathed/InsetMathBM.cpp \
        mathed/InsetMathBoldSymbol.cpp \
        mathed/InsetMathBox.cpp \
        mathed/InsetMathBrace.cpp \
@@ -398,7 +389,6 @@ HEADERFILESMATHED = \
        mathed/InsetMathAMSArray.h \
        mathed/InsetMathArray.h \
        mathed/InsetMathBig.h \
-       mathed/InsetMathBM.h \
        mathed/InsetMathBoldSymbol.h \
        mathed/InsetMathBox.h \
        mathed/InsetMathBrace.h \
@@ -448,6 +438,7 @@ HEADERFILESMATHED = \
        mathed/MathAtom.h \
        mathed/MathAutoCorrect.h \
        mathed/MathData.h \
+       mathed/MathCompletionList.h \
        mathed/MathExtern.h \
        mathed/MathFactory.h \
        mathed/MathGridInfo.h \
@@ -481,7 +472,6 @@ endif
 noinst_LTLIBRARIES += liblyxinsets.la
 
 SOURCEFILESINSETS = \
-       insets/MailInset.cpp \
        insets/ExternalSupport.cpp \
        insets/ExternalTemplate.cpp \
        insets/ExternalTransforms.cpp \
@@ -498,7 +488,6 @@ SOURCEFILESINSETS = \
        insets/InsetCollapsable.cpp \
        insets/InsetCommand.cpp \
        insets/InsetCommandParams.cpp \
-       insets/InsetEnvironment.cpp \
        insets/InsetERT.cpp \
        insets/InsetExternal.cpp \
        insets/InsetFlex.cpp \
@@ -508,7 +497,6 @@ SOURCEFILESINSETS = \
        insets/InsetFootlike.cpp \
        insets/InsetGraphicsParams.cpp \
        insets/InsetGraphics.cpp \
-       insets/InsetHFill.cpp \
        insets/InsetHyperlink.cpp \
        insets/InsetInclude.cpp \
        insets/InsetIndex.cpp \
@@ -535,7 +523,6 @@ SOURCEFILESINSETS = \
        insets/InsetWrap.cpp
 
 HEADERFILESINSETS = \
-       insets/MailInset.h \
        insets/ExternalSupport.h \
        insets/ExternalTemplate.h \
        insets/ExternalTransforms.h \
@@ -555,7 +542,6 @@ HEADERFILESINSETS = \
        insets/InsetCommand.h \
        insets/InsetCommandParams.h \
        insets/InsetERT.h \
-       insets/InsetEnvironment.h \
        insets/InsetExternal.h \
        insets/InsetFlex.h \
        insets/InsetFloat.h \
@@ -564,7 +550,6 @@ HEADERFILESINSETS = \
        insets/InsetFootlike.h \
        insets/InsetGraphicsParams.h \
        insets/InsetGraphics.h \
-       insets/InsetHFill.h \
        insets/InsetHyperlink.h \
        insets/InsetInclude.h \
        insets/InsetIndex.h \