Fix scons and a file inclusion problem in ControlCommand.h

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 23f41e3158e2008e341925bdbcfffe9febaa020c..c5a2d6b38e4beaad1fda1f7d5d952f0fdd36dd29 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,11 +20,10 @@ 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 \
@@ -36,9 +35,11 @@ lyx_qt4_LDADD = \
        $(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
 
@@ -58,7 +59,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 \
@@ -70,9 +71,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 \
@@ -87,8 +94,6 @@ liblyxcore_la_SOURCES = \
        BufferParams.cpp \
        BufferParams.h \
        BufferView.cpp \
-       bufferview_funcs.cpp \
-       bufferview_funcs.h \
        BufferView.h \
        Bullet.cpp \
        Bullet.h \
@@ -120,6 +125,8 @@ liblyxcore_la_SOURCES = \
        DispatchResult.h \
        DocIterator.cpp \
        DocIterator.h \
+       EmbeddedFiles.h \
+       EmbeddedFiles.cpp \
        Encoding.cpp \
        Encoding.h \
        ErrorList.cpp \
@@ -166,6 +173,7 @@ liblyxcore_la_SOURCES = \
        LaTeX.h \
        Layout.cpp \
        Layout.h \
+       LayoutEnum.h \
        Length.cpp \
        Length.h \
        lengthcommon.cpp \
@@ -175,8 +183,6 @@ liblyxcore_la_SOURCES = \
        lfuns.h \
        LyXAction.cpp \
        LyXAction.h \
-       callback.cpp \
-       callback.h \
        LyX.cpp \
        lyxfind.cpp \
        lyxfind.h \
@@ -198,6 +204,8 @@ liblyxcore_la_SOURCES = \
        Messages.h \
        MetricsInfo.cpp \
        MetricsInfo.h \
+       ModuleList.cpp \
+       ModuleList.h \
        Mover.cpp \
        Mover.h \
        output.cpp \
@@ -222,6 +230,8 @@ liblyxcore_la_SOURCES = \
        ParagraphParameters.h \
        ParIterator.cpp \
        ParIterator.h \
+       PDFOptions.cpp \
+       PDFOptions.h \
        Row.cpp \
        Row.h \
        rowpainter.cpp \
@@ -249,8 +259,6 @@ liblyxcore_la_SOURCES = \
        TextMetrics.h \
        TocBackend.cpp \
        TocBackend.h \
-       toc.cpp \
-       toc.h \
        ToolbarBackend.cpp \
        ToolbarBackend.h \
        Trans.cpp \
@@ -267,7 +275,7 @@ liblyxcore_la_SOURCES = \
        VSpace.h
 ############################### Graphics ##############################
 
-pkglib_LTLIBRARIES += liblyxgraphics.la
+noinst_LTLIBRARIES += liblyxgraphics.la
 
 liblyxgraphics_la_SOURCES = \
        graphics/GraphicsCache.h \
@@ -298,7 +306,7 @@ liblyxgraphics_la_SOURCES = \
 
 EXTRA_DIST += mathed/InsetFormulaMacro.cpp
 
-pkglib_LTLIBRARIES += liblyxmathed.la
+noinst_LTLIBRARIES += liblyxmathed.la
 
 liblyxmathed_la_SOURCES = \
        mathed/InsetMathAMSArray.cpp \
@@ -448,7 +456,7 @@ liblyxmathed_la_SOURCES = \
 
 ############################### Insets  ##############################
 
-pkglib_LTLIBRARIES += liblyxinsets.la
+noinst_LTLIBRARIES += liblyxinsets.la
 
 EXTRA_DIST += \
        insets/InsetTheorem.cpp \
@@ -482,8 +490,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 \
@@ -498,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 \