X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.am;h=99a0f98ceb16895bb81e23a84b78bf27198a7ddc;hb=997f0621c5346bb623cf86713c4fe1be0c941104;hp=f6a77dc0bd1e5597b541bfd9f3786e384392d676;hpb=a6b07608d8e9de24383d3ebaec20b6b265ed9314;p=lyx.git

diff --git a/src/Makefile.am b/src/Makefile.am
index f6a77dc0bd..99a0f98ceb 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,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
 
@@ -146,8 +147,6 @@ SOURCEFILESCORE = \
 	LaTeXPackages.cpp \
 	LayoutFile.cpp \
 	LayoutModuleList.cpp \
-	Length.cpp \
-	lengthcommon.cpp \
 	Lexer.cpp \
 	LyX.cpp \
 	LyXAction.cpp \
@@ -250,7 +249,6 @@ HEADERFILESCORE = \
 	LayoutEnums.h \
 	LayoutFile.h \
 	LayoutModuleList.h \
-	Length.h \
 	Lexer.h \
 	LyXAction.h \
 	lyxfind.h \
@@ -275,6 +273,7 @@ HEADERFILESCORE = \
 	ParIterator.h \
 	PDFOptions.h \
 	Row.h \
+	RowFlags.h \
 	RowPainter.h \
 	Server.h \
 	ServerSocket.h \
@@ -698,7 +697,7 @@ 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)
@@ -732,20 +731,15 @@ check_ExternalTransforms_SOURCES = \
 	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)