Make the fake sequence for braces highly unlikely (addressing #6478).

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 721199a9b69ca3e29529463507245a6635031447..54b8d65308393c314cfe9c53b80bbd65c7c245c2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,8 @@ 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) 
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS)
+AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
 CLIENT = client
@@ -21,7 +21,7 @@ EXTRA_DIST = Section.h \
        pch.h
 
 OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \
-           @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI)
+                $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 noinst_LIBRARIES = liblyxcore.a
 bin_PROGRAMS = lyx
@@ -36,7 +36,7 @@ lyx_LDADD = \
        support/liblyxsupport.a \
        $(OTHERLIBS) \
        $(QT4_LDFLAGS) \
-       $(QT4_LIB) 
+       $(QT4_LIB)
 
 if LYX_WIN_RESOURCE
 .rc.o:
@@ -49,7 +49,15 @@ endif
 BUILT_SOURCES = $(PCH_FILE)
 
 if USE_ASPELL
-ASPELL = ASpell.cpp ASpell_local.h
+ASPELL = AspellChecker.cpp AspellChecker.h
+endif
+
+if USE_ENCHANT
+ENCHANT = EnchantChecker.cpp EnchantChecker.h
+endif
+
+if USE_HUNSPELL
+HUNSPELL = HunspellChecker.cpp HunspellChecker.h
 endif
 
 # These four objects are linked as object files as they are not
@@ -58,13 +66,17 @@ endif
 # and in fact libtools seems not able to do that.
 lyx_SOURCES = \
        main.cpp \
-       $(ASPELL) SpellBase.cpp \
+       $(ASPELL) \
        BiblioInfo.h \
        BiblioInfo.cpp \
        Box.cpp \
        Box.h \
+       Compare.cpp \
+       Compare.h \
        Dimension.cpp \
        Dimension.h \
+       $(ENCHANT) \
+       $(HUNSPELL) \
        PrinterParams.cpp \
        PrinterParams.h \
        Thesaurus.cpp \
@@ -111,6 +123,8 @@ SOURCEFILESCORE = \
        FuncRequest.cpp \
        FuncStatus.cpp \
        Graph.cpp \
+       HSpace.cpp \
+       IndicesList.cpp \
        InsetIterator.cpp \
        InsetList.cpp \
        Intl.cpp \
@@ -120,6 +134,7 @@ SOURCEFILESCORE = \
        LaTeX.cpp \
        LaTeXFeatures.cpp \
        LayoutFile.cpp \
+       LayoutModuleList.cpp \
        Length.cpp \
        lengthcommon.cpp \
        Lexer.cpp \
@@ -135,10 +150,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 \
@@ -181,6 +196,7 @@ HEADERFILESCORE = \
        CmdDef.h \
        ColorCode.h \
        Color.h \
+       ColorSet.h \
        CompletionList.h \
        ConverterCache.h \
        Converter.h \
@@ -207,6 +223,8 @@ HEADERFILESCORE = \
        FuncRequest.h \
        FuncStatus.h \
        Graph.h \
+       HSpace.h \
+       IndicesList.h \
        InsetIterator.h \
        InsetList.h \
        Intl.h \
@@ -218,6 +236,7 @@ HEADERFILESCORE = \
        Layout.h \
        LayoutEnums.h \
        LayoutFile.h \
+       LayoutModuleList.h \
        Length.h \
        Lexer.h \
        LyXAction.h \
@@ -231,11 +250,12 @@ HEADERFILESCORE = \
        Mover.h \
        output_docbook.h \
        output.h \
+       OutputEnums.h \
        output_latex.h \
+       output_xhtml.h \
        OutputParams.h \
        output_plaintext.h \
        paper.h \
-       paragraph_funcs.h \
        Paragraph.h \
        ParagraphList.h \
        ParagraphMetrics.h \
@@ -249,7 +269,7 @@ HEADERFILESCORE = \
        Session.h \
        sgml.h \
        Spacing.h \
-       SpellBase.h \
+       SpellChecker.h \
        TexRow.h \
        TexStream.h \
        Text.h \
@@ -285,6 +305,27 @@ 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_LIBRARIES += liblyxgraphics.a
@@ -450,7 +491,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' > $@
@@ -464,7 +505,7 @@ liblyxmathed_a_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
 
 else
 
-liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED) 
+liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
 
 endif
 
@@ -513,6 +554,7 @@ SOURCEFILESINSETS = \
        insets/InsetNomencl.cpp \
        insets/InsetNote.cpp \
        insets/InsetOptArg.cpp \
+       insets/InsetPhantom.cpp \
        insets/InsetQuotes.cpp \
        insets/InsetRef.cpp \
        insets/InsetSpace.cpp \
@@ -566,6 +608,7 @@ HEADERFILESINSETS = \
        insets/InsetNomencl.h \
        insets/InsetNote.h \
        insets/InsetOptArg.h \
+       insets/InsetPhantom.h \
        insets/InsetQuotes.h \
        insets/InsetRef.h \
        insets/InsetSpace.h \