* BufferView::updateMetrics(): split up the method in two for the SinglePar case.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 431ebc0e69e8ddf8cc34806764ed94230c0b3d95..7c90cf2cee41da6bdf498d7456646867db20f0f5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,13 +2,15 @@ include $(top_srcdir)/config/common.am
 
 ############################### Core  ##############################
 
-DISTCLEANFILES += config.h libintl.h version.cpp stamp-version version.cpp-tmp
+DISTCLEANFILES += config.h libintl.h
 
 MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
+
 SUBDIRS = support frontends .
 
-EXTRA_DIST = config.h.in stamp-h.in version.cpp.in \
+EXTRA_DIST = config.h.in \
        Section.h \
        Section.cpp \
        Variables.cpp \
@@ -16,32 +18,32 @@ EXTRA_DIST = config.h.in stamp-h.in version.cpp.in \
        paper.h \
        pch.h
 
-LYX_PRE_LIBS = liblyxmathed.la liblyxinsets.la \
-       frontends/liblyxfrontends.la
-
-LYX_POST_LIBS = frontends/controllers/liblyxcontrollers.la \
-       liblyxgraphics.la \
-       support/liblyxsupport.la
-
 OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
-
 pkglib_LTLIBRARIES = liblyxcore.la
-noinst_PROGRAMS = $(FRONTENDS_PROGS)
-EXTRA_PROGRAMS = lyx-qt4
-
-lyx_qt4_LDADD = liblyxcore.la  $(LYX_PRE_LIBS) \
-       frontends/qt4/liblyxqt4.la $(LYX_POST_LIBS) $(OTHERLIBS) $(QT4_LIB) 
-lyx_qt4_SOURCES = main.cpp
-
-lyx$(EXEEXT): $(FRONTENDS_PROGS)
-       rm -f $@
-       $(LN_S) $< $@
+bin_PROGRAMS = lyx
+
+lyx_LDADD = \
+       liblyxcore.la \
+       liblyxmathed.la \
+       liblyxinsets.la \
+       frontends/liblyxfrontends.la \
+       frontends/qt4/liblyxqt4.la \
+       frontends/controllers/liblyxcontrollers.la \
+       liblyxgraphics.la \
+       support/liblyxsupport.la \
+       $(OTHERLIBS) \
+       $(QT4_LIB) 
+
+if LYX_WIN_RESOURCE
+.rc.o:
+       cp $(top_srcdir)/development/Win32/packaging/icons/lyx_*32x32.ico .
+       windres -I. --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
+endif
 
 #lyx_LDFLAGS=-Wl,-O1
 
-BUILT_SOURCES = $(PCH_FILE) version.cpp
+BUILT_SOURCES = $(PCH_FILE)
 
 if USE_ASPELL
 ASPELL = ASpell.cpp ASpell_local.h
@@ -53,16 +55,34 @@ if USE_ISPELL
 ISPELL = ISpell.cpp ISpell.h
 endif
 
+# These four objects are linked as object files as they are not
+# referenced within the core and therefore are not picked up
+# by the linker without looping over libs. We do not want that,
+# and in fact libtools seems not able to do that.
+lyx_SOURCES = \
+       main.cpp \
+       $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
+       Box.cpp \
+       Box.h \
+       Dimension.cpp \
+       Dimension.h \
+       PrinterParams.cpp \
+       PrinterParams.h \
+       Thesaurus.cpp \
+       Thesaurus.h
+
+if LYX_WIN_RESOURCE
+lyx_SOURCES += lyxwinres.rc
+endif
 
 liblyxcore_la_SOURCES = \
-       $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
        Author.cpp \
        Author.h \
+       BiblioInfo.h \
+       BiblioInfo.cpp \
        Bidi.cpp \
        Bidi.h \
        boost.cpp \
-       Box.cpp \
-       Box.h \
        BranchList.cpp \
        BranchList.h \
        Buffer.cpp \
@@ -104,11 +124,11 @@ liblyxcore_la_SOURCES = \
        debug.h \
        DepTable.cpp \
        DepTable.h \
-       Dimension.cpp \
-       Dimension.h \
        DispatchResult.h \
        DocIterator.cpp \
        DocIterator.h \
+       EmbeddedFiles.h \
+       EmbeddedFiles.cpp \
        Encoding.cpp \
        Encoding.h \
        ErrorList.cpp \
@@ -187,6 +207,8 @@ liblyxcore_la_SOURCES = \
        Messages.h \
        MetricsInfo.cpp \
        MetricsInfo.h \
+       ModuleList.cpp \
+       ModuleList.h \
        Mover.cpp \
        Mover.h \
        output.cpp \
@@ -211,8 +233,8 @@ liblyxcore_la_SOURCES = \
        ParagraphParameters.h \
        ParIterator.cpp \
        ParIterator.h \
-       PrinterParams.cpp \
-       PrinterParams.h \
+       PDFOptions.cpp \
+       PDFOptions.h \
        Row.cpp \
        Row.h \
        rowpainter.cpp \
@@ -238,8 +260,6 @@ liblyxcore_la_SOURCES = \
        TextClassList.h \
        TextMetrics.cpp \
        TextMetrics.h \
-       Thesaurus.cpp \
-       Thesaurus.h \
        TocBackend.cpp \
        TocBackend.h \
        toc.cpp \
@@ -258,20 +278,6 @@ liblyxcore_la_SOURCES = \
        WordLangTuple.h \
        VSpace.cpp \
        VSpace.h
-
-version.cpp: stamp-version
-       @:
-
-stamp-version: version.cpp-tmp
-       if cmp -s $< version.cpp ; then \
-               : ;\
-       else \
-               rm -f version.cpp ;\
-               cp $< version.cpp ;\
-       fi
-       echo timestamp > $@
-
-
 ############################### Graphics ##############################
 
 pkglib_LTLIBRARIES += liblyxgraphics.la
@@ -489,8 +495,6 @@ liblyxinsets_la_SOURCES = \
        insets/InsetBranch.h \
        insets/InsetCaption.cpp \
        insets/InsetCaption.h \
-       insets/InsetCharStyle.cpp \
-       insets/InsetCharStyle.h \
        insets/InsetCitation.cpp \
        insets/InsetCitation.h \
        insets/InsetCollapsable.cpp \
@@ -505,6 +509,8 @@ liblyxinsets_la_SOURCES = \
        insets/InsetERT.h \
        insets/InsetExternal.cpp \
        insets/InsetExternal.h \
+       insets/InsetFlex.h \
+       insets/InsetFlex.cpp \
        insets/InsetFloat.h \
        insets/InsetFloat.cpp \
        insets/InsetFloatList.cpp \