X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=5bf8f3bd5e3f19f4c0c18b208fc4a5327425f3a4;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=a43f717d05b21c4ccbb1ee24b5a697ce83d370e1;hpb=21e908b8c49f0b5a7df1eca9b36d2632e0838880;p=lyx.git diff --git a/src/Makefile.am b/src/Makefile.am index a43f717d05..5bf8f3bd5e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,9 @@ include $(top_srcdir)/config/common.am ############################### Core ############################## -AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) +AM_CPPFLAGS += -I$(top_srcdir)/src +AM_CPPFLAGS += $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES) +AM_CPPFLAGS += $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) $(MYTHES_INCLUDES) AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_CORE_INCLUDES) if BUILD_CLIENT_SUBDIR @@ -12,7 +14,6 @@ endif SUBDIRS = support frontends . $(CLIENT) tex2lyx EXTRA_DIST = lyx_commit_hash.h.in \ - pch.h \ CMakeLists.txt \ graphics/CMakeLists.txt \ insets/CMakeLists.txt \ @@ -20,7 +21,8 @@ EXTRA_DIST = lyx_commit_hash.h.in \ tests/CMakeLists.txt OTHERLIBS = $(BOOST_LIBS) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \ - @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI) + @LIBS@ $(ICONV_LIBS) $(ZLIB_LIBS) $(SOCKET_LIBS) \ + $(LIBSHLWAPI) $(LIBPSAPI) noinst_LIBRARIES = liblyxcore.a bin_PROGRAMS = lyx @@ -40,17 +42,15 @@ lyx_LDADD = \ 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 $@ + $(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 endif -#lyx_LDFLAGS=-Wl,-O1 - -BUILT_SOURCES = $(PCH_FILE) - if INSTALL_MACOSX APPLESPELL = AppleSpellChecker.cpp AppleSpellChecker.h endif @@ -70,10 +70,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) \ @@ -102,7 +98,6 @@ endif SOURCEFILESCORE = \ Author.cpp \ - Bidi.cpp \ boost.cpp \ BranchList.cpp \ Buffer.cpp \ @@ -113,6 +108,7 @@ SOURCEFILESCORE = \ Bullet.cpp \ Changes.cpp \ Chktex.cpp \ + CiteEnginesList.cpp \ CmdDef.cpp \ Color.cpp \ ConverterCache.cpp \ @@ -138,7 +134,6 @@ SOURCEFILESCORE = \ FuncRequest.cpp \ FuncStatus.cpp \ Graph.cpp \ - HSpace.cpp \ IndicesList.cpp \ InsetIterator.cpp \ InsetList.cpp \ @@ -188,6 +183,7 @@ SOURCEFILESCORE = \ TextClass.cpp \ TextMetrics.cpp \ TocBackend.cpp \ + TocBuilder.cpp \ Trans.cpp \ Undo.cpp \ VCBackend.cpp \ @@ -197,7 +193,6 @@ SOURCEFILESCORE = \ HEADERFILESCORE = \ Author.h \ - Bidi.h \ BranchList.h \ buffer_funcs.h \ Buffer.h \ @@ -207,6 +202,7 @@ HEADERFILESCORE = \ BufferView.h \ Bullet.h \ Citation.h \ + CiteEnginesList.h \ Changes.h \ Chktex.h \ CmdDef.h \ @@ -240,7 +236,6 @@ HEADERFILESCORE = \ FuncRequest.h \ FuncStatus.h \ Graph.h \ - HSpace.h \ IndicesList.h \ InsetIterator.h \ InsetList.h \ @@ -292,7 +287,9 @@ HEADERFILESCORE = \ Text.h \ TextClass.h \ TextMetrics.h \ + Toc.h \ TocBackend.h \ + TocBuilder.h \ Trans.h \ Undo.h \ update_flags.h \ @@ -322,18 +319,19 @@ update_commit_hash: lyx_commit_hash.h: update_commit_hash -BUILT_SOURCES += lyx_commit_hash.h -CLEANFILES += lyx_commit_hash.h +BUILT_SOURCES = lyx_commit_hash.h +CLEANFILES = lyx_commit_hash.h lyxcore.cpp: - @echo -e '$(SOURCEFILESCORE:%=\n#include "%")\n' > $@ + $(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) +nodist_liblyxcore_a_SOURCES = lyxcore.cpp +liblyxcore_a_SOURCES = $(STANDALONEFILES) $(HEADERFILESCORE) else @@ -403,8 +401,11 @@ 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/InsetMathComment.cpp \ mathed/InsetMathDecoration.cpp \ @@ -424,8 +425,6 @@ SOURCEFILESMATHED = \ mathed/InsetMathKern.cpp \ mathed/InsetMathLefteqn.cpp \ mathed/InsetMathLim.cpp \ - mathed/InsetMathCancel.cpp \ - mathed/InsetMathCancelto.cpp \ mathed/InsetMathMatrix.cpp \ mathed/InsetMathNest.cpp \ mathed/InsetMathNumber.cpp \ @@ -451,16 +450,18 @@ SOURCEFILESMATHED = \ 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 @@ -477,6 +478,7 @@ HEADERFILESMATHED = \ mathed/InsetMathCancelto.h \ mathed/InsetMathCases.h \ mathed/InsetMathChar.h \ + mathed/InsetMathClass.h \ mathed/InsetMathColor.h \ mathed/InsetMathComment.h \ mathed/InsetMathDelim.h \ @@ -522,6 +524,7 @@ HEADERFILESMATHED = \ mathed/InsetMathDiagram.h \ mathed/MathAtom.h \ mathed/MathAutoCorrect.h \ + mathed/MathClass.h \ mathed/MathData.h \ mathed/MathCompletionList.h \ mathed/MathExtern.h \ @@ -532,20 +535,22 @@ HEADERFILESMATHED = \ 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: - @echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@ + $(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) +nodist_liblyxmathed_a_SOURCES = lyxmathed.cpp +liblyxmathed_a_SOURCES = $(HEADERFILESMATHED) else @@ -571,6 +576,7 @@ SOURCEFILESINSETS = \ insets/InsetBox.cpp \ insets/InsetBranch.cpp \ insets/InsetCaption.cpp \ + insets/InsetCaptionable.cpp \ insets/InsetCitation.cpp \ insets/InsetCollapsable.cpp \ insets/InsetCommand.cpp \ @@ -629,6 +635,7 @@ HEADERFILESINSETS = \ insets/InsetBox.h \ insets/InsetBranch.h \ insets/InsetCaption.h \ + insets/InsetCaptionable.h \ insets/InsetCitation.h \ insets/InsetCode.h \ insets/InsetCollapsable.h \ @@ -673,20 +680,16 @@ HEADERFILESINSETS = \ insets/InsetVSpace.h \ insets/InsetWrap.h -# insets/InsetList.cpp \ -# insets/InsetList.h \ -# insets/InsetSection.h \ -# insets/InsetSection.cpp - lyxinsets.cpp: - @echo -e '$(SOURCEFILESINSETS:%=\n#include "%")\n' > $@ + $(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) +nodist_liblyxinsets_a_SOURCES = lyxinsets.cpp +liblyxinsets_a_SOURCES = $(HEADERFILESINSETS) else @@ -699,10 +702,17 @@ endif EXTRA_DIST += \ tests/test_ExternalTransforms \ + tests/test_ListingsCaption \ + tests/test_layout \ + tests/test_Length \ tests/regfiles/ExternalTransforms \ - tests/test_layout + tests/regfiles/Length \ + tests/regfiles/ListingsCaption \ + tests/dummy_functions.cpp \ + tests/boost.cpp -TESTS = tests/test_ExternalTransforms +TESTS = tests/test_ExternalTransforms tests/test_ListingsCaption \ + tests/test_layout tests/test_Length alltests: check alltests-recursive @@ -720,42 +730,71 @@ 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 +TESTS_LIBS = support/liblyxsupport.a \ + $(LIBICONV) $(BOOST_LIBS) @LIBS@ \ + $(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI) + check_layout_CPPFLAGS = $(AM_CPPFLAGS) -check_layout_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_LIB) $(LIBSHLWAPI) +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/check_layout.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 \ + tests/dummy_functions.o \ + tests/boost.o check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS) -check_ExternalTransforms_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @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/check_ExternalTransforms.cpp +check_ExternalTransforms_LYX_OBJS = \ + tests/dummy_functions.o \ + tests/boost.o \ + graphics/GraphicsParams.o \ + insets/ExternalTransforms.o \ + Length.o \ + lengthcommon.o + +check_Length_CPPFLAGS = $(AM_CPPFLAGS) +check_Length_LDADD = $(check_Length_LYX_OBJS) $(TESTS_LIBS) +check_Length_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS) +check_Length_SOURCES = \ + tests/check_Length.cpp +check_Length_LYX_OBJS = \ + tests/dummy_functions.o \ + tests/boost.o \ + Length.o \ + lengthcommon.o + +check_ListingsCaption_CPPFLAGS = $(AM_CPPFLAGS) +check_ListingsCaption_LDADD = $(check_ListingsCaption_LYX_OBJS) $(TESTS_LIBS) +check_ListingsCaption_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS) +check_ListingsCaption_SOURCES = \ + tests/check_ListingsCaption.cpp +check_ListingsCaption_LYX_OBJS = \ + tests/dummy_functions.o \ + tests/boost.o .PHONY: alltests alltests-recursive updatetests