############################### Core ##############################
-DISTCLEANFILES += config.h libintl.h
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
+AM_CPPFLAGS += $(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 tex2lyx client .
+SUBDIRS = support frontends . $(CLIENT) tex2lyx
-EXTRA_DIST = config.h.in \
- Section.h \
- Section.cpp \
- Variables.cpp \
- Variables.h \
- paper.h \
- pch.h
+EXTRA_DIST = 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
# 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 \
SOURCEFILESCORE = \
Author.cpp \
- BiblioInfo.cpp \
Bidi.cpp \
boost.cpp \
BranchList.cpp \
CutAndPaste.cpp \
DepTable.cpp \
DocIterator.cpp \
- EmbeddedFiles.cpp \
Encoding.cpp \
+ BufferEncodings.cpp \
ErrorList.cpp \
Exporter.cpp \
factory.cpp \
FuncRequest.cpp \
FuncStatus.cpp \
Graph.cpp \
+ HSpace.cpp \
+ IndicesList.cpp \
InsetIterator.cpp \
InsetList.cpp \
Intl.cpp \
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 \
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 \
Text.cpp \
Text2.cpp \
Text3.cpp \
- TexStream.cpp \
TextClass.cpp \
TextMetrics.cpp \
TocBackend.cpp \
- ToolbarBackend.cpp \
Trans.cpp \
Undo.cpp \
VCBackend.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 \
Changes.h \
Chktex.h \
CmdDef.h \
ColorCode.h \
Color.h \
+ ColorSet.h \
CompletionList.h \
- config.h.in \
ConverterCache.h \
Converter.h \
CoordCache.h \
DepTable.h \
DispatchResult.h \
DocIterator.h \
- EmbeddedFiles.h \
+ DocumentClassPtr.h \
Encoding.h \
ErrorList.h \
Exporter.h \
FuncRequest.h \
FuncStatus.h \
Graph.h \
+ HSpace.h \
+ IndicesList.h \
InsetIterator.h \
InsetList.h \
Intl.h \
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 \
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 \
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 \
Text.h \
TextClass.h \
TextMetrics.h \
TocBackend.h \
- ToolbarBackend.h \
Trans.h \
Undo.h \
update_flags.h \
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
+ $(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 \
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 \
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 \
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 \
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 \
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 \
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 \
mathed/InsetMathKern.h \
mathed/InsetMathLefteqn.h \
mathed/InsetMathLim.h \
- mathed/MathMacro.h \
mathed/InsetMathMatrix.h \
mathed/InsetMathNest.h \
mathed/InsetMathNumber.h \
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 \
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' > $@
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 \
insets/RenderGraphic.cpp \
insets/RenderPreview.cpp \
insets/Inset.cpp \
+ insets/InsetArgument.cpp \
insets/InsetBibitem.cpp \
insets/InsetBibtex.cpp \
insets/InsetBox.cpp \
insets/InsetCollapsable.cpp \
insets/InsetCommand.cpp \
insets/InsetCommandParams.cpp \
- insets/InsetEnvironment.cpp \
insets/InsetERT.cpp \
insets/InsetExternal.cpp \
insets/InsetFlex.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/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 \
insets/RenderGraphic.h \
insets/RenderPreview.h \
insets/Inset.h \
+ insets/InsetArgument.h \
insets/InsetBibitem.h \
insets/InsetBibtex.h \
insets/InsetBox.h \
insets/InsetCommand.h \
insets/InsetCommandParams.h \
insets/InsetERT.h \
- insets/InsetEnvironment.h \
insets/InsetExternal.h \
insets/InsetFlex.h \
insets/InsetFloat.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 \
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 \
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_layout CMakeLists.txt
+
+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_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_CORE_LIBS) $(LIBSHLWAPI)
+check_layout_LDFLAGS = $(QT_CORE_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
+
+.PHONY: alltests alltests-recursive updatetests
projects / lyx.git / blobdiff