do what the FIXME suggested

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 31f813738c8a7aa24a536e7fd8ffa7d152d29bf2..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 \
@@ -97,7 +98,6 @@ SOURCEFILESCORE = \
        Cursor.cpp \
        CursorSlice.cpp \
        CutAndPaste.cpp \
-       debug.cpp \
        DepTable.cpp \
        DocIterator.cpp \
        EmbeddedFiles.cpp \
@@ -114,7 +114,6 @@ SOURCEFILESCORE = \
        Format.cpp \
        FuncRequest.cpp \
        FuncStatus.cpp \
-       gettext.cpp \
        Graph.cpp \
        InsetIterator.cpp \
        InsetList.cpp \
@@ -128,12 +127,12 @@ SOURCEFILESCORE = \
        lengthcommon.cpp \
        Lexer.cpp \
        LyX.cpp \
+       LyXAction.cpp \
        lyxfind.cpp \
        LyXFunc.cpp \
        LyXRC.cpp \
        LyXVC.cpp \
        MenuBackend.cpp \
-       Messages.cpp \
        MetricsInfo.cpp \
        ModuleList.cpp \
        Mover.cpp \
@@ -144,6 +143,7 @@ SOURCEFILESCORE = \
        output_plaintext.cpp \
        Paragraph.cpp \
        paragraph_funcs.cpp \
+       ParagraphMetrics.cpp \
        ParagraphParameters.cpp \
        ParIterator.cpp \
        PDFOptions.cpp \
@@ -159,7 +159,7 @@ SOURCEFILESCORE = \
        Text2.cpp \
        Text3.cpp \
        TexStream.cpp \
-       TextClassList.cpp \
+       TextClass.cpp \
        TextMetrics.cpp \
        TocBackend.cpp \
        ToolbarBackend.cpp \
@@ -168,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 \
@@ -195,7 +195,6 @@ HEADERFILESCORE = \
        Cursor.h \
        CursorSlice.h \
        CutAndPaste.h \
-       debug.h \
        DepTable.h \
        DispatchResult.h \
        DocIterator.h \
@@ -214,7 +213,6 @@ HEADERFILESCORE = \
        Format.h \
        FuncRequest.h \
        FuncStatus.h \
-       gettext.h \
        Graph.h \
        InsetIterator.h \
        InsetList.h \
@@ -237,7 +235,6 @@ HEADERFILESCORE = \
        LyXRC.h \
        LyXVC.h \
        MenuBackend.h \
-       Messages.h \
        MetricsInfo.h \
        ModuleList.h \
        Mover.h \
@@ -266,8 +263,6 @@ HEADERFILESCORE = \
        TexStream.h \
        Text.h \
        TextClass.h \
-       TextClassList.h \
-       TextClassPtr.h \
        TextMetrics.h \
        TocBackend.h \
        ToolbarBackend.h \
@@ -276,19 +271,21 @@ 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
 
 liblyxcore_la_SOURCES = lyxcore.cpp $(STANDALONEFILES) $(HEADERFILESCORE)
 
@@ -461,12 +458,13 @@ 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
 
 liblyxmathed_la_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
 
@@ -480,10 +478,6 @@ endif
 
 noinst_LTLIBRARIES += liblyxinsets.la
 
-EXTRA_DIST += \
-       insets/InsetTheorem.cpp \
-       insets/InsetTheorem.h
-
 SOURCEFILESINSETS = \
        insets/MailInset.cpp \
        insets/ExternalSupport.cpp \
@@ -518,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 \
@@ -596,16 +591,15 @@ 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
 
 liblyxinsets_la_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)