Further cleanup of InsetFlex, InsetCollapsable and InsetLayout:

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5d26a6369c5610f366873e6a6e1a4d52738e591e..0ec29dfbc9193b84e50b91874baae4df91c2b937 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,26 +18,27 @@ EXTRA_DIST = config.h.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)
 
-pkglib_LTLIBRARIES = liblyxcore.la
-noinst_PROGRAMS = $(FRONTENDS_PROGS)
-EXTRA_PROGRAMS = lyx-qt4
+noinst_LTLIBRARIES = liblyxcore.la
+bin_PROGRAMS = lyx
 
-lyx_qt4_LDADD = liblyxcore.la  $(LYX_PRE_LIBS) \
-       frontends/qt4/liblyxqt4.la $(LYX_POST_LIBS) $(OTHERLIBS) $(QT4_LIB) 
-lyx_qt4_SOURCES = main.cpp
+lyx_LDADD = \
+       liblyxcore.la \
+       liblyxmathed.la \
+       liblyxinsets.la \
+       frontends/liblyxfrontends.la \
+       frontends/qt4/liblyxqt4.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 .
+       windres -I. --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
+endif
 
 #lyx_LDFLAGS=-Wl,-O1
 
@@ -53,16 +54,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 \
@@ -74,8 +93,6 @@ liblyxcore_la_SOURCES = \
        BufferParams.cpp \
        BufferParams.h \
        BufferView.cpp \
-       bufferview_funcs.cpp \
-       bufferview_funcs.h \
        BufferView.h \
        Bullet.cpp \
        Bullet.h \
@@ -83,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 \
@@ -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 \
@@ -123,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 \
@@ -135,8 +160,6 @@ liblyxcore_la_SOURCES = \
        gettext.h \
        Graph.cpp \
        Graph.h \
-       Importer.cpp \
-       Importer.h \
        InsetIterator.cpp \
        InsetIterator.h \
        InsetList.cpp \
@@ -155,30 +178,24 @@ 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 \
@@ -187,6 +204,8 @@ liblyxcore_la_SOURCES = \
        Messages.h \
        MetricsInfo.cpp \
        MetricsInfo.h \
+       ModuleList.cpp \
+       ModuleList.h \
        Mover.cpp \
        Mover.h \
        output.cpp \
@@ -211,12 +230,16 @@ liblyxcore_la_SOURCES = \
        ParagraphParameters.h \
        ParIterator.cpp \
        ParIterator.h \
-       PrinterParams.cpp \
-       PrinterParams.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 \
@@ -238,12 +261,8 @@ liblyxcore_la_SOURCES = \
        TextClassList.h \
        TextMetrics.cpp \
        TextMetrics.h \
-       Thesaurus.cpp \
-       Thesaurus.h \
        TocBackend.cpp \
        TocBackend.h \
-       toc.cpp \
-       toc.h \
        ToolbarBackend.cpp \
        ToolbarBackend.h \
        Trans.cpp \
@@ -258,10 +277,9 @@ liblyxcore_la_SOURCES = \
        WordLangTuple.h \
        VSpace.cpp \
        VSpace.h
-
 ############################### Graphics ##############################
 
-pkglib_LTLIBRARIES += liblyxgraphics.la
+noinst_LTLIBRARIES += liblyxgraphics.la
 
 liblyxgraphics_la_SOURCES = \
        graphics/GraphicsCache.h \
@@ -292,7 +310,7 @@ liblyxgraphics_la_SOURCES = \
 
 EXTRA_DIST += mathed/InsetFormulaMacro.cpp
 
-pkglib_LTLIBRARIES += liblyxmathed.la
+noinst_LTLIBRARIES += liblyxmathed.la
 
 liblyxmathed_la_SOURCES = \
        mathed/InsetMathAMSArray.cpp \
@@ -301,8 +319,6 @@ 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 \
@@ -326,8 +342,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 \
@@ -344,8 +358,6 @@ liblyxmathed_la_SOURCES = \
        mathed/InsetMathFont.h \
        mathed/InsetMathFontOld.cpp \
        mathed/InsetMathFontOld.h \
-       mathed/InsetMathFracBase.cpp \
-       mathed/InsetMathFracBase.h \
        mathed/InsetMathFrac.cpp \
        mathed/InsetMathFrac.h \
        mathed/InsetMathFrameBox.cpp \
@@ -401,8 +413,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 \
@@ -442,7 +452,7 @@ liblyxmathed_la_SOURCES = \
 
 ############################### Insets  ##############################
 
-pkglib_LTLIBRARIES += liblyxinsets.la
+noinst_LTLIBRARIES += liblyxinsets.la
 
 EXTRA_DIST += \
        insets/InsetTheorem.cpp \
@@ -476,10 +486,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 \
@@ -492,6 +501,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 \
@@ -506,10 +517,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 \
@@ -544,17 +559,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