X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=02f0781e3268337fbb708103c6f8547c8d15460d;hb=45e3a8f82701e981b1ccb2ab8d76f269867d7889;hp=6df58588d9d8edfbb7c23e2f400e5f2aa128bb9e;hpb=e86cc0135ab6c67938cf097514891ccf33c74e17;p=lyx.git diff --git a/src/Makefile.am b/src/Makefile.am index 6df58588d9..02f0781e32 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) 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 \ @@ -197,7 +192,6 @@ SOURCEFILESCORE = \ HEADERFILESCORE = \ Author.h \ - Bidi.h \ BranchList.h \ buffer_funcs.h \ Buffer.h \ @@ -292,6 +286,7 @@ HEADERFILESCORE = \ Text.h \ TextClass.h \ TextMetrics.h \ + Toc.h \ TocBackend.h \ Trans.h \ Undo.h \ @@ -322,18 +317,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 @@ -343,7 +339,7 @@ endif ######################### Qt stuff ############################## -MOCHEADER = Compare.h +MOCHEADER = Compare.h PreviewLoader.h if INSTALL_WINDOWS @@ -357,6 +353,9 @@ 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 $@ $< @@ -535,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 @@ -568,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 \ @@ -626,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 \ @@ -670,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 @@ -696,10 +694,14 @@ endif EXTRA_DIST += \ tests/test_ExternalTransforms \ + tests/test_ListingsCaption \ tests/regfiles/ExternalTransforms \ - tests/test_layout + tests/regfiles/Length \ + tests/regfiles/ListingsCaption \ + tests/test_layout \ + tests/test_Length -TESTS = tests/test_ExternalTransforms +TESTS = tests/test_ExternalTransforms tests/test_Length tests/test_ListingsCaption alltests: check alltests-recursive @@ -717,6 +719,8 @@ updatetests: check_PROGRAMS = \ check_ExternalTransforms \ + check_Length \ + check_ListingsCaption \ check_layout if INSTALL_MACOSX @@ -724,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@ $(QT_CORE_LIBS) $(LIBSHLWAPI) -check_layout_LDFLAGS = $(QT_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 \ @@ -744,8 +749,9 @@ check_layout_SOURCES = \ tests/dummy_functions.cpp check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS) -check_ExternalTransforms_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT_CORE_LIBS) $(LIBSHLWAPI) -check_ExternalTransforms_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS) +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 \ @@ -755,4 +761,24 @@ check_ExternalTransforms_SOURCES = \ 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