X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=7b62c586f4908a44fdcaa922ec619eb18904472b;hb=51ac7d895cc7a9c4ad91131d0b4734395366d04b;hp=8ec83b70f0a7775796e30ffd447988f854c2df8a;hpb=9d0ea8aeff32833a90b3fe64df0c5518a9e241be;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 8ec83b70f0..7b62c586f4 100644
--- 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
@@ -122,15 +122,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 +142,7 @@ SOURCEFILESCORE = \
 	output_plaintext.cpp \
 	Paragraph.cpp \
 	paragraph_funcs.cpp \
+	ParagraphMetrics.cpp \
 	ParagraphParameters.cpp \
 	ParIterator.cpp \
 	PDFOptions.cpp \
@@ -156,7 +158,7 @@ SOURCEFILESCORE = \
 	Text2.cpp \
 	Text3.cpp \
 	TexStream.cpp \
-	TextClassList.cpp \
+	TextClass.cpp \
 	TextMetrics.cpp \
 	TocBackend.cpp \
 	ToolbarBackend.cpp \
@@ -165,8 +167,7 @@ SOURCEFILESCORE = \
 	VCBackend.cpp \
 	version.cpp \
 	VSpace.cpp \
-	ParagraphMetrics.cpp \
-	LyXAction.cpp
+	WordList.cpp
 
 HEADERFILESCORE = \
 	Author.h \
@@ -220,8 +221,8 @@ HEADERFILESCORE = \
 	LaTeXFeatures.h \
 	LaTeX.h \
 	Layout.h \
-	LayoutPtr.h \
 	LayoutEnums.h \
+	LayoutFile.h \
 	Length.h \
 	Lexer.h \
 	lfuns.h \
@@ -231,7 +232,6 @@ HEADERFILESCORE = \
 	LyX.h \
 	LyXRC.h \
 	LyXVC.h \
-	MenuBackend.h \
 	MetricsInfo.h \
 	ModuleList.h \
 	Mover.h \
@@ -260,8 +260,6 @@ HEADERFILESCORE = \
 	TexStream.h \
 	Text.h \
 	TextClass.h \
-	TextClassList.h \
-	TextClassPtr.h \
 	TextMetrics.h \
 	TocBackend.h \
 	ToolbarBackend.h \
@@ -270,19 +268,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)
 
@@ -455,12 +455,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)
 
@@ -474,10 +475,6 @@ endif
 
 noinst_LTLIBRARIES += liblyxinsets.la
 
-EXTRA_DIST += \
-	insets/InsetTheorem.cpp \
-	insets/InsetTheorem.h
-
 SOURCEFILESINSETS = \
 	insets/MailInset.cpp \
 	insets/ExternalSupport.cpp \
@@ -506,12 +503,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 \
@@ -561,7 +558,6 @@ HEADERFILESINSETS = \
 	insets/InsetFootlike.h \
 	insets/InsetGraphicsParams.h \
 	insets/InsetGraphics.h \
-	insets/InsetHFill.h \
 	insets/InsetHyperlink.h \
 	insets/InsetInclude.h \
 	insets/InsetIndex.h \
@@ -590,16 +586,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)