X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=31701f2fb154735a9f1b5fb3f19c269fc37b8468;hb=233cfed3331e2a8fef39e2dff483dadbf011b772;hp=28592fb0a2651057745c3d78dc5f13de2c3b20d4;hpb=c466baaa5b99e44ea25616556bd0918197f4b54c;p=lyx.git diff --git a/src/Makefile.am b/src/Makefile.am index 28592fb0a2..31701f2fb1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ 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) $(MYTHES_INCLUDES) -AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_CORE_INCLUDES) +AM_CPPFLAGS += $(NOD_INCLUDES) $(QT_CPPFLAGS) $(QT_CORE_INCLUDES) if BUILD_CLIENT_SUBDIR CLIENT = client @@ -20,35 +20,38 @@ 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 . + 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 if INSTALL_MACOSX @@ -87,8 +90,6 @@ lyx_SOURCES = \ $(PWL) \ LaTeXFonts.cpp \ LaTeXFonts.h \ - PrinterParams.cpp \ - PrinterParams.h \ Thesaurus.cpp \ Thesaurus.h @@ -146,8 +147,6 @@ SOURCEFILESCORE = \ LaTeXPackages.cpp \ LayoutFile.cpp \ LayoutModuleList.cpp \ - Length.cpp \ - lengthcommon.cpp \ Lexer.cpp \ LyX.cpp \ LyXAction.cpp \ @@ -172,7 +171,7 @@ SOURCEFILESCORE = \ RowPainter.cpp \ Server.cpp \ ServerSocket.cpp \ - sgml.cpp \ + xml.cpp \ Session.cpp \ Spacing.cpp \ TexRow.cpp \ @@ -250,7 +249,6 @@ HEADERFILESCORE = \ LayoutEnums.h \ LayoutFile.h \ LayoutModuleList.h \ - Length.h \ Lexer.h \ LyXAction.h \ lyxfind.h \ @@ -279,7 +277,7 @@ HEADERFILESCORE = \ Server.h \ ServerSocket.h \ Session.h \ - sgml.h \ + xml.h \ Spacing.h \ SpellChecker.h \ TexRow.h \ @@ -322,22 +320,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 - -nodist_liblyxcore_a_SOURCES = lyxcore.cpp -liblyxcore_a_SOURCES = $(STANDALONEFILES) $(HEADERFILESCORE) - -else - liblyxcore_a_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE) -endif ######################### Qt stuff ############################## @@ -541,22 +525,8 @@ HEADERFILESMATHED = \ 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 - -nodist_liblyxmathed_a_SOURCES = lyxmathed.cpp -liblyxmathed_a_SOURCES = $(HEADERFILESMATHED) - -else - liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED) -endif ############################### Insets ############################## @@ -581,6 +551,7 @@ SOURCEFILESINSETS = \ insets/InsetCollapsible.cpp \ insets/InsetCommand.cpp \ insets/InsetCommandParams.cpp \ + insets/InsetCounter.cpp \ insets/InsetERT.cpp \ insets/InsetExternal.cpp \ insets/InsetFlex.cpp \ @@ -641,6 +612,7 @@ HEADERFILESINSETS = \ insets/InsetCollapsible.h \ insets/InsetCommand.h \ insets/InsetCommandParams.h \ + insets/InsetCounter.h \ insets/InsetERT.h \ insets/InsetExternal.h \ insets/InsetFlex.h \ @@ -680,23 +652,8 @@ HEADERFILESINSETS = \ insets/InsetVSpace.h \ insets/InsetWrap.h -lyxinsets.cpp: - $(AM_V_GEN)for file in $(SOURCEFILESINSETS) ; do echo '#include "'$${file}'"' ; done >$@ - -if MONOLITHIC_INSETS - -BUILT_SOURCES += lyxinsets.cpp -CLEANFILES += lyxinsets.cpp - -nodist_liblyxinsets_a_SOURCES = lyxinsets.cpp -liblyxinsets_a_SOURCES = $(HEADERFILESINSETS) - -else - liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS) -endif - ############################## Tests ################################## @@ -739,14 +696,16 @@ ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework endif TESTS_LIBS = support/liblyxsupport.a \ - $(LIBICONV) $(BOOST_LIBS) @LIBS@ \ + $(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 = \ - tests/check_layout.cpp + tests/check_layout.cpp \ + tests/dummy_functions.cpp \ + tests/boost.cpp check_layout_LYX_OBJS = \ insets/InsetLayout.o \ CiteEnginesList.o \ @@ -760,41 +719,34 @@ check_layout_LYX_OBJS = \ Lexer.o \ ModuleList.o \ Spacing.o \ - TextClass.o \ - tests/dummy_functions.o \ - tests/boost.o + TextClass.o check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS) check_ExternalTransforms_LDADD = $(check_ExternalTransforms_LYX_OBJS) $(TESTS_LIBS) check_ExternalTransforms_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS) check_ExternalTransforms_SOURCES = \ - tests/check_ExternalTransforms.cpp + tests/check_ExternalTransforms.cpp \ + tests/dummy_functions.cpp \ + tests/boost.cpp check_ExternalTransforms_LYX_OBJS = \ - tests/dummy_functions.o \ - tests/boost.o \ graphics/GraphicsParams.o \ - insets/ExternalTransforms.o \ - Length.o \ - lengthcommon.o + insets/ExternalTransforms.o check_Length_CPPFLAGS = $(AM_CPPFLAGS) -check_Length_LDADD = $(check_Length_LYX_OBJS) $(TESTS_LIBS) +check_Length_LDADD = $(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 + tests/check_Length.cpp \ + tests/dummy_functions.cpp \ + tests/boost.cpp 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 + tests/check_ListingsCaption.cpp \ + tests/dummy_functions.cpp \ + tests/boost.cpp +check_ListingsCaption_LYX_OBJS = .PHONY: alltests alltests-recursive updatetests