Update notes.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 8f96553cb6f72b5d734181fa3e92419af0e65425..bc0d3682a16a3dfe3eb944df43468d24df489c03 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,7 @@ include $(top_srcdir)/config/common.am
 DISTCLEANFILES += config.h libintl.h
 
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
 CLIENT = client
@@ -19,21 +20,23 @@ EXTRA_DIST = Section.h \
        paper.h \
        pch.h
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \
+               @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
-noinst_LTLIBRARIES = liblyxcore.la
+noinst_LIBRARIES = liblyxcore.a
 bin_PROGRAMS = lyx
 
 lyx_LDADD = \
-       liblyxcore.la \
-       liblyxmathed.la \
-       liblyxinsets.la \
-       frontends/liblyxfrontends.la \
-       frontends/qt4/liblyxqt4.la \
-       liblyxgraphics.la \
-       support/liblyxsupport.la \
+       liblyxcore.a \
+       liblyxmathed.a \
+       liblyxinsets.a \
+       frontends/liblyxfrontends.a \
+       frontends/qt4/liblyxqt4.a \
+       liblyxgraphics.a \
+       support/liblyxsupport.a \
        $(OTHERLIBS) \
-       $(QT4_LIB) 
+       $(QT4_LDFLAGS) \
+       $(QT4_LIB)
 
 if LYX_WIN_RESOURCE
 .rc.o:
@@ -46,13 +49,11 @@ endif
 BUILT_SOURCES = $(PCH_FILE)
 
 if USE_ASPELL
-ASPELL = ASpell.cpp ASpell_local.h
+ASPELL = AspellChecker.cpp AspellChecker.h
 endif
-if USE_PSPELL
-PSPELL = PSpell.cpp PSpell.h
-endif
-if USE_ISPELL
-ISPELL = ISpell.cpp ISpell.h
+
+if USE_HUNSPELL
+HUNSPELL = HunspellChecker.cpp HunspellChecker.h
 endif
 
 # These four objects are linked as object files as they are not
@@ -61,13 +62,16 @@ endif
 # and in fact libtools seems not able to do that.
 lyx_SOURCES = \
        main.cpp \
-       $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
+       $(ASPELL) \
        BiblioInfo.h \
        BiblioInfo.cpp \
        Box.cpp \
        Box.h \
+       Compare.cpp \
+       Compare.h \
        Dimension.cpp \
        Dimension.h \
+       $(HUNSPELL) \
        PrinterParams.cpp \
        PrinterParams.h \
        Thesaurus.cpp \
@@ -114,6 +118,8 @@ SOURCEFILESCORE = \
        FuncRequest.cpp \
        FuncStatus.cpp \
        Graph.cpp \
+       HSpace.cpp \
+       IndicesList.cpp \
        InsetIterator.cpp \
        InsetList.cpp \
        Intl.cpp \
@@ -123,6 +129,7 @@ SOURCEFILESCORE = \
        LaTeX.cpp \
        LaTeXFeatures.cpp \
        LayoutFile.cpp \
+       LayoutModuleList.cpp \
        Length.cpp \
        lengthcommon.cpp \
        Lexer.cpp \
@@ -138,10 +145,10 @@ SOURCEFILESCORE = \
        output_docbook.cpp \
        output.cpp \
        output_latex.cpp \
+       output_xhtml.cpp \
        OutputParams.cpp \
        output_plaintext.cpp \
        Paragraph.cpp \
-       paragraph_funcs.cpp \
        ParagraphMetrics.cpp \
        ParagraphParameters.cpp \
        ParIterator.cpp \
@@ -184,6 +191,7 @@ HEADERFILESCORE = \
        CmdDef.h \
        ColorCode.h \
        Color.h \
+       ColorSet.h \
        CompletionList.h \
        ConverterCache.h \
        Converter.h \
@@ -210,6 +218,8 @@ HEADERFILESCORE = \
        FuncRequest.h \
        FuncStatus.h \
        Graph.h \
+       HSpace.h \
+       IndicesList.h \
        InsetIterator.h \
        InsetList.h \
        Intl.h \
@@ -221,6 +231,7 @@ HEADERFILESCORE = \
        Layout.h \
        LayoutEnums.h \
        LayoutFile.h \
+       LayoutModuleList.h \
        Length.h \
        Lexer.h \
        LyXAction.h \
@@ -235,10 +246,10 @@ HEADERFILESCORE = \
        output_docbook.h \
        output.h \
        output_latex.h \
+       output_xhtml.h \
        OutputParams.h \
        output_plaintext.h \
        paper.h \
-       paragraph_funcs.h \
        Paragraph.h \
        ParagraphList.h \
        ParagraphMetrics.h \
@@ -252,7 +263,7 @@ HEADERFILESCORE = \
        Session.h \
        sgml.h \
        Spacing.h \
-       SpellBase.h \
+       SpellChecker.h \
        TexRow.h \
        TexStream.h \
        Text.h \
@@ -280,19 +291,40 @@ if MONOLITHIC_CORE
 BUILT_SOURCES += lyxcore.cpp $(STANDALONEFILES)
 CLEANFILES += lyxcore.cpp
 
-liblyxcore_la_SOURCES = lyxcore.cpp $(STANDALONEFILES) $(HEADERFILESCORE)
+liblyxcore_a_SOURCES = lyxcore.cpp $(STANDALONEFILES) $(HEADERFILESCORE)
 
 else
 
-liblyxcore_la_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
+liblyxcore_a_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
+
+endif
+
+#########################  Qt stuff  ##############################
+
+MOCHEADER = Compare.h
+
+if INSTALL_WINDOWS
+
+MOCHEADER += Server.h
+MOCFLAG = -D_WIN32
 
 endif
 
+MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
+
+BUILT_SOURCES += $(MOCEDFILES)
+CLEANFILES += $(MOCEDFILES)
+
+moc_%.cpp: %.h
+       $(MOC4) $(MOCFLAG) -o $@ $<
+
+liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
+
 ############################### Graphics ##############################
 
-noinst_LTLIBRARIES += liblyxgraphics.la
+noinst_LIBRARIES += liblyxgraphics.a
 
-liblyxgraphics_la_SOURCES = \
+liblyxgraphics_a_SOURCES = \
        graphics/GraphicsCache.h \
        graphics/GraphicsCache.cpp \
        graphics/GraphicsCacheItem.h \
@@ -317,7 +349,7 @@ liblyxgraphics_la_SOURCES = \
 
 EXTRA_DIST += mathed/InsetFormulaMacro.cpp
 
-noinst_LTLIBRARIES += liblyxmathed.la
+noinst_LIBRARIES += liblyxmathed.a
 
 SOURCEFILESMATHED = \
        mathed/InsetMathAMSArray.cpp \
@@ -453,7 +485,7 @@ HEADERFILESMATHED = \
        mathed/ReplaceData.h \
        mathed/MathStream.h \
        mathed/MathSupport.h \
-       mathed/TextPainter.h 
+       mathed/TextPainter.h
 
 lyxmathed.cpp:
        @echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@
@@ -463,17 +495,17 @@ if MONOLITHIC_MATHED
 BUILT_SOURCES += lyxmathed.cpp
 CLEANFILES += lyxmathed.cpp
 
-liblyxmathed_la_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
+liblyxmathed_a_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
 
 else
 
-liblyxmathed_la_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED) 
+liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
 
 endif
 
 ############################### Insets  ##############################
 
-noinst_LTLIBRARIES += liblyxinsets.la
+noinst_LIBRARIES += liblyxinsets.a
 
 SOURCEFILESINSETS = \
        insets/ExternalSupport.cpp \
@@ -516,6 +548,7 @@ SOURCEFILESINSETS = \
        insets/InsetNomencl.cpp \
        insets/InsetNote.cpp \
        insets/InsetOptArg.cpp \
+       insets/InsetPhantom.cpp \
        insets/InsetQuotes.cpp \
        insets/InsetRef.cpp \
        insets/InsetSpace.cpp \
@@ -569,6 +602,7 @@ HEADERFILESINSETS = \
        insets/InsetNomencl.h \
        insets/InsetNote.h \
        insets/InsetOptArg.h \
+       insets/InsetPhantom.h \
        insets/InsetQuotes.h \
        insets/InsetRef.h \
        insets/InsetSpace.h \
@@ -592,10 +626,10 @@ if MONOLITHIC_INSETS
 BUILT_SOURCES += lyxinsets.cpp
 CLEANFILES += lyxinsets.cpp
 
-liblyxinsets_la_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
+liblyxinsets_a_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
 
 else
 
-liblyxinsets_la_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
+liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
 
 endif