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
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)
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
$(PWL) \
LaTeXFonts.cpp \
LaTeXFonts.h \
- PrinterParams.cpp \
- PrinterParams.h \
Thesaurus.cpp \
Thesaurus.h
LaTeXPackages.cpp \
LayoutFile.cpp \
LayoutModuleList.cpp \
- Length.cpp \
- lengthcommon.cpp \
- Lexer.cpp \
LyX.cpp \
LyXAction.cpp \
lyxfind.cpp \
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 \
LayoutEnums.h \
LayoutFile.h \
LayoutModuleList.h \
- Length.h \
- Lexer.h \
LyXAction.h \
lyxfind.h \
LyX.h \
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 \
mathed/InsetMathSubstack.cpp \
mathed/InsetMathSymbol.cpp \
mathed/InsetMathTabular.cpp \
+ mathed/InsetMathTextsize.cpp \
mathed/InsetMathUnderset.cpp \
mathed/InsetMathUnknown.cpp \
mathed/InsetMathXArrow.cpp \
mathed/InsetMathSubstack.h \
mathed/InsetMathSymbol.h \
mathed/InsetMathTabular.h \
+ mathed/InsetMathTextsize.h \
mathed/InsetMathUnderset.h \
mathed/InsetMathUnknown.h \
mathed/InsetMathXArrow.h \
insets/InsetCollapsible.cpp \
insets/InsetCommand.cpp \
insets/InsetCommandParams.cpp \
+ insets/InsetCounter.cpp \
insets/InsetERT.cpp \
insets/InsetExternal.cpp \
insets/InsetFlex.cpp \
insets/InsetHyperlink.cpp \
insets/InsetInclude.cpp \
insets/InsetIndex.cpp \
+ insets/InsetIndexMacro.cpp \
insets/InsetInfo.cpp \
insets/InsetIPA.cpp \
insets/InsetIPAMacro.cpp \
insets/InsetCollapsible.h \
insets/InsetCommand.h \
insets/InsetCommandParams.h \
+ insets/InsetCounter.h \
insets/InsetERT.h \
insets/InsetExternal.h \
insets/InsetFlex.h \
insets/InsetHyperlink.h \
insets/InsetInclude.h \
insets/InsetIndex.h \
+ insets/InsetIndexMacro.h \
insets/InsetInfo.h \
insets/InsetIPA.h \
insets/InsetIPAMacro.h \
endif
TESTS_LIBS = support/liblyxsupport.a \
- $(LIBICONV) $(BOOST_LIBS) @LIBS@ \
+ $(LIBICONV) @LIBS@ \
$(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI)
check_layout_CPPFLAGS = $(AM_CPPFLAGS)
tests/boost.cpp
check_layout_LYX_OBJS = \
insets/InsetLayout.o \
+ support/Lexer.o \
CiteEnginesList.o \
Color.o \
Counters.o \
FontInfo.o \
Layout.o \
LayoutFile.o \
- Lexer.o \
ModuleList.o \
Spacing.o \
TextClass.o
tests/boost.cpp
check_ExternalTransforms_LYX_OBJS = \
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 \
tests/dummy_functions.cpp \
tests/boost.cpp
-check_Length_LYX_OBJS = \
- Length.o \
- lengthcommon.o
check_ListingsCaption_CPPFLAGS = $(AM_CPPFLAGS)
check_ListingsCaption_LDADD = $(check_ListingsCaption_LYX_OBJS) $(TESTS_LIBS)