adjust

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 90a1a25af21ca1f7b07903a677a4c5e8bed4d0f0..b924f5235379b11afa762f0d64159e62d3506c3c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,25 +20,25 @@ 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 .
+       windres -I. --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
+endif
 
 #lyx_LDFLAGS=-Wl,-O1
 
@@ -54,7 +54,11 @@ if USE_ISPELL
 ISPELL = ISpell.cpp ISpell.h
 endif
 
-lyx_qt4_SOURCES = \
+# 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 \
@@ -66,9 +70,15 @@ lyx_qt4_SOURCES = \
        Thesaurus.cpp \
        Thesaurus.h
 
+if LYX_WIN_RESOURCE
+lyx_SOURCES += lyxwinres.rc
+endif
+
 liblyxcore_la_SOURCES = \
        Author.cpp \
        Author.h \
+       BiblioInfo.h \
+       BiblioInfo.cpp \
        Bidi.cpp \
        Bidi.h \
        boost.cpp \
@@ -83,8 +93,6 @@ liblyxcore_la_SOURCES = \
        BufferParams.cpp \
        BufferParams.h \
        BufferView.cpp \
-       bufferview_funcs.cpp \
-       bufferview_funcs.h \
        BufferView.h \
        Bullet.cpp \
        Bullet.h \
@@ -116,6 +124,8 @@ liblyxcore_la_SOURCES = \
        DispatchResult.h \
        DocIterator.cpp \
        DocIterator.h \
+       EmbeddedFiles.h \
+       EmbeddedFiles.cpp \
        Encoding.cpp \
        Encoding.h \
        ErrorList.cpp \
@@ -162,6 +172,7 @@ liblyxcore_la_SOURCES = \
        LaTeX.h \
        Layout.cpp \
        Layout.h \
+       LayoutEnum.h \
        Length.cpp \
        Length.h \
        lengthcommon.cpp \
@@ -171,8 +182,6 @@ liblyxcore_la_SOURCES = \
        lfuns.h \
        LyXAction.cpp \
        LyXAction.h \
-       callback.cpp \
-       callback.h \
        LyX.cpp \
        lyxfind.cpp \
        lyxfind.h \
@@ -194,6 +203,8 @@ liblyxcore_la_SOURCES = \
        Messages.h \
        MetricsInfo.cpp \
        MetricsInfo.h \
+       ModuleList.cpp \
+       ModuleList.h \
        Mover.cpp \
        Mover.h \
        output.cpp \
@@ -218,6 +229,8 @@ liblyxcore_la_SOURCES = \
        ParagraphParameters.h \
        ParIterator.cpp \
        ParIterator.h \
+       PDFOptions.cpp \
+       PDFOptions.h \
        Row.cpp \
        Row.h \
        rowpainter.cpp \
@@ -245,8 +258,6 @@ liblyxcore_la_SOURCES = \
        TextMetrics.h \
        TocBackend.cpp \
        TocBackend.h \
-       toc.cpp \
-       toc.h \
        ToolbarBackend.cpp \
        ToolbarBackend.h \
        Trans.cpp \
@@ -263,7 +274,7 @@ liblyxcore_la_SOURCES = \
        VSpace.h
 ############################### Graphics ##############################
 
-pkglib_LTLIBRARIES += liblyxgraphics.la
+noinst_LTLIBRARIES += liblyxgraphics.la
 
 liblyxgraphics_la_SOURCES = \
        graphics/GraphicsCache.h \
@@ -294,7 +305,7 @@ liblyxgraphics_la_SOURCES = \
 
 EXTRA_DIST += mathed/InsetFormulaMacro.cpp
 
-pkglib_LTLIBRARIES += liblyxmathed.la
+noinst_LTLIBRARIES += liblyxmathed.la
 
 liblyxmathed_la_SOURCES = \
        mathed/InsetMathAMSArray.cpp \
@@ -444,7 +455,7 @@ liblyxmathed_la_SOURCES = \
 
 ############################### Insets  ##############################
 
-pkglib_LTLIBRARIES += liblyxinsets.la
+noinst_LTLIBRARIES += liblyxinsets.la
 
 EXTRA_DIST += \
        insets/InsetTheorem.cpp \
@@ -478,10 +489,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 \
@@ -494,6 +504,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 \
@@ -508,10 +520,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 \
@@ -546,8 +562,6 @@ 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 \