integrate lengthcommon.cpp into Length.cpp.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 4be7c7b9c07456e98af923bb6da50fa252d0b6d0..61a3e468ed20930ad28f8feb431b79345dec8759 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,26 +20,20 @@ EXTRA_DIST = config.h.in \
 
 OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
 
-pkglib_LTLIBRARIES = liblyxcore.la
-noinst_PROGRAMS = $(FRONTENDS_PROGS)
-EXTRA_PROGRAMS = lyx-qt4
+noinst_LTLIBRARIES = liblyxcore.la
+bin_PROGRAMS = lyx
 
-lyx_qt4_LDADD = \
+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) 
 
-lyx$(EXEEXT): $(FRONTENDS_PROGS)
-       rm -f $@
-       $(LN_S) $< $@
-
 if LYX_WIN_RESOURCE
 .rc.o:
        cp $(top_srcdir)/development/Win32/packaging/icons/lyx_*32x32.ico .
@@ -64,7 +58,7 @@ endif
 # 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_qt4_SOURCES = \
+lyx_SOURCES = \
        main.cpp \
        $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
        Box.cpp \
@@ -77,14 +71,14 @@ lyx_qt4_SOURCES = \
        Thesaurus.h
 
 if LYX_WIN_RESOURCE
-lyx_qt4_SOURCES += lyxwinres.rc
+lyx_SOURCES += lyxwinres.rc
 endif
 
 liblyxcore_la_SOURCES = \
        Author.cpp \
        Author.h \
-       Biblio.h \
-       Biblio.cpp \
+       BiblioInfo.h \
+       BiblioInfo.cpp \
        Bidi.cpp \
        Bidi.h \
        boost.cpp \
@@ -99,8 +93,6 @@ liblyxcore_la_SOURCES = \
        BufferParams.cpp \
        BufferParams.h \
        BufferView.cpp \
-       bufferview_funcs.cpp \
-       bufferview_funcs.h \
        BufferView.h \
        Bullet.cpp \
        Bullet.h \
@@ -108,6 +100,9 @@ liblyxcore_la_SOURCES = \
        Changes.h \
        Chktex.cpp \
        Chktex.h \
+       CmdDef.cpp \
+       CmdDef.h \
+       ColorCode.h \
        Color.cpp \
        Color.h \
        config.h.in \
@@ -132,6 +127,8 @@ liblyxcore_la_SOURCES = \
        DispatchResult.h \
        DocIterator.cpp \
        DocIterator.h \
+       EmbeddedFiles.h \
+       EmbeddedFiles.cpp \
        Encoding.cpp \
        Encoding.h \
        ErrorList.cpp \
@@ -146,8 +143,13 @@ liblyxcore_la_SOURCES = \
        FloatList.h \
        Font.cpp \
        Font.h \
+       FontEnums.h \
+       FontInfo.cpp \
+       FontInfo.h \
        FontIterator.cpp \
        FontIterator.h \
+       FontList.cpp \
+       FontList.h \
        Format.cpp \
        Format.h \
        FuncRequest.cpp \
@@ -158,8 +160,6 @@ liblyxcore_la_SOURCES = \
        gettext.h \
        Graph.cpp \
        Graph.h \
-       Importer.cpp \
-       Importer.h \
        InsetIterator.cpp \
        InsetIterator.h \
        InsetList.cpp \
@@ -178,30 +178,23 @@ liblyxcore_la_SOURCES = \
        LaTeX.h \
        Layout.cpp \
        Layout.h \
+       LayoutPtr.h \
+       LayoutEnums.h \
        Length.cpp \
        Length.h \
-       lengthcommon.cpp \
-       lengthcommon.h \
        Lexer.cpp \
        Lexer.h \
        lfuns.h \
        LyXAction.cpp \
        LyXAction.h \
-       callback.cpp \
-       callback.h \
        LyX.cpp \
        lyxfind.cpp \
        lyxfind.h \
        LyXFunc.cpp \
        LyXFunc.h \
        LyX.h \
-       lyxlayout_ptr_fwd.h \
        LyXRC.cpp \
        LyXRC.h \
-       Server.cpp \
-       Server.h \
-       ServerSocket.cpp \
-       ServerSocket.h \
        LyXVC.cpp \
        LyXVC.h \
        MenuBackend.cpp \
@@ -210,6 +203,8 @@ liblyxcore_la_SOURCES = \
        Messages.h \
        MetricsInfo.cpp \
        MetricsInfo.h \
+       ModuleList.cpp \
+       ModuleList.h \
        Mover.cpp \
        Mover.h \
        output.cpp \
@@ -234,10 +229,16 @@ liblyxcore_la_SOURCES = \
        ParagraphParameters.h \
        ParIterator.cpp \
        ParIterator.h \
+       PDFOptions.cpp \
+       PDFOptions.h \
        Row.cpp \
        Row.h \
        rowpainter.cpp \
        rowpainter.h \
+       Server.cpp \
+       Server.h \
+       ServerSocket.cpp \
+       ServerSocket.h \
        Session.cpp \
        Session.h \
        sgml.cpp \
@@ -261,8 +262,6 @@ liblyxcore_la_SOURCES = \
        TextMetrics.h \
        TocBackend.cpp \
        TocBackend.h \
-       toc.cpp \
-       toc.h \
        ToolbarBackend.cpp \
        ToolbarBackend.h \
        Trans.cpp \
@@ -279,7 +278,7 @@ liblyxcore_la_SOURCES = \
        VSpace.h
 ############################### Graphics ##############################
 
-pkglib_LTLIBRARIES += liblyxgraphics.la
+noinst_LTLIBRARIES += liblyxgraphics.la
 
 liblyxgraphics_la_SOURCES = \
        graphics/GraphicsCache.h \
@@ -310,7 +309,7 @@ liblyxgraphics_la_SOURCES = \
 
 EXTRA_DIST += mathed/InsetFormulaMacro.cpp
 
-pkglib_LTLIBRARIES += liblyxmathed.la
+noinst_LTLIBRARIES += liblyxmathed.la
 
 liblyxmathed_la_SOURCES = \
        mathed/InsetMathAMSArray.cpp \
@@ -319,13 +318,9 @@ liblyxmathed_la_SOURCES = \
        mathed/InsetMathArray.h \
        mathed/InsetMathBig.cpp \
        mathed/InsetMathBig.h \
-       mathed/InsetMathBinom.cpp \
-       mathed/InsetMathBinom.h \
        mathed/InsetMathBoldSymbol.cpp \
        mathed/InsetMathBoldSymbol.h \
        mathed/InsetMathBox.cpp \
-       mathed/InsetMathBoxed.cpp \
-       mathed/InsetMathBoxed.h \
        mathed/InsetMathBox.h \
        mathed/InsetMathBrace.cpp \
        mathed/InsetMathBrace.h \
@@ -344,8 +339,6 @@ liblyxmathed_la_SOURCES = \
        mathed/InsetMathDecoration.h \
        mathed/InsetMathDelim.cpp \
        mathed/InsetMathDelim.h \
-       mathed/InsetMathDFrac.cpp \
-       mathed/InsetMathDFrac.h \
        mathed/InsetMathDiff.cpp \
        mathed/InsetMathDiff.h \
        mathed/InsetMathDots.cpp \
@@ -356,18 +349,12 @@ liblyxmathed_la_SOURCES = \
        mathed/InsetMathExFunc.h \
        mathed/InsetMathExInt.cpp \
        mathed/InsetMathExInt.h \
-       mathed/InsetMathFBox.cpp \
-       mathed/InsetMathFBox.h \
        mathed/InsetMathFont.cpp \
        mathed/InsetMathFont.h \
        mathed/InsetMathFontOld.cpp \
        mathed/InsetMathFontOld.h \
-       mathed/InsetMathFracBase.cpp \
-       mathed/InsetMathFracBase.h \
        mathed/InsetMathFrac.cpp \
        mathed/InsetMathFrac.h \
-       mathed/InsetMathFrameBox.cpp \
-       mathed/InsetMathFrameBox.h \
        mathed/InsetMathGrid.cpp \
        mathed/InsetMathGrid.h \
        mathed/InsetMath.h \
@@ -381,8 +368,6 @@ liblyxmathed_la_SOURCES = \
        mathed/InsetMathLim.h \
        mathed/MathMacro.cpp \
        mathed/MathMacro.h \
-       mathed/InsetMathMakebox.cpp \
-       mathed/InsetMathMakebox.h \
        mathed/InsetMathMatrix.cpp \
        mathed/InsetMathMatrix.h \
        mathed/InsetMathNest.cpp \
@@ -419,8 +404,6 @@ liblyxmathed_la_SOURCES = \
        mathed/InsetMathSymbol.h \
        mathed/InsetMathTabular.cpp \
        mathed/InsetMathTabular.h \
-       mathed/InsetMathTFrac.cpp \
-       mathed/InsetMathTFrac.h \
        mathed/InsetMathUnderset.cpp \
        mathed/InsetMathUnderset.h \
        mathed/InsetMathUnknown.cpp \
@@ -455,12 +438,10 @@ liblyxmathed_la_SOURCES = \
        mathed/MathSupport.h \
        mathed/TextPainter.cpp \
        mathed/TextPainter.h 
-#      mathed/InsetMathMBox.cpp
-#      mathed/InsetMathMBox.h
 
 ############################### Insets  ##############################
 
-pkglib_LTLIBRARIES += liblyxinsets.la
+noinst_LTLIBRARIES += liblyxinsets.la
 
 EXTRA_DIST += \
        insets/InsetTheorem.cpp \
@@ -494,10 +475,9 @@ 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/InsetCode.h \
        insets/InsetCollapsable.cpp \
        insets/InsetCollapsable.h \
        insets/InsetCommand.cpp \
@@ -510,6 +490,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 \
@@ -524,10 +506,14 @@ liblyxinsets_la_SOURCES = \
        insets/InsetGraphics.h \
        insets/InsetHFill.cpp \
        insets/InsetHFill.h \
+       insets/InsetHyperlink.cpp \
+       insets/InsetHyperlink.h \
        insets/InsetInclude.cpp \
        insets/InsetInclude.h \
        insets/InsetIndex.cpp \
        insets/InsetIndex.h \
+       insets/InsetInfo.cpp \
+       insets/InsetInfo.h \
        insets/InsetLabel.cpp \
        insets/InsetLabel.h \
        insets/InsetLine.cpp \
@@ -562,17 +548,15 @@ liblyxinsets_la_SOURCES = \
        insets/InsetText.h \
        insets/InsetTOC.cpp \
        insets/InsetTOC.h \
-       insets/InsetUrl.cpp \
-       insets/InsetUrl.h \
        insets/InsetVSpace.cpp \
        insets/InsetVSpace.h \
        insets/InsetWrap.h \
        insets/InsetWrap.cpp
 
-#      insets/insetlist.C \
-#      insets/insetlist.h \
-#      insets/insetsection.h \
-#      insets/insetsection.C \
+#      insets/InsetList.cpp \
+#      insets/InsetList.h \
+#      insets/InsetSection.h \
+#      insets/InsetSection.cpp \
 #      insets/InsetTheorem.cpp \
 #      insets/InsetTheorem.h