do what the FIXME suggested

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f19da7cfa6efe329037e935b5b23468c438fbe4e..7fa7a260b3513e3f965d28ad1408c3b2d69fd189 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,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
@@ -76,6 +76,7 @@ endif
 
 SOURCEFILESCORE = \
        Author.cpp \
+       BaseClassList.cpp \
        BiblioInfo.cpp \
        Bidi.cpp \
        boost.cpp \
@@ -126,6 +127,7 @@ SOURCEFILESCORE = \
        lengthcommon.cpp \
        Lexer.cpp \
        LyX.cpp \
+       LyXAction.cpp \
        lyxfind.cpp \
        LyXFunc.cpp \
        LyXRC.cpp \
@@ -141,6 +143,7 @@ SOURCEFILESCORE = \
        output_plaintext.cpp \
        Paragraph.cpp \
        paragraph_funcs.cpp \
+       ParagraphMetrics.cpp \
        ParagraphParameters.cpp \
        ParIterator.cpp \
        PDFOptions.cpp \
@@ -156,7 +159,7 @@ SOURCEFILESCORE = \
        Text2.cpp \
        Text3.cpp \
        TexStream.cpp \
-       TextClassList.cpp \
+       TextClass.cpp \
        TextMetrics.cpp \
        TocBackend.cpp \
        ToolbarBackend.cpp \
@@ -165,11 +168,11 @@ SOURCEFILESCORE = \
        VCBackend.cpp \
        version.cpp \
        VSpace.cpp \
-       ParagraphMetrics.cpp \
-       LyXAction.cpp
+       WordList.cpp
 
 HEADERFILESCORE = \
        Author.h \
+       BaseClassList.h \
        BiblioInfo.h \
        Bidi.h \
        BranchList.h \
@@ -260,8 +263,6 @@ HEADERFILESCORE = \
        TexStream.h \
        Text.h \
        TextClass.h \
-       TextClassList.h \
-       TextClassPtr.h \
        TextMetrics.h \
        TocBackend.h \
        ToolbarBackend.h \
@@ -270,18 +271,19 @@ HEADERFILESCORE = \
        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
 
@@ -456,11 +458,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,10 +478,6 @@ endif
 
 noinst_LTLIBRARIES += liblyxinsets.la
 
-EXTRA_DIST += \
-       insets/InsetTheorem.cpp \
-       insets/InsetTheorem.h
-
 SOURCEFILESINSETS = \
        insets/MailInset.cpp \
        insets/ExternalSupport.cpp \
@@ -514,6 +512,7 @@ SOURCEFILESINSETS = \
        insets/InsetIndex.cpp \
        insets/InsetInfo.cpp \
        insets/InsetLabel.cpp \
+       insets/InsetLayout.cpp \
        insets/InsetLine.cpp \
        insets/InsetListings.cpp \
        insets/InsetListingsParams.cpp \
@@ -592,15 +591,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