X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=9446d17be269d5a3025d5737021f9c0a7ff744c5;hb=21e4e939be5e7f02ca1fc1c25b1fd15caf60ae6d;hp=d4f233b5f95d93a59f87ab40f99794edd1d7b52f;hpb=1141ccb99765cec9a0c8e04ce7c22d7c1e634216;p=lyx.git diff --git a/src/Makefile.am b/src/Makefile.am index d4f233b5f9..9446d17be2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,10 +2,8 @@ include $(top_srcdir)/config/common.am ############################### Core ############################## -DISTCLEANFILES += config.h libintl.h - -AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) -AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) +AM_CPPFLAGS += -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) +AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_CORE_INCLUDES) if BUILD_CLIENT_SUBDIR CLIENT = client @@ -13,15 +11,15 @@ endif SUBDIRS = support frontends . $(CLIENT) tex2lyx -EXTRA_DIST = 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) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \ - @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) +OTHERLIBS = $(BOOST_LIBS) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \ + @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI) noinst_LIBRARIES = liblyxcore.a bin_PROGRAMS = lyx @@ -35,8 +33,8 @@ lyx_LDADD = \ liblyxgraphics.a \ support/liblyxsupport.a \ $(OTHERLIBS) \ - $(QT4_LDFLAGS) \ - $(QT4_LIB) + $(QT_LDFLAGS) \ + $(QT_LIB) if LYX_WIN_RESOURCE .rc.o: @@ -44,12 +42,31 @@ if LYX_WIN_RESOURCE windres -I$(top_builddir) --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@ endif +if INSTALL_MACOSX +lyx_LDFLAGS = -framework AppKit -framework ApplicationServices \ + -Wl,-rpath,@loader_path/../Frameworks \ + -Wl,-rpath,@executable_path/../Frameworks +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_ENCHANT +ENCHANT = EnchantChecker.cpp EnchantChecker.h +PWL = PersonalWordList.cpp PersonalWordList.h +endif + +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 @@ -58,13 +75,21 @@ endif # and in fact libtools seems not able to do that. lyx_SOURCES = \ main.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 \ @@ -76,7 +101,6 @@ endif SOURCEFILESCORE = \ Author.cpp \ - Bidi.cpp \ boost.cpp \ BranchList.cpp \ Buffer.cpp \ @@ -99,6 +123,7 @@ SOURCEFILESCORE = \ DepTable.cpp \ DocIterator.cpp \ Encoding.cpp \ + BufferEncodings.cpp \ ErrorList.cpp \ Exporter.cpp \ factory.cpp \ @@ -111,6 +136,8 @@ SOURCEFILESCORE = \ FuncRequest.cpp \ FuncStatus.cpp \ Graph.cpp \ + HSpace.cpp \ + IndicesList.cpp \ InsetIterator.cpp \ InsetList.cpp \ Intl.cpp \ @@ -119,6 +146,7 @@ SOURCEFILESCORE = \ Language.cpp \ LaTeX.cpp \ LaTeXFeatures.cpp \ + LaTeXPackages.cpp \ LayoutFile.cpp \ LayoutModuleList.cpp \ Length.cpp \ @@ -127,7 +155,6 @@ SOURCEFILESCORE = \ LyX.cpp \ LyXAction.cpp \ lyxfind.cpp \ - LyXFunc.cpp \ LyXRC.cpp \ LyXVC.cpp \ MetricsInfo.cpp \ @@ -136,26 +163,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 \ @@ -168,10 +195,10 @@ SOURCEFILESCORE = \ HEADERFILESCORE = \ Author.h \ - Bidi.h \ BranchList.h \ buffer_funcs.h \ Buffer.h \ + BufferEncodings.h \ BufferList.h \ BufferParams.h \ BufferView.h \ @@ -194,6 +221,7 @@ HEADERFILESCORE = \ DepTable.h \ DispatchResult.h \ DocIterator.h \ + DocumentClassPtr.h \ Encoding.h \ ErrorList.h \ Exporter.h \ @@ -209,6 +237,8 @@ HEADERFILESCORE = \ FuncRequest.h \ FuncStatus.h \ Graph.h \ + HSpace.h \ + IndicesList.h \ InsetIterator.h \ InsetList.h \ Intl.h \ @@ -216,6 +246,7 @@ HEADERFILESCORE = \ KeySequence.h \ Language.h \ LaTeXFeatures.h \ + LaTeXPackages.h \ LaTeX.h \ Layout.h \ LayoutEnums.h \ @@ -225,7 +256,6 @@ HEADERFILESCORE = \ Lexer.h \ LyXAction.h \ lyxfind.h \ - LyXFunc.h \ LyX.h \ LyXRC.h \ LyXVC.h \ @@ -234,11 +264,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 \ @@ -246,7 +277,7 @@ HEADERFILESCORE = \ ParIterator.h \ PDFOptions.h \ Row.h \ - rowpainter.h \ + RowPainter.h \ Server.h \ ServerSocket.h \ Session.h \ @@ -254,7 +285,7 @@ HEADERFILESCORE = \ Spacing.h \ SpellChecker.h \ TexRow.h \ - TexStream.h \ + texstream.h \ Text.h \ TextClass.h \ TextMetrics.h \ @@ -272,6 +303,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' > $@ @@ -288,11 +338,37 @@ liblyxcore_a_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE) endif +######################### 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_LIBRARIES += liblyxgraphics.a liblyxgraphics_a_SOURCES = \ + graphics/epstools.h \ + graphics/epstools.cpp \ graphics/GraphicsCache.h \ graphics/GraphicsCache.cpp \ graphics/GraphicsCacheItem.h \ @@ -308,18 +384,15 @@ liblyxgraphics_a_SOURCES = \ 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_LIBRARIES += liblyxmathed.a SOURCEFILESMATHED = \ + mathed/CommandInset.cpp \ mathed/InsetMathAMSArray.cpp \ mathed/InsetMathArray.cpp \ mathed/InsetMathBig.cpp \ @@ -330,7 +403,6 @@ SOURCEFILESMATHED = \ mathed/InsetMathCases.cpp \ mathed/InsetMathChar.cpp \ mathed/InsetMathColor.cpp \ - mathed/CommandInset.cpp \ mathed/InsetMathComment.cpp \ mathed/InsetMathDecoration.cpp \ mathed/InsetMathDecoration.h \ @@ -349,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 \ @@ -359,6 +432,7 @@ SOURCEFILESMATHED = \ mathed/InsetMathRef.cpp \ mathed/InsetMathRoot.cpp \ mathed/InsetMathScript.cpp \ + mathed/InsetMathSideset.cpp \ mathed/InsetMathSize.cpp \ mathed/InsetMathSpace.cpp \ mathed/InsetMathSpecialChar.cpp \ @@ -373,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 \ @@ -387,16 +463,18 @@ 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 \ @@ -414,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 \ @@ -424,6 +501,7 @@ HEADERFILESMATHED = \ mathed/InsetMathRef.h \ mathed/InsetMathRoot.h \ mathed/InsetMathScript.h \ + mathed/InsetMathSideset.h \ mathed/InsetMathSize.h \ mathed/InsetMathSpace.h \ mathed/InsetMathSpecialChar.h \ @@ -438,13 +516,14 @@ 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 \ @@ -453,7 +532,7 @@ HEADERFILESMATHED = \ mathed/ReplaceData.h \ mathed/MathStream.h \ mathed/MathSupport.h \ - mathed/TextPainter.h + mathed/TextPainter.h lyxmathed.cpp: @echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@ @@ -467,7 +546,7 @@ liblyxmathed_a_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED) else -liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED) +liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED) endif @@ -483,11 +562,13 @@ 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/InsetCommand.cpp \ @@ -505,6 +586,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 \ @@ -515,10 +598,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,11 +621,13 @@ 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 \ @@ -559,6 +646,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,10 +659,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 \ @@ -601,3 +692,93 @@ else liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS) endif + + +############################## Tests ################################## + +EXTRA_DIST += \ + tests/test_ExternalTransforms \ + tests/test_ListingsCaption \ + tests/regfiles/ExternalTransforms \ + tests/regfiles/Length \ + tests/regfiles/ListingsCaption \ + tests/test_layout \ + tests/test_Length + +TESTS = tests/test_ExternalTransforms tests/test_Length tests/test_ListingsCaption + +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 + +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 + +check_Length_CPPFLAGS = $(AM_CPPFLAGS) +check_Length_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_LIB) $(LIBSHLWAPI) +check_Length_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS) +check_Length_SOURCES = \ + Length.cpp \ + lengthcommon.cpp \ + tests/check_Length.cpp \ + tests/boost.cpp \ + tests/dummy_functions.cpp + +check_ListingsCaption_CPPFLAGS = $(AM_CPPFLAGS) +check_ListingsCaption_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_LIB) $(LIBSHLWAPI) +check_ListingsCaption_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS) +check_ListingsCaption_SOURCES = \ + tests/check_ListingsCaption.cpp \ + tests/boost.cpp \ + tests/dummy_functions.cpp + +.PHONY: alltests alltests-recursive updatetests