Accelerators

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5a9ba9351393956029df94ffd3874d2278e8e0f9..be8e478007e4a70e75aabc13f90ed37e3323bcbe 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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,7 +171,7 @@ SOURCEFILESCORE = \
        RowPainter.cpp \
        Server.cpp \
        ServerSocket.cpp \
-       sgml.cpp \
+       xml.cpp \
        Session.cpp \
        Spacing.cpp \
        TexRow.cpp \
@@ -252,7 +249,6 @@ HEADERFILESCORE = \
        LayoutEnums.h \
        LayoutFile.h \
        LayoutModuleList.h \
-       Length.h \
        Lexer.h \
        LyXAction.h \
        lyxfind.h \
@@ -281,7 +277,7 @@ HEADERFILESCORE = \
        Server.h \
        ServerSocket.h \
        Session.h \
-       sgml.h \
+       xml.h \
        Spacing.h \
        SpellChecker.h \
        TexRow.h \
@@ -555,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 \
@@ -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 \
@@ -732,20 +730,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)