X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=88b1e11e4911978f29f01e3483b3e3841dc3ab09;hb=2455bc258f3b62c29ec4a41cb88070ff8518e842;hp=0b4203424d232686c5191b1100fba1e5c29dc98d;hpb=f89f724f1d4c1f1aa6d97e47d07731866151df3c;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 0b4203424d..88b1e11e49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,21 +4,22 @@ 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 \
 	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 +62,8 @@ endif
 lyx_SOURCES = \
 	main.cpp \
 	$(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
+	BiblioInfo.h \
+	BiblioInfo.cpp \
 	Box.cpp \
 	Box.h \
 	Dimension.cpp \
@@ -76,7 +79,6 @@ endif
 
 SOURCEFILESCORE = \
 	Author.cpp \
-	BiblioInfo.cpp \
 	Bidi.cpp \
 	boost.cpp \
 	BranchList.cpp \
@@ -99,7 +101,6 @@ SOURCEFILESCORE = \
 	CutAndPaste.cpp \
 	DepTable.cpp \
 	DocIterator.cpp \
-	EmbeddedFiles.cpp \
 	Encoding.cpp \
 	ErrorList.cpp \
 	Exporter.cpp \
@@ -107,7 +108,6 @@ SOURCEFILESCORE = \
 	Floating.cpp \
 	FloatList.cpp \
 	FontInfo.cpp \
-	FontIterator.cpp \
 	FontList.cpp \
 	Font.cpp \
 	Format.cpp \
@@ -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,21 +158,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,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 \
@@ -195,7 +195,6 @@ HEADERFILESCORE = \
 	DepTable.h \
 	DispatchResult.h \
 	DocIterator.h \
-	EmbeddedFiles.h \
 	Encoding.h \
 	ErrorList.h \
 	Exporter.h \
@@ -205,9 +204,9 @@ HEADERFILESCORE = \
 	Font.h \
 	FontEnums.h \
 	FontInfo.h \
-	FontIterator.h \
 	FontList.h \
 	Format.h \
+	FuncCode.h \
 	FuncRequest.h \
 	FuncStatus.h \
 	Graph.h \
@@ -220,18 +219,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,22 +257,19 @@ 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
 
 
 lyxcore.cpp:
@@ -312,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 \
@@ -445,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 \
@@ -477,12 +471,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 \
@@ -499,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 \
@@ -509,12 +497,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 \
@@ -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 \
@@ -593,9 +578,7 @@ HEADERFILESINSETS = \
 #	insets/InsetList.cpp \
 #	insets/InsetList.h \
 #	insets/InsetSection.h \
-#	insets/InsetSection.cpp \
-#	insets/InsetTheorem.cpp \
-#	insets/InsetTheorem.h
+#	insets/InsetSection.cpp
 
 lyxinsets.cpp:
 	@echo -e '$(SOURCEFILESINSETS:%=\n#include "%")\n' > $@