X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FMakefile.am;h=86a90bb2bba225910c80d73020800167c981b4a5;hb=26ba2a65838731ce639a09539f617cb0f0be3b22;hp=57f66d90701187c78bf74056d280cc2b3f13af0b;hpb=fddaa6adebcb78a513dfb401711b0ea04d70d8f9;p=lyx.git diff --git a/src/Makefile.am b/src/Makefile.am index 57f66d9070..86a90bb2bb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,14 +4,14 @@ include $(top_srcdir)/config/common.am AM_CPPFLAGS += -I$(top_srcdir)/src AM_CPPFLAGS += $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES) -AM_CPPFLAGS += $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) -AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_CORE_INCLUDES) +AM_CPPFLAGS += $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) $(MYTHES_INCLUDES) +AM_CPPFLAGS += $(NOD_INCLUDES) $(QT_CPPFLAGS) $(QT_CORE_INCLUDES) if BUILD_CLIENT_SUBDIR CLIENT = client endif -SUBDIRS = support frontends . $(CLIENT) tex2lyx +SUBDIRS = support frontends . $(CLIENT) tex2lyx convert EXTRA_DIST = lyx_commit_hash.h.in \ CMakeLists.txt \ @@ -20,39 +20,40 @@ EXTRA_DIST = lyx_commit_hash.h.in \ mathed/CMakeLists.txt \ tests/CMakeLists.txt -OTHERLIBS = $(BOOST_LIBS) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \ +OTHERLIBS = $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \ @LIBS@ $(ICONV_LIBS) $(ZLIB_LIBS) $(SOCKET_LIBS) \ $(LIBSHLWAPI) $(LIBPSAPI) noinst_LIBRARIES = liblyxcore.a bin_PROGRAMS = lyx +lyx_LDFLAGS = $(AM_LDFLAGS) $(QT_LDFLAGS) + lyx_LDADD = \ liblyxcore.a \ liblyxmathed.a \ liblyxinsets.a \ frontends/liblyxfrontends.a \ - frontends/qt4/liblyxqt4.a \ + frontends/qt/liblyxqt.a \ liblyxgraphics.a \ support/liblyxsupport.a \ $(OTHERLIBS) \ - $(QT_LDFLAGS) \ $(QT_LIB) if LYX_WIN_RESOURCE .rc.o: - cp $(top_srcdir)/development/Win32/packaging/icons/lyx_*32x32.ico . - $(WINDRES) -I$(top_builddir) --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 if INSTALL_MACOSX -lyx_LDFLAGS = -framework AppKit -framework ApplicationServices \ +lyx_LDFLAGS += -framework AppKit -framework ApplicationServices \ -Wl,-rpath,@loader_path/../Frameworks \ - -Wl,-rpath,@executable_path/../Frameworks + -Wl,-rpath,@executable_path/../Frameworks \ + -Wl,-headerpad_max_install_names endif -#lyx_LDFLAGS=-Wl,-O1 - if INSTALL_MACOSX APPLESPELL = AppleSpellChecker.cpp AppleSpellChecker.h endif @@ -72,10 +73,6 @@ 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 \ $(APPLESPELL) \ @@ -93,8 +90,6 @@ lyx_SOURCES = \ $(PWL) \ LaTeXFonts.cpp \ LaTeXFonts.h \ - PrinterParams.cpp \ - PrinterParams.h \ Thesaurus.cpp \ Thesaurus.h @@ -114,6 +109,7 @@ SOURCEFILESCORE = \ Bullet.cpp \ Changes.cpp \ Chktex.cpp \ + CiteEnginesList.cpp \ CmdDef.cpp \ Color.cpp \ ConverterCache.cpp \ @@ -139,7 +135,6 @@ SOURCEFILESCORE = \ FuncRequest.cpp \ FuncStatus.cpp \ Graph.cpp \ - HSpace.cpp \ IndicesList.cpp \ InsetIterator.cpp \ InsetList.cpp \ @@ -152,8 +147,6 @@ SOURCEFILESCORE = \ LaTeXPackages.cpp \ LayoutFile.cpp \ LayoutModuleList.cpp \ - Length.cpp \ - lengthcommon.cpp \ Lexer.cpp \ LyX.cpp \ LyXAction.cpp \ @@ -178,17 +171,16 @@ SOURCEFILESCORE = \ RowPainter.cpp \ Server.cpp \ ServerSocket.cpp \ - sgml.cpp \ + xml.cpp \ Session.cpp \ Spacing.cpp \ TexRow.cpp \ texstream.cpp \ Text.cpp \ - Text2.cpp \ - Text3.cpp \ TextClass.cpp \ TextMetrics.cpp \ TocBackend.cpp \ + TocBuilder.cpp \ Trans.cpp \ Undo.cpp \ VCBackend.cpp \ @@ -207,6 +199,7 @@ HEADERFILESCORE = \ BufferView.h \ Bullet.h \ Citation.h \ + CiteEnginesList.h \ Changes.h \ Chktex.h \ CmdDef.h \ @@ -240,7 +233,6 @@ HEADERFILESCORE = \ FuncRequest.h \ FuncStatus.h \ Graph.h \ - HSpace.h \ IndicesList.h \ InsetIterator.h \ InsetList.h \ @@ -255,7 +247,6 @@ HEADERFILESCORE = \ LayoutEnums.h \ LayoutFile.h \ LayoutModuleList.h \ - Length.h \ Lexer.h \ LyXAction.h \ lyxfind.h \ @@ -280,11 +271,12 @@ HEADERFILESCORE = \ ParIterator.h \ PDFOptions.h \ Row.h \ + RowFlags.h \ RowPainter.h \ Server.h \ ServerSocket.h \ Session.h \ - sgml.h \ + xml.h \ Spacing.h \ SpellChecker.h \ TexRow.h \ @@ -294,6 +286,7 @@ HEADERFILESCORE = \ TextMetrics.h \ Toc.h \ TocBackend.h \ + TocBuilder.h \ Trans.h \ Undo.h \ update_flags.h \ @@ -309,14 +302,14 @@ STANDALONEFILES = \ .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 = +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 = 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` ; \ + $(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 @@ -326,21 +319,8 @@ lyx_commit_hash.h: update_commit_hash BUILT_SOURCES = lyx_commit_hash.h CLEANFILES = lyx_commit_hash.h -lyxcore.cpp: - $(AM_V_GEN)for file in $(SOURCEFILESCORE) ; do echo '#include "'$${file}'"' ; done >$@ - -if MONOLITHIC_CORE - -BUILT_SOURCES += lyxcore.cpp $(STANDALONEFILES) -CLEANFILES += lyxcore.cpp - -liblyxcore_a_SOURCES = lyxcore.cpp $(STANDALONEFILES) $(HEADERFILESCORE) - -else - liblyxcore_a_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE) -endif ######################### Qt stuff ############################## @@ -396,7 +376,6 @@ liblyxgraphics_a_SOURCES = \ noinst_LIBRARIES += liblyxmathed.a SOURCEFILESMATHED = \ - mathed/CommandInset.cpp \ mathed/InsetMathAMSArray.cpp \ mathed/InsetMathArray.cpp \ mathed/InsetMathBig.cpp \ @@ -404,13 +383,18 @@ 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/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 \ @@ -425,8 +409,9 @@ SOURCEFILESMATHED = \ mathed/InsetMathKern.cpp \ mathed/InsetMathLefteqn.cpp \ mathed/InsetMathLim.cpp \ - mathed/InsetMathCancel.cpp \ - mathed/InsetMathCancelto.cpp \ + mathed/InsetMathMacro.cpp \ + mathed/InsetMathMacroArgument.cpp \ + mathed/InsetMathMacroTemplate.cpp \ mathed/InsetMathMatrix.cpp \ mathed/InsetMathNest.cpp \ mathed/InsetMathNumber.cpp \ @@ -447,27 +432,25 @@ SOURCEFILESMATHED = \ mathed/InsetMathSubstack.cpp \ mathed/InsetMathSymbol.cpp \ mathed/InsetMathTabular.cpp \ + mathed/InsetMathTextsize.cpp \ mathed/InsetMathUnderset.cpp \ mathed/InsetMathUnknown.cpp \ mathed/InsetMathXArrow.cpp \ mathed/InsetMathXYMatrix.cpp \ - mathed/InsetMathDiagram.cpp \ + mathed/MacroTable.cpp \ mathed/MathAtom.cpp \ mathed/MathAutoCorrect.cpp \ + mathed/MathClass.cpp \ mathed/MathData.cpp \ mathed/MathExtern.cpp \ mathed/MathFactory.cpp \ - mathed/MathMacro.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 HEADERFILESMATHED = \ - mathed/CommandInset.h \ mathed/InsetMathAMSArray.h \ mathed/InsetMathArray.h \ mathed/InsetMathBig.h \ @@ -478,7 +461,9 @@ HEADERFILESMATHED = \ mathed/InsetMathCancelto.h \ mathed/InsetMathCases.h \ mathed/InsetMathChar.h \ + mathed/InsetMathClass.h \ mathed/InsetMathColor.h \ + mathed/InsetMathCommand.h \ mathed/InsetMathComment.h \ mathed/InsetMathDelim.h \ mathed/InsetMathDiff.h \ @@ -496,6 +481,9 @@ HEADERFILESMATHED = \ mathed/InsetMathKern.h \ mathed/InsetMathLefteqn.h \ mathed/InsetMathLim.h \ + mathed/InsetMathMacro.h \ + mathed/InsetMathMacroArgument.h \ + mathed/InsetMathMacroTemplate.h \ mathed/InsetMathMatrix.h \ mathed/InsetMathNest.h \ mathed/InsetMathNumber.h \ @@ -516,6 +504,7 @@ HEADERFILESMATHED = \ mathed/InsetMathSubstack.h \ mathed/InsetMathSymbol.h \ mathed/InsetMathTabular.h \ + mathed/InsetMathTextsize.h \ mathed/InsetMathUnderset.h \ mathed/InsetMathUnknown.h \ mathed/InsetMathXArrow.h \ @@ -523,36 +512,22 @@ HEADERFILESMATHED = \ 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/MathMacro.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 -lyxmathed.cpp: - $(AM_V_GEN)for file in $(SOURCEFILESMATHED) ; do echo '#include "'$${file}'"' ; done >$@ - -if MONOLITHIC_MATHED - -BUILT_SOURCES += lyxmathed.cpp -CLEANFILES += lyxmathed.cpp - -liblyxmathed_a_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED) - -else - liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED) -endif ############################### Insets ############################## @@ -574,9 +549,10 @@ SOURCEFILESINSETS = \ insets/InsetCaption.cpp \ insets/InsetCaptionable.cpp \ insets/InsetCitation.cpp \ - insets/InsetCollapsable.cpp \ + insets/InsetCollapsible.cpp \ insets/InsetCommand.cpp \ insets/InsetCommandParams.cpp \ + insets/InsetCounter.cpp \ insets/InsetERT.cpp \ insets/InsetExternal.cpp \ insets/InsetFlex.cpp \ @@ -589,6 +565,7 @@ SOURCEFILESINSETS = \ insets/InsetHyperlink.cpp \ insets/InsetInclude.cpp \ insets/InsetIndex.cpp \ + insets/InsetIndexMacro.cpp \ insets/InsetInfo.cpp \ insets/InsetIPA.cpp \ insets/InsetIPAMacro.cpp \ @@ -634,9 +611,10 @@ HEADERFILESINSETS = \ 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/InsetExternal.h \ insets/InsetFlex.h \ @@ -649,6 +627,7 @@ HEADERFILESINSETS = \ insets/InsetHyperlink.h \ insets/InsetInclude.h \ insets/InsetIndex.h \ + insets/InsetIndexMacro.h \ insets/InsetInfo.h \ insets/InsetIPA.h \ insets/InsetIPAMacro.h \ @@ -676,40 +655,24 @@ HEADERFILESINSETS = \ insets/InsetVSpace.h \ insets/InsetWrap.h -# insets/InsetList.cpp \ -# insets/InsetList.h \ -# insets/InsetSection.h \ -# insets/InsetSection.cpp - -lyxinsets.cpp: - $(AM_V_GEN)for file in $(SOURCEFILESINSETS) ; do echo '#include "'$${file}'"' ; done >$@ - -if MONOLITHIC_INSETS - -BUILT_SOURCES += lyxinsets.cpp -CLEANFILES += lyxinsets.cpp - -liblyxinsets_a_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS) - -else - liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS) -endif - ############################## 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/test_layout \ - tests/test_Length + tests/dummy_functions.cpp \ + tests/boost.cpp -TESTS = tests/test_ExternalTransforms tests/test_Length tests/test_ListingsCaption +TESTS = tests/test_ExternalTransforms tests/test_ListingsCaption \ + tests/test_layout tests/test_Length alltests: check alltests-recursive @@ -735,58 +698,58 @@ 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@ \ +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 = \ - 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 + 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 = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ \ - $(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI) +check_ExternalTransforms_LDADD = $(check_ExternalTransforms_LYX_OBJS) $(TESTS_LIBS) 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 + 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 = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ \ - $(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI) +check_Length_LDADD = $(TESTS_LIBS) 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 + tests/dummy_functions.cpp \ + tests/boost.cpp check_ListingsCaption_CPPFLAGS = $(AM_CPPFLAGS) -check_ListingsCaption_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ \ - $(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI) +check_ListingsCaption_LDADD = $(check_ListingsCaption_LYX_OBJS) $(TESTS_LIBS) check_ListingsCaption_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS) check_ListingsCaption_SOURCES = \ tests/check_ListingsCaption.cpp \ - tests/boost.cpp \ - tests/dummy_functions.cpp + tests/dummy_functions.cpp \ + tests/boost.cpp +check_ListingsCaption_LYX_OBJS = .PHONY: alltests alltests-recursive updatetests