]> git.lyx.org Git - lyx.git/blobdiff - src/Makefile.am
listerrors.lyx : Update a link.
[lyx.git] / src / Makefile.am
index 87be7173578e5cf742d7f959c4f981b575369601..81249b477d8f9767a0efd6710aad76c55cc8d6b6 100644 (file)
@@ -4,7 +4,7 @@ include $(top_srcdir)/config/common.am
 
 DISTCLEANFILES += libintl.h
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS)
+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
@@ -15,8 +15,8 @@ SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
 EXTRA_DIST = pch.h
 
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \
-                $(ENCHANT_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
@@ -39,6 +39,10 @@ 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)
@@ -49,14 +53,17 @@ 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
@@ -77,6 +84,7 @@ lyx_SOURCES = \
        Dimension.h \
        $(ENCHANT) \
        $(HUNSPELL) \
+       $(PWL) \
        PrinterParams.cpp \
        PrinterParams.h \
        Thesaurus.cpp \
@@ -133,6 +141,7 @@ SOURCEFILESCORE = \
        Language.cpp \
        LaTeX.cpp \
        LaTeXFeatures.cpp \
+       LaTeXPackages.cpp \
        LayoutFile.cpp \
        LayoutModuleList.cpp \
        Length.cpp \
@@ -231,6 +240,7 @@ HEADERFILESCORE = \
        KeySequence.h \
        Language.h \
        LaTeXFeatures.h \
+       LaTeXPackages.h \
        LaTeX.h \
        Layout.h \
        LayoutEnums.h \
@@ -344,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  ##############################
@@ -558,6 +566,7 @@ SOURCEFILESINSETS = \
        insets/InsetPreview.cpp \
        insets/InsetQuotes.cpp \
        insets/InsetRef.cpp \
+       insets/InsetScript.cpp \
        insets/InsetSpace.cpp \
        insets/InsetSpecialChar.cpp \
        insets/InsetTabular.cpp \
@@ -613,6 +622,7 @@ HEADERFILESINSETS = \
        insets/InsetPhantom.h \
        insets/InsetQuotes.h \
        insets/InsetRef.h \
+       insets/InsetScript.h \
        insets/InsetSpace.h \
        insets/InsetSpecialChar.h \
        insets/InsetTabular.h \