Avoid too much verbosity.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1abfe2217291014e9f9dd5dfac757bbd111f7bd1..02b9b29bb430d70b36e4f62f8d2cb5ff927b0163 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@ SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
 EXTRA_DIST = pch.h
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) \
                 $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 noinst_LIBRARIES = liblyxcore.a
@@ -43,16 +43,23 @@ endif
 
 BUILT_SOURCES = $(PCH_FILE)
 
+if INSTALL_MACOSX
+APPLESPELL = AppleSpellChecker.cpp AppleSpellChecker.h
+endif
+
 if USE_ASPELL
 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 = HunspellChecker.cpp HunspellChecker.h
+PWL = PersonalWordList.cpp PersonalWordList.h
 endif
 
 # These four objects are linked as object files as they are not
@@ -61,6 +68,7 @@ endif
 # and in fact libtools seems not able to do that.
 lyx_SOURCES = \
        main.cpp \
+       $(APPLESPELL) \
        $(ASPELL) \
        BiblioInfo.h \
        BiblioInfo.cpp \
@@ -72,6 +80,7 @@ lyx_SOURCES = \
        Dimension.h \
        $(ENCHANT) \
        $(HUNSPELL) \
+       $(PWL) \
        PrinterParams.cpp \
        PrinterParams.h \
        Thesaurus.cpp \
@@ -404,6 +413,7 @@ SOURCEFILESMATHED = \
        mathed/InsetMathUnknown.cpp \
        mathed/InsetMathXArrow.cpp \
        mathed/InsetMathXYMatrix.cpp \
+       mathed/InsetMathDiagram.cpp \
        mathed/MathAtom.cpp \
        mathed/MathAutoCorrect.cpp \
        mathed/MathData.cpp \
@@ -469,6 +479,7 @@ HEADERFILESMATHED = \
        mathed/InsetMathUnknown.h \
        mathed/InsetMathXArrow.h \
        mathed/InsetMathXYMatrix.h \
+       mathed/InsetMathDiagram.h \
        mathed/MathAtom.h \
        mathed/MathAutoCorrect.h \
        mathed/MathData.h \
@@ -514,6 +525,7 @@ SOURCEFILESINSETS = \
        insets/RenderGraphic.cpp \
        insets/RenderPreview.cpp \
        insets/Inset.cpp \
+       insets/InsetArgument.cpp \
        insets/InsetBibitem.cpp \
        insets/InsetBibtex.cpp \
        insets/InsetBox.cpp \
@@ -546,11 +558,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 \
@@ -568,6 +580,7 @@ HEADERFILESINSETS = \
        insets/RenderGraphic.h \
        insets/RenderPreview.h \
        insets/Inset.h \
+       insets/InsetArgument.h \
        insets/InsetBibitem.h \
        insets/InsetBibtex.h \
        insets/InsetBox.h \
@@ -602,10 +615,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 \