X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=59a3d1ce9ce61bdb010e8177e4bb6e32ff56b0b2;hb=2420f5ed1e9fe98c6273de3c9d661641aefc011b;hp=ef28719ca8ad3c4b85ae3cf539839bd0bd7f175a;hpb=49094adfa235be49ed197fa2ae8e9e138fe343fe;p=lyx.git diff --git a/src/Makefile.am b/src/Makefile.am index ef28719ca8..59a3d1ce9c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,40 +4,44 @@ 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) +AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) + +if BUILD_CLIENT_SUBDIR +CLIENT = client +endif -SUBDIRS = support frontends . +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) $(LIBSHLWAPI) -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_LDFLAGS) \ $(QT4_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 #lyx_LDFLAGS=-Wl,-O1 @@ -47,12 +51,6 @@ BUILT_SOURCES = $(PCH_FILE) if USE_ASPELL ASPELL = ASpell.cpp ASpell_local.h endif -if USE_PSPELL -PSPELL = PSpell.cpp PSpell.h -endif -if USE_ISPELL -ISPELL = ISpell.cpp ISpell.h -endif # These four objects are linked as object files as they are not # referenced within the core and therefore are not picked up @@ -60,7 +58,9 @@ endif # and in fact libtools seems not able to do that. lyx_SOURCES = \ main.cpp \ - $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \ + $(ASPELL) SpellBase.cpp \ + BiblioInfo.h \ + BiblioInfo.cpp \ Box.cpp \ Box.h \ Dimension.cpp \ @@ -76,7 +76,6 @@ endif SOURCEFILESCORE = \ Author.cpp \ - BiblioInfo.cpp \ Bidi.cpp \ boost.cpp \ BranchList.cpp \ @@ -97,10 +96,8 @@ SOURCEFILESCORE = \ Cursor.cpp \ CursorSlice.cpp \ CutAndPaste.cpp \ - debug.cpp \ DepTable.cpp \ DocIterator.cpp \ - EmbeddedFiles.cpp \ Encoding.cpp \ ErrorList.cpp \ Exporter.cpp \ @@ -108,13 +105,11 @@ SOURCEFILESCORE = \ Floating.cpp \ FloatList.cpp \ FontInfo.cpp \ - FontIterator.cpp \ FontList.cpp \ Font.cpp \ Format.cpp \ FuncRequest.cpp \ FuncStatus.cpp \ - gettext.cpp \ Graph.cpp \ InsetIterator.cpp \ InsetList.cpp \ @@ -124,16 +119,17 @@ SOURCEFILESCORE = \ Language.cpp \ LaTeX.cpp \ LaTeXFeatures.cpp \ + LayoutFile.cpp \ + LayoutModuleList.cpp \ Length.cpp \ lengthcommon.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 \ @@ -144,6 +140,7 @@ SOURCEFILESCORE = \ output_plaintext.cpp \ Paragraph.cpp \ paragraph_funcs.cpp \ + ParagraphMetrics.cpp \ ParagraphParameters.cpp \ ParIterator.cpp \ PDFOptions.cpp \ @@ -159,21 +156,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 \ @@ -182,12 +176,14 @@ HEADERFILESCORE = \ BufferParams.h \ BufferView.h \ Bullet.h \ + Citation.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 +191,9 @@ HEADERFILESCORE = \ Cursor.h \ CursorSlice.h \ CutAndPaste.h \ - debug.h \ DepTable.h \ DispatchResult.h \ DocIterator.h \ - EmbeddedFiles.h \ Encoding.h \ ErrorList.h \ Exporter.h \ @@ -209,12 +203,11 @@ HEADERFILESCORE = \ Font.h \ FontEnums.h \ FontInfo.h \ - FontIterator.h \ FontList.h \ Format.h \ + FuncCode.h \ FuncRequest.h \ FuncStatus.h \ - gettext.h \ Graph.h \ InsetIterator.h \ InsetList.h \ @@ -225,19 +218,17 @@ HEADERFILESCORE = \ LaTeXFeatures.h \ LaTeX.h \ Layout.h \ - LayoutPtr.h \ LayoutEnums.h \ + LayoutFile.h \ + LayoutModuleList.h \ Length.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 \ @@ -266,43 +257,42 @@ 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 -if MONOLITHIC_CORE lyxcore.cpp: @echo -e '$(SOURCEFILESCORE:%=\n#include "%")\n' > $@ +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 ############################### Graphics ############################## -noinst_LTLIBRARIES += liblyxgraphics.la +noinst_LIBRARIES += liblyxgraphics.a -liblyxgraphics_la_SOURCES = \ +liblyxgraphics_a_SOURCES = \ graphics/GraphicsCache.h \ graphics/GraphicsCache.cpp \ graphics/GraphicsCacheItem.h \ @@ -310,15 +300,11 @@ 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 \ @@ -331,7 +317,7 @@ liblyxgraphics_la_SOURCES = \ EXTRA_DIST += mathed/InsetFormulaMacro.cpp -noinst_LTLIBRARIES += liblyxmathed.la +noinst_LIBRARIES += liblyxmathed.a SOURCEFILESMATHED = \ mathed/InsetMathAMSArray.cpp \ @@ -351,6 +337,7 @@ SOURCEFILESMATHED = \ mathed/InsetMathDelim.cpp \ mathed/InsetMathDiff.cpp \ mathed/InsetMathDots.cpp \ + mathed/InsetMathEnsureMath.cpp \ mathed/InsetMathEnv.cpp \ mathed/InsetMathExFunc.cpp \ mathed/InsetMathExInt.cpp \ @@ -374,6 +361,7 @@ SOURCEFILESMATHED = \ mathed/InsetMathScript.cpp \ mathed/InsetMathSize.cpp \ mathed/InsetMathSpace.cpp \ + mathed/InsetMathSpecialChar.cpp \ mathed/InsetMathSplit.cpp \ mathed/InsetMathSqrt.cpp \ mathed/InsetMathStackrel.cpp \ @@ -413,6 +401,7 @@ HEADERFILESMATHED = \ mathed/InsetMathDelim.h \ mathed/InsetMathDiff.h \ mathed/InsetMathDots.h \ + mathed/InsetMathEnsureMath.h \ mathed/InsetMathEnv.h \ mathed/InsetMathExFunc.h \ mathed/InsetMathExInt.h \ @@ -437,6 +426,7 @@ HEADERFILESMATHED = \ mathed/InsetMathScript.h \ mathed/InsetMathSize.h \ mathed/InsetMathSpace.h \ + mathed/InsetMathSpecialChar.h \ mathed/InsetMathSplit.h \ mathed/InsetMathSqrt.h \ mathed/InsetMathStackrel.h \ @@ -451,6 +441,7 @@ HEADERFILESMATHED = \ mathed/MathAtom.h \ mathed/MathAutoCorrect.h \ mathed/MathData.h \ + mathed/MathCompletionList.h \ mathed/MathExtern.h \ mathed/MathFactory.h \ mathed/MathGridInfo.h \ @@ -458,36 +449,33 @@ HEADERFILESMATHED = \ 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 -if MONOLITHIC_MATHED - lyxmathed.cpp: @echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@ +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 - -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 \ @@ -504,7 +492,6 @@ SOURCEFILESINSETS = \ insets/InsetCollapsable.cpp \ insets/InsetCommand.cpp \ insets/InsetCommandParams.cpp \ - insets/InsetEnvironment.cpp \ insets/InsetERT.cpp \ insets/InsetExternal.cpp \ insets/InsetFlex.cpp \ @@ -514,21 +501,22 @@ 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 \ 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/InsetQuotes.cpp \ insets/InsetRef.cpp \ insets/InsetSpace.cpp \ @@ -540,7 +528,6 @@ SOURCEFILESINSETS = \ insets/InsetWrap.cpp HEADERFILESINSETS = \ - insets/MailInset.h \ insets/ExternalSupport.h \ insets/ExternalTemplate.h \ insets/ExternalTransforms.h \ @@ -560,7 +547,6 @@ HEADERFILESINSETS = \ insets/InsetCommand.h \ insets/InsetCommandParams.h \ insets/InsetERT.h \ - insets/InsetEnvironment.h \ insets/InsetExternal.h \ insets/InsetFlex.h \ insets/InsetFloat.h \ @@ -569,7 +555,6 @@ HEADERFILESINSETS = \ insets/InsetFootlike.h \ insets/InsetGraphicsParams.h \ insets/InsetGraphics.h \ - insets/InsetHFill.h \ insets/InsetHyperlink.h \ insets/InsetInclude.h \ insets/InsetIndex.h \ @@ -581,10 +566,11 @@ 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/InsetSpace.h \ @@ -598,21 +584,20 @@ HEADERFILESINSETS = \ # insets/InsetList.cpp \ # insets/InsetList.h \ # insets/InsetSection.h \ -# insets/InsetSection.cpp \ -# insets/InsetTheorem.cpp \ -# insets/InsetTheorem.h - -if MONOLITHIC_INSETS +# insets/InsetSection.cpp lyxinsets.cpp: @echo -e '$(SOURCEFILESINSETS:%=\n#include "%")\n' > $@ +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