listerrors.lyx : Update a link.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c32ab7fa3cc3833c64114a98e83ebc95d35c890f..81249b477d8f9767a0efd6710aad76c55cc8d6b6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,9 @@ include $(top_srcdir)/config/common.am
 
 ############################### Core  ##############################
 
-DISTCLEANFILES += config.h libintl.h
+DISTCLEANFILES += libintl.h
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
 AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
@@ -13,15 +13,10 @@ endif
 
 SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
-EXTRA_DIST = Section.h \
-       Section.cpp \
-       Variables.cpp \
-       Variables.h \
-       paper.h \
-       pch.h
+EXTRA_DIST = pch.h
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \
-               @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) \
+                $(ENCHANT_LIBS) $(HUNSPELL_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 noinst_LIBRARIES = liblyxcore.a
 bin_PROGRAMS = lyx
@@ -44,16 +39,31 @@ if LYX_WIN_RESOURCE
        windres -I$(top_builddir) --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
 endif
 
+if INSTALL_MACOSX
+lyx_LDFLAGS = -framework AppKit
+endif
+
 #lyx_LDFLAGS=-Wl,-O1
 
 BUILT_SOURCES = $(PCH_FILE)
 
+if INSTALL_MACOSX
+APPLESPELL = AppleSpellChecker.cpp AppleSpellChecker.h
+endif
+
 if USE_ASPELL
-ASPELL = ASpell.cpp ASpell_local.h
+ASPELL = AspellChecker.cpp AspellChecker.h
+PWL = PersonalWordList.cpp PersonalWordList.h
+endif
+
+if USE_ENCHANT
+ENCHANT = EnchantChecker.cpp EnchantChecker.h
+PWL = PersonalWordList.cpp PersonalWordList.h
 endif
 
 if USE_HUNSPELL
-HUNSPELL = HunspellSpellChecker.cpp HunspellSpellChecker.h
+HUNSPELL = HunspellChecker.cpp HunspellChecker.h
+PWL = PersonalWordList.cpp PersonalWordList.h
 endif
 
 # These four objects are linked as object files as they are not
@@ -62,14 +72,19 @@ endif
 # and in fact libtools seems not able to do that.
 lyx_SOURCES = \
        main.cpp \
+       $(APPLESPELL) \
        $(ASPELL) \
        BiblioInfo.h \
        BiblioInfo.cpp \
        Box.cpp \
        Box.h \
+       Compare.cpp \
+       Compare.h \
        Dimension.cpp \
        Dimension.h \
+       $(ENCHANT) \
        $(HUNSPELL) \
+       $(PWL) \
        PrinterParams.cpp \
        PrinterParams.h \
        Thesaurus.cpp \
@@ -126,6 +141,7 @@ SOURCEFILESCORE = \
        Language.cpp \
        LaTeX.cpp \
        LaTeXFeatures.cpp \
+       LaTeXPackages.cpp \
        LayoutFile.cpp \
        LayoutModuleList.cpp \
        Length.cpp \
@@ -134,7 +150,6 @@ SOURCEFILESCORE = \
        LyX.cpp \
        LyXAction.cpp \
        lyxfind.cpp \
-       LyXFunc.cpp \
        LyXRC.cpp \
        LyXVC.cpp \
        MetricsInfo.cpp \
@@ -147,7 +162,6 @@ SOURCEFILESCORE = \
        OutputParams.cpp \
        output_plaintext.cpp \
        Paragraph.cpp \
-       paragraph_funcs.cpp \
        ParagraphMetrics.cpp \
        ParagraphParameters.cpp \
        ParIterator.cpp \
@@ -226,6 +240,7 @@ HEADERFILESCORE = \
        KeySequence.h \
        Language.h \
        LaTeXFeatures.h \
+       LaTeXPackages.h \
        LaTeX.h \
        Layout.h \
        LayoutEnums.h \
@@ -235,7 +250,6 @@ HEADERFILESCORE = \
        Lexer.h \
        LyXAction.h \
        lyxfind.h \
-       LyXFunc.h \
        LyX.h \
        LyXRC.h \
        LyXVC.h \
@@ -244,12 +258,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 \
@@ -299,6 +313,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
@@ -319,9 +354,7 @@ liblyxgraphics_a_SOURCES = \
        graphics/PreviewImage.h \
        graphics/PreviewImage.cpp \
        graphics/PreviewLoader.h \
-       graphics/PreviewLoader.cpp \
-       graphics/Previews.h \
-       graphics/Previews.cpp
+       graphics/PreviewLoader.cpp
 
 
 ############################### Mathed  ##############################
@@ -384,6 +417,7 @@ SOURCEFILESMATHED = \
        mathed/InsetMathUnknown.cpp \
        mathed/InsetMathXArrow.cpp \
        mathed/InsetMathXYMatrix.cpp \
+       mathed/InsetMathDiagram.cpp \
        mathed/MathAtom.cpp \
        mathed/MathAutoCorrect.cpp \
        mathed/MathData.cpp \
@@ -449,6 +483,7 @@ HEADERFILESMATHED = \
        mathed/InsetMathUnknown.h \
        mathed/InsetMathXArrow.h \
        mathed/InsetMathXYMatrix.h \
+       mathed/InsetMathDiagram.h \
        mathed/MathAtom.h \
        mathed/MathAutoCorrect.h \
        mathed/MathData.h \
@@ -494,6 +529,7 @@ SOURCEFILESINSETS = \
        insets/RenderGraphic.cpp \
        insets/RenderPreview.cpp \
        insets/Inset.cpp \
+       insets/InsetArgument.cpp \
        insets/InsetBibitem.cpp \
        insets/InsetBibtex.cpp \
        insets/InsetBox.cpp \
@@ -526,10 +562,11 @@ SOURCEFILESINSETS = \
        insets/InsetNewpage.cpp \
        insets/InsetNomencl.cpp \
        insets/InsetNote.cpp \
-       insets/InsetOptArg.cpp \
        insets/InsetPhantom.cpp \
+       insets/InsetPreview.cpp \
        insets/InsetQuotes.cpp \
        insets/InsetRef.cpp \
+       insets/InsetScript.cpp \
        insets/InsetSpace.cpp \
        insets/InsetSpecialChar.cpp \
        insets/InsetTabular.cpp \
@@ -547,6 +584,7 @@ HEADERFILESINSETS = \
        insets/RenderGraphic.h \
        insets/RenderPreview.h \
        insets/Inset.h \
+       insets/InsetArgument.h \
        insets/InsetBibitem.h \
        insets/InsetBibtex.h \
        insets/InsetBox.h \
@@ -570,6 +608,7 @@ HEADERFILESINSETS = \
        insets/InsetInclude.h \
        insets/InsetIndex.h \
        insets/InsetInfo.h \
+       insets/InsetPreview.h \
        insets/InsetLabel.h \
        insets/InsetLayout.h \
        insets/InsetLine.h \
@@ -580,10 +619,10 @@ HEADERFILESINSETS = \
        insets/InsetNewpage.h \
        insets/InsetNomencl.h \
        insets/InsetNote.h \
-       insets/InsetOptArg.h \
        insets/InsetPhantom.h \
        insets/InsetQuotes.h \
        insets/InsetRef.h \
+       insets/InsetScript.h \
        insets/InsetSpace.h \
        insets/InsetSpecialChar.h \
        insets/InsetTabular.h \