X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=02f0781e3268337fbb708103c6f8547c8d15460d;hb=57b69a5efddf9f3c148007322f00dad6c253a2ed;hp=c1949a7e0aaa30083dac8c27722b03290e4a587d;hpb=72c13323d8c2631adc23d2d23fb12d04e58d2d29;p=lyx.git diff --git a/src/Makefile.am b/src/Makefile.am index c1949a7e0a..02f0781e32 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,8 +2,10 @@ include $(top_srcdir)/config/common.am ############################### Core ############################## -AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) -AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES) +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) if BUILD_CLIENT_SUBDIR CLIENT = client @@ -11,10 +13,16 @@ endif SUBDIRS = support frontends . $(CLIENT) tex2lyx -EXTRA_DIST = 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) $(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 @@ -28,23 +36,21 @@ lyx_LDADD = \ liblyxgraphics.a \ support/liblyxsupport.a \ $(OTHERLIBS) \ - $(QT4_LDFLAGS) \ - $(QT4_LIB) + $(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 $@ + $(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 @@ -64,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) \ @@ -96,7 +98,6 @@ endif SOURCEFILESCORE = \ Author.cpp \ - Bidi.cpp \ boost.cpp \ BranchList.cpp \ Buffer.cpp \ @@ -119,6 +120,7 @@ SOURCEFILESCORE = \ DepTable.cpp \ DocIterator.cpp \ Encoding.cpp \ + BufferEncodings.cpp \ ErrorList.cpp \ Exporter.cpp \ factory.cpp \ @@ -167,17 +169,17 @@ SOURCEFILESCORE = \ 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 \ @@ -190,10 +192,10 @@ SOURCEFILESCORE = \ HEADERFILESCORE = \ Author.h \ - Bidi.h \ BranchList.h \ buffer_funcs.h \ Buffer.h \ + BufferEncodings.h \ BufferList.h \ BufferParams.h \ BufferView.h \ @@ -272,7 +274,7 @@ HEADERFILESCORE = \ ParIterator.h \ PDFOptions.h \ Row.h \ - rowpainter.h \ + RowPainter.h \ Server.h \ ServerSocket.h \ Session.h \ @@ -280,10 +282,11 @@ HEADERFILESCORE = \ Spacing.h \ SpellChecker.h \ TexRow.h \ - TexStream.h \ + texstream.h \ Text.h \ TextClass.h \ TextMetrics.h \ + Toc.h \ TocBackend.h \ Trans.h \ Undo.h \ @@ -298,15 +301,35 @@ 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' > $@ + $(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 @@ -316,7 +339,7 @@ endif ######################### Qt stuff ############################## -MOCHEADER = Compare.h +MOCHEADER = Compare.h PreviewLoader.h if INSTALL_WINDOWS @@ -330,8 +353,11 @@ 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 - $(MOC4) $(MOCFLAG) -o $@ $< + $(AM_V_GEN)$(QT_MOC) $(MOCFLAG) -o $@ $< liblyxcore_a_DEPENDENCIES = $(MOCEDFILES) @@ -508,14 +534,15 @@ HEADERFILESMATHED = \ 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 @@ -541,6 +568,7 @@ SOURCEFILESINSETS = \ insets/InsetBox.cpp \ insets/InsetBranch.cpp \ insets/InsetCaption.cpp \ + insets/InsetCaptionable.cpp \ insets/InsetCitation.cpp \ insets/InsetCollapsable.cpp \ insets/InsetCommand.cpp \ @@ -575,6 +603,7 @@ SOURCEFILESINSETS = \ insets/InsetQuotes.cpp \ insets/InsetRef.cpp \ insets/InsetScript.cpp \ + insets/InsetSeparator.cpp \ insets/InsetSpace.cpp \ insets/InsetSpecialChar.cpp \ insets/InsetTabular.cpp \ @@ -598,6 +627,7 @@ HEADERFILESINSETS = \ insets/InsetBox.h \ insets/InsetBranch.h \ insets/InsetCaption.h \ + insets/InsetCaptionable.h \ insets/InsetCitation.h \ insets/InsetCode.h \ insets/InsetCollapsable.h \ @@ -633,6 +663,7 @@ HEADERFILESINSETS = \ insets/InsetQuotes.h \ insets/InsetRef.h \ insets/InsetScript.h \ + insets/InsetSeparator.h \ insets/InsetSpace.h \ insets/InsetSpecialChar.h \ insets/InsetTabular.h \ @@ -641,20 +672,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 @@ -666,7 +693,15 @@ endif ############################## Tests ################################## EXTRA_DIST += \ - tests/test_layout + 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 @@ -683,6 +718,9 @@ updatetests: cd tex2lyx; $(MAKE) updatetests check_PROGRAMS = \ + check_ExternalTransforms \ + check_Length \ + check_ListingsCaption \ check_layout if INSTALL_MACOSX @@ -690,8 +728,9 @@ ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework endif check_layout_CPPFLAGS = $(AM_CPPFLAGS) -check_layout_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT4_CORE_LIBS) $(LIBSHLWAPI) -check_layout_LDFLAGS = $(QT4_CORE_LDFLAGS) $(ADD_FRAMEWORKS) +check_layout_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ \ + $(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI) +check_layout_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS) check_layout_SOURCES = \ insets/InsetLayout.cpp \ Color.cpp \ @@ -706,7 +745,40 @@ check_layout_SOURCES = \ Spacing.cpp \ TextClass.cpp \ tests/check_layout.cpp \ - support/tests/boost.cpp \ - support/tests/dummy_functions.cpp + tests/boost.cpp \ + tests/dummy_functions.cpp + +check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS) +check_ExternalTransforms_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ \ + $(ICONV_LIBS) $(ZLIB_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@ \ + $(ICONV_LIBS) $(ZLIB_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@ \ + $(ICONV_LIBS) $(ZLIB_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