X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=9b863cdf129e4f09ed1e3141d5e800ca98d64b64;hb=08b285966326523a10954cf6235d0c7b200c842f;hp=297a296e0edc6e86c4a375bd4d47d1c139abb9eb;hpb=20b9e0ba9301caad3e7d28f56ffb0c0180aae9c9;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 297a296e0e..9b863cdf12 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,11 +2,8 @@ include $(top_srcdir)/config/common.am
 
 ############################### Core  ##############################
 
-DISTCLEANFILES += config.h libintl.h
-
-MAINTAINERCLEANFILES += $(srcdir)/config.h.in
-
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
+AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
 CLIENT = client
@@ -14,48 +11,63 @@ endif
 
 SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
-EXTRA_DIST = config.h.in \
-	Section.h \
-	Section.cpp \
-	Variables.cpp \
-	Variables.h \
-	paper.h \
-	pch.h
+EXTRA_DIST = lyx_commit_hash.h.in \
+	pch.h \
+	CMakeLists.txt \
+	graphics/CMakeLists.txt \
+	insets/CMakeLists.txt \
+	mathed/CMakeLists.txt \
+	tests/CMakeLists.txt
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
+OTHERLIBS = $(BOOST_LIBS) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \
+            @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
-noinst_LTLIBRARIES = liblyxcore.la
+noinst_LIBRARIES = liblyxcore.a
 bin_PROGRAMS = lyx
 
 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/qt4/liblyxqt4.a \
+	liblyxgraphics.a \
+	support/liblyxsupport.a \
 	$(OTHERLIBS) \
-	$(QT4_LIB) 
+	$(QT_LDFLAGS) \
+	$(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 $@
+	windres -I$(top_builddir) --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
+endif
+
+if INSTALL_MACOSX
+lyx_LDFLAGS = -framework AppKit -framework ApplicationServices
 endif
 
 #lyx_LDFLAGS=-Wl,-O1
 
 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
@@ -64,13 +76,21 @@ endif
 # 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 \
+	$(ENCHANT) \
+	$(HUNSPELL) \
+	$(PWL) \
+	LaTeXFonts.cpp \
+	LaTeXFonts.h \
 	PrinterParams.cpp \
 	PrinterParams.h \
 	Thesaurus.cpp \
@@ -105,6 +125,7 @@ SOURCEFILESCORE = \
 	DepTable.cpp \
 	DocIterator.cpp \
 	Encoding.cpp \
+	BufferEncodings.cpp \
 	ErrorList.cpp \
 	Exporter.cpp \
 	factory.cpp \
@@ -117,6 +138,8 @@ SOURCEFILESCORE = \
 	FuncRequest.cpp \
 	FuncStatus.cpp \
 	Graph.cpp \
+	HSpace.cpp \
+	IndicesList.cpp \
 	InsetIterator.cpp \
 	InsetList.cpp \
 	Intl.cpp \
@@ -125,14 +148,15 @@ SOURCEFILESCORE = \
 	Language.cpp \
 	LaTeX.cpp \
 	LaTeXFeatures.cpp \
+	LaTeXPackages.cpp \
 	LayoutFile.cpp \
+	LayoutModuleList.cpp \
 	Length.cpp \
 	lengthcommon.cpp \
 	Lexer.cpp \
 	LyX.cpp \
 	LyXAction.cpp \
 	lyxfind.cpp \
-	LyXFunc.cpp \
 	LyXRC.cpp \
 	LyXVC.cpp \
 	MetricsInfo.cpp \
@@ -141,26 +165,26 @@ SOURCEFILESCORE = \
 	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 \
 	Session.cpp \
 	Spacing.cpp \
 	TexRow.cpp \
+	texstream.cpp \
 	Text.cpp \
 	Text2.cpp \
 	Text3.cpp \
-	TexStream.cpp \
 	TextClass.cpp \
 	TextMetrics.cpp \
 	TocBackend.cpp \
@@ -177,6 +201,7 @@ HEADERFILESCORE = \
 	BranchList.h \
 	buffer_funcs.h \
 	Buffer.h \
+	BufferEncodings.h \
 	BufferList.h \
 	BufferParams.h \
 	BufferView.h \
@@ -187,8 +212,8 @@ HEADERFILESCORE = \
 	CmdDef.h \
 	ColorCode.h \
 	Color.h \
+	ColorSet.h \
 	CompletionList.h \
-	config.h.in \
 	ConverterCache.h \
 	Converter.h \
 	CoordCache.h \
@@ -199,6 +224,7 @@ HEADERFILESCORE = \
 	DepTable.h \
 	DispatchResult.h \
 	DocIterator.h \
+	DocumentClassPtr.h \
 	Encoding.h \
 	ErrorList.h \
 	Exporter.h \
@@ -214,6 +240,8 @@ HEADERFILESCORE = \
 	FuncRequest.h \
 	FuncStatus.h \
 	Graph.h \
+	HSpace.h \
+	IndicesList.h \
 	InsetIterator.h \
 	InsetList.h \
 	Intl.h \
@@ -221,15 +249,16 @@ HEADERFILESCORE = \
 	KeySequence.h \
 	Language.h \
 	LaTeXFeatures.h \
+	LaTeXPackages.h \
 	LaTeX.h \
 	Layout.h \
 	LayoutEnums.h \
 	LayoutFile.h \
+	LayoutModuleList.h \
 	Length.h \
 	Lexer.h \
 	LyXAction.h \
 	lyxfind.h \
-	LyXFunc.h \
 	LyX.h \
 	LyXRC.h \
 	LyXVC.h \
@@ -238,11 +267,12 @@ HEADERFILESCORE = \
 	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 \
@@ -250,15 +280,15 @@ HEADERFILESCORE = \
 	ParIterator.h \
 	PDFOptions.h \
 	Row.h \
-	rowpainter.h \
+	RowPainter.h \
 	Server.h \
 	ServerSocket.h \
 	Session.h \
 	sgml.h \
 	Spacing.h \
-	SpellBase.h \
+	SpellChecker.h \
 	TexRow.h \
-	TexStream.h \
+	texstream.h \
 	Text.h \
 	TextClass.h \
 	TextMetrics.h \
@@ -276,6 +306,25 @@ STANDALONEFILES = \
 	Layout.cpp
 
 
+.PHONY: update_commit_hash
+
+LCH_V_GEN = $(lch__v_GEN_@AM_V@)
+lch__v_GEN_ = $(lch__v_GEN_@AM_DEFAULT_V@)
+lch__v_GEN_0 = @echo "  GEN      lyx_commit_hash.h";
+lch__v_GEN_1 =
+
+update_commit_hash:
+	rm -f hash-temp \
+	$(LCH_V_GEN)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
+
+lyx_commit_hash.h: update_commit_hash
+
+BUILT_SOURCES += lyx_commit_hash.h
+CLEANFILES += lyx_commit_hash.h
+
 lyxcore.cpp:
 	@echo -e '$(SOURCEFILESCORE:%=\n#include "%")\n' > $@
 
@@ -284,19 +333,42 @@ if MONOLITHIC_CORE
 BUILT_SOURCES += lyxcore.cpp $(STANDALONEFILES)
 CLEANFILES += lyxcore.cpp
 
-liblyxcore_la_SOURCES = lyxcore.cpp $(STANDALONEFILES) $(HEADERFILESCORE)
+liblyxcore_a_SOURCES = lyxcore.cpp $(STANDALONEFILES) $(HEADERFILESCORE)
 
 else
 
-liblyxcore_la_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
+liblyxcore_a_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
+
+endif
+
+#########################  Qt stuff  ##############################
+
+MOCHEADER = Compare.h
+
+if INSTALL_WINDOWS
+
+MOCHEADER += Server.h
+MOCFLAG = -D_WIN32
 
 endif
 
+MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
+
+BUILT_SOURCES += $(MOCEDFILES)
+CLEANFILES += $(MOCEDFILES)
+
+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 \
@@ -304,28 +376,23 @@ 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/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/CommandInset.cpp \
 	mathed/InsetMathAMSArray.cpp \
 	mathed/InsetMathArray.cpp \
 	mathed/InsetMathBig.cpp \
@@ -336,13 +403,13 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathCases.cpp \
 	mathed/InsetMathChar.cpp \
 	mathed/InsetMathColor.cpp \
-	mathed/CommandInset.cpp \
 	mathed/InsetMathComment.cpp \
 	mathed/InsetMathDecoration.cpp \
 	mathed/InsetMathDecoration.h \
 	mathed/InsetMathDelim.cpp \
 	mathed/InsetMathDiff.cpp \
 	mathed/InsetMathDots.cpp \
+	mathed/InsetMathEnsureMath.cpp \
 	mathed/InsetMathEnv.cpp \
 	mathed/InsetMathExFunc.cpp \
 	mathed/InsetMathExInt.cpp \
@@ -354,7 +421,8 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathKern.cpp \
 	mathed/InsetMathLefteqn.cpp \
 	mathed/InsetMathLim.cpp \
-	mathed/MathMacro.cpp \
+	mathed/InsetMathCancel.cpp \
+	mathed/InsetMathCancelto.cpp \
 	mathed/InsetMathMatrix.cpp \
 	mathed/InsetMathNest.cpp \
 	mathed/InsetMathNumber.cpp \
@@ -364,8 +432,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 \
@@ -377,11 +447,13 @@ SOURCEFILESMATHED = \
 	mathed/InsetMathUnknown.cpp \
 	mathed/InsetMathXArrow.cpp \
 	mathed/InsetMathXYMatrix.cpp \
+	mathed/InsetMathDiagram.cpp \
 	mathed/MathAtom.cpp \
 	mathed/MathAutoCorrect.cpp \
 	mathed/MathData.cpp \
 	mathed/MathExtern.cpp \
 	mathed/MathFactory.cpp \
+	mathed/MathMacro.cpp \
 	mathed/MathMacroArgument.cpp \
 	mathed/MacroTable.cpp \
 	mathed/MathMacroTemplate.cpp \
@@ -391,20 +463,23 @@ SOURCEFILESMATHED = \
 	mathed/TextPainter.cpp
 
 HEADERFILESMATHED = \
+	mathed/CommandInset.h \
 	mathed/InsetMathAMSArray.h \
 	mathed/InsetMathArray.h \
 	mathed/InsetMathBig.h \
 	mathed/InsetMathBoldSymbol.h \
 	mathed/InsetMathBox.h \
 	mathed/InsetMathBrace.h \
+	mathed/InsetMathCancel.h \
+	mathed/InsetMathCancelto.h \
 	mathed/InsetMathCases.h \
 	mathed/InsetMathChar.h \
 	mathed/InsetMathColor.h \
-	mathed/CommandInset.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 \
@@ -417,7 +492,6 @@ HEADERFILESMATHED = \
 	mathed/InsetMathKern.h \
 	mathed/InsetMathLefteqn.h \
 	mathed/InsetMathLim.h \
-	mathed/MathMacro.h \
 	mathed/InsetMathMatrix.h \
 	mathed/InsetMathNest.h \
 	mathed/InsetMathNumber.h \
@@ -427,8 +501,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 \
@@ -440,21 +516,23 @@ HEADERFILESMATHED = \
 	mathed/InsetMathUnknown.h \
 	mathed/InsetMathXArrow.h \
 	mathed/InsetMathXYMatrix.h \
+	mathed/InsetMathDiagram.h \
 	mathed/MathAtom.h \
 	mathed/MathAutoCorrect.h \
 	mathed/MathData.h \
 	mathed/MathCompletionList.h \
 	mathed/MathExtern.h \
 	mathed/MathFactory.h \
-	mathed/MathGridInfo.h \
+	mathed/MathMacro.h \
 	mathed/MathMacroArgument.h \
 	mathed/MacroTable.h \
 	mathed/MathMacroTemplate.h \
 	mathed/MathParser.h \
+	mathed/MathParser_flags.h \
 	mathed/ReplaceData.h \
 	mathed/MathStream.h \
 	mathed/MathSupport.h \
-	mathed/TextPainter.h 
+	mathed/TextPainter.h
 
 lyxmathed.cpp:
 	@echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@
@@ -464,17 +542,17 @@ if MONOLITHIC_MATHED
 BUILT_SOURCES += lyxmathed.cpp
 CLEANFILES += lyxmathed.cpp
 
-liblyxmathed_la_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
+liblyxmathed_a_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
 
 else
 
-liblyxmathed_la_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED) 
+liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
 
 endif
 
 ############################### Insets  ##############################
 
-noinst_LTLIBRARIES += liblyxinsets.la
+noinst_LIBRARIES += liblyxinsets.a
 
 SOURCEFILESINSETS = \
 	insets/ExternalSupport.cpp \
@@ -484,6 +562,7 @@ SOURCEFILESINSETS = \
 	insets/RenderGraphic.cpp \
 	insets/RenderPreview.cpp \
 	insets/Inset.cpp \
+	insets/InsetArgument.cpp \
 	insets/InsetBibitem.cpp \
 	insets/InsetBibtex.cpp \
 	insets/InsetBox.cpp \
@@ -506,6 +585,8 @@ SOURCEFILESINSETS = \
 	insets/InsetInclude.cpp \
 	insets/InsetIndex.cpp \
 	insets/InsetInfo.cpp \
+	insets/InsetIPA.cpp \
+	insets/InsetIPAMacro.cpp \
 	insets/InsetLabel.cpp \
 	insets/InsetLayout.cpp \
 	insets/InsetLine.cpp \
@@ -516,9 +597,12 @@ SOURCEFILESINSETS = \
 	insets/InsetNewpage.cpp \
 	insets/InsetNomencl.cpp \
 	insets/InsetNote.cpp \
-	insets/InsetOptArg.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 \
@@ -536,6 +620,7 @@ HEADERFILESINSETS = \
 	insets/RenderGraphic.h \
 	insets/RenderPreview.h \
 	insets/Inset.h \
+	insets/InsetArgument.h \
 	insets/InsetBibitem.h \
 	insets/InsetBibtex.h \
 	insets/InsetBox.h \
@@ -559,6 +644,9 @@ HEADERFILESINSETS = \
 	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 \
@@ -569,9 +657,11 @@ HEADERFILESINSETS = \
 	insets/InsetNewpage.h \
 	insets/InsetNomencl.h \
 	insets/InsetNote.h \
-	insets/InsetOptArg.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 \
@@ -593,10 +683,76 @@ if MONOLITHIC_INSETS
 BUILT_SOURCES += lyxinsets.cpp
 CLEANFILES += lyxinsets.cpp
 
-liblyxinsets_la_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
+liblyxinsets_a_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
 
 else
 
-liblyxinsets_la_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
+liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
 
 endif
+
+
+############################## Tests ##################################
+
+EXTRA_DIST += \
+	tests/test_ExternalTransforms \
+	tests/regfiles/ExternalTransforms \
+	tests/test_layout
+
+TESTS = tests/test_ExternalTransforms
+
+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_layout
+
+if INSTALL_MACOSX
+ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework ApplicationServices
+endif
+
+check_layout_CPPFLAGS = $(AM_CPPFLAGS)
+check_layout_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_LIB) $(LIBSHLWAPI)
+check_layout_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_layout_SOURCES = \
+	insets/InsetLayout.cpp \
+	Color.cpp \
+	Counters.cpp \
+	Floating.cpp \
+	FloatList.cpp \
+	FontInfo.cpp \
+	Layout.cpp \
+	LayoutFile.cpp \
+	Lexer.cpp \
+	ModuleList.cpp \
+	Spacing.cpp \
+	TextClass.cpp \
+	tests/check_layout.cpp \
+	tests/boost.cpp \
+	tests/dummy_functions.cpp
+
+check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS)
+check_ExternalTransforms_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_LIB) $(LIBSHLWAPI)
+check_ExternalTransforms_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_ExternalTransforms_SOURCES = \
+	graphics/GraphicsParams.cpp \
+	insets/ExternalTransforms.cpp \
+	Length.cpp \
+	lengthcommon.cpp \
+	tests/check_ExternalTransforms.cpp \
+	tests/boost.cpp \
+	tests/dummy_functions.cpp
+
+.PHONY: alltests alltests-recursive updatetests