Fix bug #12772

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 15a3dfa49615c6a762bbd1967b99241c089940d1..6713bc1ec0ddb2deaa9cad8c63b878ce98b60ec1 100644 (file)
--- 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,7 +20,7 @@ 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)
 
@@ -42,7 +42,8 @@ lyx_LDADD = \
 
 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
 
@@ -89,8 +90,6 @@ lyx_SOURCES = \
        $(PWL) \
        LaTeXFonts.cpp \
        LaTeXFonts.h \
-       PrinterParams.cpp \
-       PrinterParams.h \
        Thesaurus.cpp \
        Thesaurus.h
 
@@ -148,8 +147,6 @@ SOURCEFILESCORE = \
        LaTeXPackages.cpp \
        LayoutFile.cpp \
        LayoutModuleList.cpp \
-       Length.cpp \
-       lengthcommon.cpp \
        Lexer.cpp \
        LyX.cpp \
        LyXAction.cpp \
@@ -174,14 +171,12 @@ SOURCEFILESCORE = \
        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 \
@@ -252,7 +247,6 @@ HEADERFILESCORE = \
        LayoutEnums.h \
        LayoutFile.h \
        LayoutModuleList.h \
-       Length.h \
        Lexer.h \
        LyXAction.h \
        lyxfind.h \
@@ -277,11 +271,12 @@ HEADERFILESCORE = \
        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 \
@@ -555,6 +550,7 @@ SOURCEFILESINSETS = \
        insets/InsetCollapsible.cpp \
        insets/InsetCommand.cpp \
        insets/InsetCommandParams.cpp \
+       insets/InsetCounter.cpp \
        insets/InsetERT.cpp \
        insets/InsetExternal.cpp \
        insets/InsetFlex.cpp \
@@ -567,6 +563,7 @@ SOURCEFILESINSETS = \
        insets/InsetHyperlink.cpp \
        insets/InsetInclude.cpp \
        insets/InsetIndex.cpp \
+       insets/InsetIndexMacro.cpp \
        insets/InsetInfo.cpp \
        insets/InsetIPA.cpp \
        insets/InsetIPAMacro.cpp \
@@ -615,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 \
@@ -627,6 +625,7 @@ HEADERFILESINSETS = \
        insets/InsetHyperlink.h \
        insets/InsetInclude.h \
        insets/InsetIndex.h \
+       insets/InsetIndexMacro.h \
        insets/InsetInfo.h \
        insets/InsetIPA.h \
        insets/InsetIPAMacro.h \
@@ -698,14 +697,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 \
@@ -719,41 +720,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