X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=99a0f98ceb16895bb81e23a84b78bf27198a7ddc;hb=997f0621c5346bb623cf86713c4fe1be0c941104;hp=ef28719ca8ad3c4b85ae3cf539839bd0bd7f175a;hpb=49094adfa235be49ed197fa2ae8e9e138fe343fe;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index ef28719ca8..99a0f98ceb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,71 +2,94 @@ include $(top_srcdir)/config/common.am
 
 ############################### Core  ##############################
 
-DISTCLEANFILES += config.h libintl.h
+AM_CPPFLAGS += -I$(top_srcdir)/src
+AM_CPPFLAGS += $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES)
+AM_CPPFLAGS += $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) $(MYTHES_INCLUDES)
+AM_CPPFLAGS += $(NOD_INCLUDES) $(QT_CPPFLAGS) $(QT_CORE_INCLUDES)
 
-MAINTAINERCLEANFILES += $(srcdir)/config.h.in
-
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
+if BUILD_CLIENT_SUBDIR
+CLIENT = client
+endif
 
-SUBDIRS = support frontends .
+SUBDIRS = support frontends . $(CLIENT) tex2lyx convert
 
-EXTRA_DIST = config.h.in \
-	Section.h \
-	Section.cpp \
-	Variables.cpp \
-	Variables.h \
-	paper.h \
-	pch.h
+EXTRA_DIST = lyx_commit_hash.h.in \
+	CMakeLists.txt \
+	graphics/CMakeLists.txt \
+	insets/CMakeLists.txt \
+	mathed/CMakeLists.txt \
+	tests/CMakeLists.txt
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
+OTHERLIBS = $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \
+            @LIBS@ $(ICONV_LIBS) $(ZLIB_LIBS) $(SOCKET_LIBS) \
+	    $(LIBSHLWAPI) $(LIBPSAPI)
 
-noinst_LTLIBRARIES = liblyxcore.la
+noinst_LIBRARIES = liblyxcore.a
 bin_PROGRAMS = lyx
 
+lyx_LDFLAGS = $(AM_LDFLAGS) $(QT_LDFLAGS)
+
 lyx_LDADD = \
-	liblyxcore.la \
-	liblyxmathed.la \
-	liblyxinsets.la \
-	frontends/liblyxfrontends.la \
-	frontends/qt4/liblyxqt4.la \
-	liblyxgraphics.la \
-	support/liblyxsupport.la \
+	liblyxcore.a \
+	liblyxmathed.a \
+	liblyxinsets.a \
+	frontends/liblyxfrontends.a \
+	frontends/qt/liblyxqt.a \
+	liblyxgraphics.a \
+	support/liblyxsupport.a \
 	$(OTHERLIBS) \
-	$(QT4_LIB) 
+	$(QT_LIB)
 
 if LYX_WIN_RESOURCE
 .rc.o:
-	cp $(top_srcdir)/development/Win32/packaging/icons/lyx_*32x32.ico .
-	windres -I. --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
+	cp $(top_srcdir)/development/Win32/packaging/icons/lyx.ico .
+	cp $(top_srcdir)/development/Win32/packaging/icons/lyx_doc.ico .
+	$(RC) -I$(top_builddir) --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
 endif
 
-#lyx_LDFLAGS=-Wl,-O1
+if INSTALL_MACOSX
+lyx_LDFLAGS += -framework AppKit -framework ApplicationServices \
+	-Wl,-rpath,@loader_path/../Frameworks \
+	-Wl,-rpath,@executable_path/../Frameworks \
+	-Wl,-headerpad_max_install_names
+endif
 
-BUILT_SOURCES = $(PCH_FILE)
+if INSTALL_MACOSX
+APPLESPELL = AppleSpellChecker.cpp AppleSpellChecker.h
+endif
 
 if USE_ASPELL
-ASPELL = ASpell.cpp ASpell_local.h
+ASPELL = AspellChecker.cpp AspellChecker.h
+PWL = PersonalWordList.cpp PersonalWordList.h
 endif
-if USE_PSPELL
-PSPELL = PSpell.cpp PSpell.h
+
+if USE_ENCHANT
+ENCHANT = EnchantChecker.cpp EnchantChecker.h
+PWL = PersonalWordList.cpp PersonalWordList.h
 endif
-if USE_ISPELL
-ISPELL = ISpell.cpp ISpell.h
+
+if USE_HUNSPELL
+HUNSPELL = HunspellChecker.cpp HunspellChecker.h
+PWL = PersonalWordList.cpp PersonalWordList.h
 endif
 
-# These four objects are linked as object files as they are not
-# referenced within the core and therefore are not picked up
-# by the linker without looping over libs. We do not want that,
-# and in fact libtools seems not able to do that.
 lyx_SOURCES = \
 	main.cpp \
-	$(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
+	$(APPLESPELL) \
+	$(ASPELL) \
+	BiblioInfo.h \
+	BiblioInfo.cpp \
 	Box.cpp \
 	Box.h \
+	Compare.cpp \
+	Compare.h \
 	Dimension.cpp \
 	Dimension.h \
-	PrinterParams.cpp \
-	PrinterParams.h \
+	$(ENCHANT) \
+	$(HUNSPELL) \
+	$(PWL) \
+	LaTeXFonts.cpp \
+	LaTeXFonts.h \
 	Thesaurus.cpp \
 	Thesaurus.h
 
@@ -76,8 +99,6 @@ endif
 
 SOURCEFILESCORE = \
 	Author.cpp \
-	BiblioInfo.cpp \
-	Bidi.cpp \
 	boost.cpp \
 	BranchList.cpp \
 	Buffer.cpp \
@@ -88,6 +109,7 @@ SOURCEFILESCORE = \
 	Bullet.cpp \
 	Changes.cpp \
 	Chktex.cpp \
+	CiteEnginesList.cpp \
 	CmdDef.cpp \
 	Color.cpp \
 	ConverterCache.cpp \
@@ -97,25 +119,23 @@ SOURCEFILESCORE = \
 	Cursor.cpp \
 	CursorSlice.cpp \
 	CutAndPaste.cpp \
-	debug.cpp \
 	DepTable.cpp \
 	DocIterator.cpp \
-	EmbeddedFiles.cpp \
 	Encoding.cpp \
+	BufferEncodings.cpp \
 	ErrorList.cpp \
 	Exporter.cpp \
 	factory.cpp \
 	Floating.cpp \
 	FloatList.cpp \
 	FontInfo.cpp \
-	FontIterator.cpp \
 	FontList.cpp \
 	Font.cpp \
 	Format.cpp \
 	FuncRequest.cpp \
 	FuncStatus.cpp \
-	gettext.cpp \
 	Graph.cpp \
+	IndicesList.cpp \
 	InsetIterator.cpp \
 	InsetList.cpp \
 	Intl.cpp \
@@ -124,70 +144,71 @@ SOURCEFILESCORE = \
 	Language.cpp \
 	LaTeX.cpp \
 	LaTeXFeatures.cpp \
-	Length.cpp \
-	lengthcommon.cpp \
+	LaTeXPackages.cpp \
+	LayoutFile.cpp \
+	LayoutModuleList.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 \
 	output_docbook.cpp \
 	output.cpp \
 	output_latex.cpp \
+	output_xhtml.cpp \
 	OutputParams.cpp \
 	output_plaintext.cpp \
 	Paragraph.cpp \
-	paragraph_funcs.cpp \
+	ParagraphMetrics.cpp \
 	ParagraphParameters.cpp \
 	ParIterator.cpp \
 	PDFOptions.cpp \
 	Row.cpp \
-	rowpainter.cpp \
+	RowPainter.cpp \
 	Server.cpp \
 	ServerSocket.cpp \
-	sgml.cpp \
+	xml.cpp \
 	Session.cpp \
 	Spacing.cpp \
 	TexRow.cpp \
+	texstream.cpp \
 	Text.cpp \
 	Text2.cpp \
 	Text3.cpp \
-	TexStream.cpp \
-	TextClassList.cpp \
+	TextClass.cpp \
 	TextMetrics.cpp \
 	TocBackend.cpp \
-	ToolbarBackend.cpp \
+	TocBuilder.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 \
 	Buffer.h \
+	BufferEncodings.h \
 	BufferList.h \
 	BufferParams.h \
 	BufferView.h \
 	Bullet.h \
+	Citation.h \
+	CiteEnginesList.h \
 	Changes.h \
 	Chktex.h \
 	CmdDef.h \
 	ColorCode.h \
 	Color.h \
-	config.h.in \
+	ColorSet.h \
+	CompletionList.h \
 	ConverterCache.h \
 	Converter.h \
 	CoordCache.h \
@@ -195,11 +216,10 @@ HEADERFILESCORE = \
 	Cursor.h \
 	CursorSlice.h \
 	CutAndPaste.h \
-	debug.h \
 	DepTable.h \
 	DispatchResult.h \
 	DocIterator.h \
-	EmbeddedFiles.h \
+	DocumentClassPtr.h \
 	Encoding.h \
 	ErrorList.h \
 	Exporter.h \
@@ -209,13 +229,13 @@ HEADERFILESCORE = \
 	Font.h \
 	FontEnums.h \
 	FontInfo.h \
-	FontIterator.h \
 	FontList.h \
 	Format.h \
+	FuncCode.h \
 	FuncRequest.h \
 	FuncStatus.h \
-	gettext.h \
 	Graph.h \
+	IndicesList.h \
 	InsetIterator.h \
 	InsetList.h \
 	Intl.h \
@@ -223,31 +243,29 @@ HEADERFILESCORE = \
 	KeySequence.h \
 	Language.h \
 	LaTeXFeatures.h \
+	LaTeXPackages.h \
 	LaTeX.h \
 	Layout.h \
-	LayoutPtr.h \
 	LayoutEnums.h \
-	Length.h \
+	LayoutFile.h \
+	LayoutModuleList.h \
 	Lexer.h \
-	lfuns.h \
 	LyXAction.h \
 	lyxfind.h \
-	LyXFunc.h \
 	LyX.h \
 	LyXRC.h \
 	LyXVC.h \
-	MenuBackend.h \
-	Messages.h \
 	MetricsInfo.h \
 	ModuleList.h \
 	Mover.h \
 	output_docbook.h \
 	output.h \
+	OutputEnums.h \
 	output_latex.h \
+	output_xhtml.h \
 	OutputParams.h \
 	output_plaintext.h \
 	paper.h \
-	paragraph_funcs.h \
 	Paragraph.h \
 	ParagraphList.h \
 	ParagraphMetrics.h \
@@ -255,54 +273,88 @@ HEADERFILESCORE = \
 	ParIterator.h \
 	PDFOptions.h \
 	Row.h \
-	rowpainter.h \
+	RowFlags.h \
+	RowPainter.h \
 	Server.h \
 	ServerSocket.h \
 	Session.h \
-	sgml.h \
+	xml.h \
 	Spacing.h \
-	SpellBase.h \
+	SpellChecker.h \
 	TexRow.h \
-	TexStream.h \
+	texstream.h \
 	Text.h \
 	TextClass.h \
-	TextClassList.h \
-	TextClassPtr.h \
 	TextMetrics.h \
+	Toc.h \
 	TocBackend.h \
-	ToolbarBackend.h \
+	TocBuilder.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
+
+
+.PHONY: update_commit_hash
 
-if MONOLITHIC_CORE
+LCH_V_CHK = $(lch__v_CHK_@AM_V@)
+lch__v_CHK_ = $(lch__v_CHK_@AM_DEFAULT_V@)
+lch__v_CHK_0 = @echo "  CHK      lyx_commit_hash.h";
+lch__v_CHK_1 =
 
-lyxcore.cpp:
-	@echo -e '$(SOURCEFILESCORE:%=\n#include "%")\n' > $@
+update_commit_hash:
+	$(LCH_V_CHK)rm -f hash-temp ; \
+	hash=`cd "$(top_srcdir)" && git log -1 --pretty=format:%H 2>/dev/null || echo none` ; \
+	sed s/@LYX_GIT_COMMIT_HASH@/$$hash/ "$(srcdir)"/lyx_commit_hash.h.in >hash-temp ; \
+	cmp -s lyx_commit_hash.h hash-temp || cp hash-temp lyx_commit_hash.h ; \
+	rm -f hash-temp
 
-BUILT_SOURCES += lyxcore.cpp $(STANDALONEFILES)
+lyx_commit_hash.h: update_commit_hash
 
-liblyxcore_la_SOURCES = lyxcore.cpp $(STANDALONEFILES) $(HEADERFILESCORE)
+BUILT_SOURCES = lyx_commit_hash.h
+CLEANFILES = lyx_commit_hash.h
 
-else
+liblyxcore_a_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
 
-liblyxcore_la_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
+
+#########################  Qt stuff  ##############################
+
+MOCHEADER = Compare.h PreviewLoader.h
+
+if INSTALL_WINDOWS
+
+MOCHEADER += Server.h
+MOCFLAG = -D_WIN32
 
 endif
 
+MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
+
+BUILT_SOURCES += $(MOCEDFILES)
+CLEANFILES += $(MOCEDFILES)
+
+moc_PreviewLoader.cpp: graphics/PreviewLoader.h
+	$(AM_V_GEN)$(QT_MOC) $(MOCFLAG) -o $@ $<
+
+moc_%.cpp: %.h
+	$(AM_V_GEN)$(QT_MOC) $(MOCFLAG) -o $@ $<
+
+liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
+
 ############################### Graphics ##############################
 
-noinst_LTLIBRARIES += liblyxgraphics.la
+noinst_LIBRARIES += liblyxgraphics.a
 
-liblyxgraphics_la_SOURCES = \
+liblyxgraphics_a_SOURCES = \
+	graphics/epstools.h \
+	graphics/epstools.cpp \
 	graphics/GraphicsCache.h \
 	graphics/GraphicsCache.cpp \
 	graphics/GraphicsCacheItem.h \
@@ -310,28 +362,20 @@ liblyxgraphics_la_SOURCES = \
 	graphics/GraphicsConverter.h \
 	graphics/GraphicsConverter.cpp \
 	graphics/GraphicsImage.h \
-	graphics/GraphicsImage.cpp \
 	graphics/GraphicsLoader.h \
 	graphics/GraphicsLoader.cpp \
 	graphics/GraphicsParams.cpp \
 	graphics/GraphicsParams.h \
-	graphics/LoaderQueue.h \
-	graphics/LoaderQueue.cpp \
 	graphics/GraphicsTypes.h \
-	graphics/GraphicsTypes.cpp \
 	graphics/PreviewImage.h \
 	graphics/PreviewImage.cpp \
 	graphics/PreviewLoader.h \
-	graphics/PreviewLoader.cpp \
-	graphics/Previews.h \
-	graphics/Previews.cpp
+	graphics/PreviewLoader.cpp
 
 
 ############################### Mathed  ##############################
 
-EXTRA_DIST += mathed/InsetFormulaMacro.cpp
-
-noinst_LTLIBRARIES += liblyxmathed.la
+noinst_LIBRARIES += liblyxmathed.a
 
 SOURCEFILESMATHED = \
 	mathed/InsetMathAMSArray.cpp \
@@ -341,16 +385,21 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathBox.cpp \
 	mathed/InsetMathBrace.cpp \
 	mathed/InsetMath.cpp \
+	mathed/InsetMathCancel.cpp \
+	mathed/InsetMathCancelto.cpp \
 	mathed/InsetMathCases.cpp \
 	mathed/InsetMathChar.cpp \
+	mathed/InsetMathClass.cpp \
 	mathed/InsetMathColor.cpp \
-	mathed/CommandInset.cpp \
+	mathed/InsetMathCommand.cpp \
 	mathed/InsetMathComment.cpp \
 	mathed/InsetMathDecoration.cpp \
 	mathed/InsetMathDecoration.h \
 	mathed/InsetMathDelim.cpp \
+	mathed/InsetMathDiagram.cpp \
 	mathed/InsetMathDiff.cpp \
 	mathed/InsetMathDots.cpp \
+	mathed/InsetMathEnsureMath.cpp \
 	mathed/InsetMathEnv.cpp \
 	mathed/InsetMathExFunc.cpp \
 	mathed/InsetMathExInt.cpp \
@@ -362,7 +411,9 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathKern.cpp \
 	mathed/InsetMathLefteqn.cpp \
 	mathed/InsetMathLim.cpp \
-	mathed/MathMacro.cpp \
+	mathed/InsetMathMacro.cpp \
+	mathed/InsetMathMacroArgument.cpp \
+	mathed/InsetMathMacroTemplate.cpp \
 	mathed/InsetMathMatrix.cpp \
 	mathed/InsetMathNest.cpp \
 	mathed/InsetMathNumber.cpp \
@@ -372,8 +423,10 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathRef.cpp \
 	mathed/InsetMathRoot.cpp \
 	mathed/InsetMathScript.cpp \
+	mathed/InsetMathSideset.cpp \
 	mathed/InsetMathSize.cpp \
 	mathed/InsetMathSpace.cpp \
+	mathed/InsetMathSpecialChar.cpp \
 	mathed/InsetMathSplit.cpp \
 	mathed/InsetMathSqrt.cpp \
 	mathed/InsetMathStackrel.cpp \
@@ -385,15 +438,15 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathUnknown.cpp \
 	mathed/InsetMathXArrow.cpp \
 	mathed/InsetMathXYMatrix.cpp \
+	mathed/MacroTable.cpp \
 	mathed/MathAtom.cpp \
 	mathed/MathAutoCorrect.cpp \
+	mathed/MathClass.cpp \
 	mathed/MathData.cpp \
 	mathed/MathExtern.cpp \
 	mathed/MathFactory.cpp \
-	mathed/MathMacroArgument.cpp \
-	mathed/MacroTable.cpp \
-	mathed/MathMacroTemplate.cpp \
 	mathed/MathParser.cpp \
+	mathed/MathRow.cpp \
 	mathed/MathStream.cpp \
 	mathed/MathSupport.cpp \
 	mathed/TextPainter.cpp
@@ -405,14 +458,18 @@ HEADERFILESMATHED = \
 	mathed/InsetMathBoldSymbol.h \
 	mathed/InsetMathBox.h \
 	mathed/InsetMathBrace.h \
+	mathed/InsetMathCancel.h \
+	mathed/InsetMathCancelto.h \
 	mathed/InsetMathCases.h \
 	mathed/InsetMathChar.h \
+	mathed/InsetMathClass.h \
 	mathed/InsetMathColor.h \
-	mathed/CommandInset.h \
+	mathed/InsetMathCommand.h \
 	mathed/InsetMathComment.h \
 	mathed/InsetMathDelim.h \
 	mathed/InsetMathDiff.h \
 	mathed/InsetMathDots.h \
+	mathed/InsetMathEnsureMath.h \
 	mathed/InsetMathEnv.h \
 	mathed/InsetMathExFunc.h \
 	mathed/InsetMathExInt.h \
@@ -425,7 +482,9 @@ HEADERFILESMATHED = \
 	mathed/InsetMathKern.h \
 	mathed/InsetMathLefteqn.h \
 	mathed/InsetMathLim.h \
-	mathed/MathMacro.h \
+	mathed/InsetMathMacro.h \
+	mathed/InsetMathMacroArgument.h \
+	mathed/InsetMathMacroTemplate.h \
 	mathed/InsetMathMatrix.h \
 	mathed/InsetMathNest.h \
 	mathed/InsetMathNumber.h \
@@ -435,8 +494,10 @@ HEADERFILESMATHED = \
 	mathed/InsetMathRef.h \
 	mathed/InsetMathRoot.h \
 	mathed/InsetMathScript.h \
+	mathed/InsetMathSideset.h \
 	mathed/InsetMathSize.h \
 	mathed/InsetMathSpace.h \
+	mathed/InsetMathSpecialChar.h \
 	mathed/InsetMathSplit.h \
 	mathed/InsetMathSqrt.h \
 	mathed/InsetMathStackrel.h \
@@ -448,46 +509,31 @@ HEADERFILESMATHED = \
 	mathed/InsetMathUnknown.h \
 	mathed/InsetMathXArrow.h \
 	mathed/InsetMathXYMatrix.h \
+	mathed/InsetMathDiagram.h \
 	mathed/MathAtom.h \
 	mathed/MathAutoCorrect.h \
+	mathed/MathClass.h \
 	mathed/MathData.h \
+	mathed/MathCompletionList.h \
 	mathed/MathExtern.h \
 	mathed/MathFactory.h \
-	mathed/MathGridInfo.h \
-	mathed/MathMacroArgument.h \
 	mathed/MacroTable.h \
-	mathed/MathMacroTemplate.h \
 	mathed/MathParser.h \
+	mathed/MathParser_flags.h \
+	mathed/MathRow.h \
 	mathed/ReplaceData.h \
 	mathed/MathStream.h \
 	mathed/MathSupport.h \
-	mathed/TextPainter.h 
-
-if MONOLITHIC_MATHED
-
-lyxmathed.cpp:
-	@echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@
-
-BUILT_SOURCES += lyxmathed.cpp
-
-liblyxmathed_la_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
+	mathed/TextPainter.h
 
-else
+liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
 
-liblyxmathed_la_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED) 
-
-endif
 
 ############################### Insets  ##############################
 
-noinst_LTLIBRARIES += liblyxinsets.la
-
-EXTRA_DIST += \
-	insets/InsetTheorem.cpp \
-	insets/InsetTheorem.h
+noinst_LIBRARIES += liblyxinsets.a
 
 SOURCEFILESINSETS = \
-	insets/MailInset.cpp \
 	insets/ExternalSupport.cpp \
 	insets/ExternalTemplate.cpp \
 	insets/ExternalTransforms.cpp \
@@ -495,16 +541,18 @@ SOURCEFILESINSETS = \
 	insets/RenderGraphic.cpp \
 	insets/RenderPreview.cpp \
 	insets/Inset.cpp \
+	insets/InsetArgument.cpp \
 	insets/InsetBibitem.cpp \
 	insets/InsetBibtex.cpp \
 	insets/InsetBox.cpp \
 	insets/InsetBranch.cpp \
 	insets/InsetCaption.cpp \
+	insets/InsetCaptionable.cpp \
 	insets/InsetCitation.cpp \
-	insets/InsetCollapsable.cpp \
+	insets/InsetCollapsible.cpp \
 	insets/InsetCommand.cpp \
 	insets/InsetCommandParams.cpp \
-	insets/InsetEnvironment.cpp \
+	insets/InsetCounter.cpp \
 	insets/InsetERT.cpp \
 	insets/InsetExternal.cpp \
 	insets/InsetFlex.cpp \
@@ -514,23 +562,28 @@ 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/InsetIPA.cpp \
+	insets/InsetIPAMacro.cpp \
 	insets/InsetLabel.cpp \
+	insets/InsetLayout.cpp \
 	insets/InsetLine.cpp \
 	insets/InsetListings.cpp \
 	insets/InsetListingsParams.cpp \
 	insets/InsetMarginal.cpp \
 	insets/InsetNewline.cpp \
+	insets/InsetNewpage.cpp \
 	insets/InsetNomencl.cpp \
 	insets/InsetNote.cpp \
-	insets/InsetOptArg.cpp \
-	insets/InsetPagebreak.cpp \
+	insets/InsetPhantom.cpp \
+	insets/InsetPreview.cpp \
 	insets/InsetQuotes.cpp \
 	insets/InsetRef.cpp \
+	insets/InsetScript.cpp \
+	insets/InsetSeparator.cpp \
 	insets/InsetSpace.cpp \
 	insets/InsetSpecialChar.cpp \
 	insets/InsetTabular.cpp \
@@ -540,7 +593,6 @@ SOURCEFILESINSETS = \
 	insets/InsetWrap.cpp
 
 HEADERFILESINSETS = \
-	insets/MailInset.h \
 	insets/ExternalSupport.h \
 	insets/ExternalTemplate.h \
 	insets/ExternalTransforms.h \
@@ -549,18 +601,20 @@ HEADERFILESINSETS = \
 	insets/RenderGraphic.h \
 	insets/RenderPreview.h \
 	insets/Inset.h \
+	insets/InsetArgument.h \
 	insets/InsetBibitem.h \
 	insets/InsetBibtex.h \
 	insets/InsetBox.h \
 	insets/InsetBranch.h \
 	insets/InsetCaption.h \
+	insets/InsetCaptionable.h \
 	insets/InsetCitation.h \
 	insets/InsetCode.h \
-	insets/InsetCollapsable.h \
+	insets/InsetCollapsible.h \
 	insets/InsetCommand.h \
 	insets/InsetCommandParams.h \
+	insets/InsetCounter.h \
 	insets/InsetERT.h \
-	insets/InsetEnvironment.h \
 	insets/InsetExternal.h \
 	insets/InsetFlex.h \
 	insets/InsetFloat.h \
@@ -569,11 +623,13 @@ HEADERFILESINSETS = \
 	insets/InsetFootlike.h \
 	insets/InsetGraphicsParams.h \
 	insets/InsetGraphics.h \
-	insets/InsetHFill.h \
 	insets/InsetHyperlink.h \
 	insets/InsetInclude.h \
 	insets/InsetIndex.h \
 	insets/InsetInfo.h \
+	insets/InsetIPA.h \
+	insets/InsetIPAMacro.h \
+	insets/InsetPreview.h \
 	insets/InsetLabel.h \
 	insets/InsetLayout.h \
 	insets/InsetLine.h \
@@ -581,12 +637,14 @@ HEADERFILESINSETS = \
 	insets/InsetListingsParams.h \
 	insets/InsetMarginal.h \
 	insets/InsetNewline.h \
+	insets/InsetNewpage.h \
 	insets/InsetNomencl.h \
 	insets/InsetNote.h \
-	insets/InsetOptArg.h \
-	insets/InsetPagebreak.h \
+	insets/InsetPhantom.h \
 	insets/InsetQuotes.h \
 	insets/InsetRef.h \
+	insets/InsetScript.h \
+	insets/InsetSeparator.h \
 	insets/InsetSpace.h \
 	insets/InsetSpecialChar.h \
 	insets/InsetTabular.h \
@@ -595,24 +653,101 @@ HEADERFILESINSETS = \
 	insets/InsetVSpace.h \
 	insets/InsetWrap.h
 
-#	insets/InsetList.cpp \
-#	insets/InsetList.h \
-#	insets/InsetSection.h \
-#	insets/InsetSection.cpp \
-#	insets/InsetTheorem.cpp \
-#	insets/InsetTheorem.h
-
-if MONOLITHIC_INSETS
+liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
 
-lyxinsets.cpp:
-	@echo -e '$(SOURCEFILESINSETS:%=\n#include "%")\n' > $@
 
-BUILT_SOURCES += lyxinsets.cpp
-
-liblyxinsets_la_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
-
-else
-
-liblyxinsets_la_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
+############################## Tests ##################################
 
+EXTRA_DIST += \
+	tests/test_ExternalTransforms \
+	tests/test_ListingsCaption \
+	tests/test_layout \
+	tests/test_Length \
+	tests/regfiles/ExternalTransforms \
+	tests/regfiles/Length \
+	tests/regfiles/ListingsCaption \
+	tests/dummy_functions.cpp \
+	tests/boost.cpp
+
+TESTS = tests/test_ExternalTransforms tests/test_ListingsCaption \
+	tests/test_layout tests/test_Length
+
+alltests: check alltests-recursive
+
+alltests-recursive: check_layout
+	@srcdir=$(srcdir) $(srcdir)/tests/test_layout; \
+	if test $$? -eq 0; then \
+		echo -e "====================\nlayout tests passed.\n===================="; \
+	else \
+		echo -e "====================\nlayout tests failed.\n===================="; \
+	fi
+	cd tex2lyx; $(MAKE) alltests-recursive
+
+updatetests:
+	cd tex2lyx; $(MAKE) updatetests
+
+check_PROGRAMS = \
+	check_ExternalTransforms \
+	check_Length \
+	check_ListingsCaption \
+	check_layout
+
+if INSTALL_MACOSX
+ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework ApplicationServices
 endif
+
+TESTS_LIBS = support/liblyxsupport.a \
+	$(LIBICONV) @LIBS@ \
+	$(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI)
+
+check_layout_CPPFLAGS = $(AM_CPPFLAGS)
+check_layout_LDADD = $(check_layout_LYX_OBJS) $(TESTS_LIBS)
+check_layout_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_layout_SOURCES = \
+	tests/check_layout.cpp \
+	tests/dummy_functions.cpp \
+	tests/boost.cpp
+check_layout_LYX_OBJS = \
+	insets/InsetLayout.o \
+	CiteEnginesList.o \
+	Color.o \
+	Counters.o \
+	Floating.o \
+	FloatList.o \
+	FontInfo.o \
+	Layout.o \
+	LayoutFile.o \
+	Lexer.o \
+	ModuleList.o \
+	Spacing.o \
+	TextClass.o
+
+check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS)
+check_ExternalTransforms_LDADD = $(check_ExternalTransforms_LYX_OBJS) $(TESTS_LIBS)
+check_ExternalTransforms_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_ExternalTransforms_SOURCES = \
+	tests/check_ExternalTransforms.cpp \
+	tests/dummy_functions.cpp \
+	tests/boost.cpp
+check_ExternalTransforms_LYX_OBJS = \
+	graphics/GraphicsParams.o \
+	insets/ExternalTransforms.o
+
+check_Length_CPPFLAGS = $(AM_CPPFLAGS)
+check_Length_LDADD = $(TESTS_LIBS)
+check_Length_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_Length_SOURCES = \
+	tests/check_Length.cpp \
+	tests/dummy_functions.cpp \
+	tests/boost.cpp
+
+check_ListingsCaption_CPPFLAGS = $(AM_CPPFLAGS)
+check_ListingsCaption_LDADD = $(check_ListingsCaption_LYX_OBJS) $(TESTS_LIBS)
+check_ListingsCaption_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_ListingsCaption_SOURCES = \
+	tests/check_ListingsCaption.cpp \
+	tests/dummy_functions.cpp \
+	tests/boost.cpp
+check_ListingsCaption_LYX_OBJS =
+
+.PHONY: alltests alltests-recursive updatetests