HTML for math fonts.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b6c4242226079705e418facdf6af44d333322f59..e6c2dacf41e06c4a4b7252ba733300232db93e9d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/config/common.am
 
 DISTCLEANFILES += config.h libintl.h
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS)
 AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
@@ -13,15 +13,11 @@ endif
 
 SUBDIRS = support frontends . $(CLIENT) tex2lyx
 
-EXTRA_DIST = Section.h \
-       Section.cpp \
-       Variables.cpp \
-       Variables.h \
-       paper.h \
+EXTRA_DIST = paper.h \
        pch.h
 
 OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \
-               @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
+                $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 noinst_LIBRARIES = liblyxcore.a
 bin_PROGRAMS = lyx
@@ -52,6 +48,10 @@ if USE_ASPELL
 ASPELL = AspellChecker.cpp AspellChecker.h
 endif
 
+if USE_ENCHANT
+ENCHANT = EnchantChecker.cpp EnchantChecker.h
+endif
+
 if USE_HUNSPELL
 HUNSPELL = HunspellChecker.cpp HunspellChecker.h
 endif
@@ -67,8 +67,11 @@ lyx_SOURCES = \
        BiblioInfo.cpp \
        Box.cpp \
        Box.h \
+       Compare.cpp \
+       Compare.h \
        Dimension.cpp \
        Dimension.h \
+       $(ENCHANT) \
        $(HUNSPELL) \
        PrinterParams.cpp \
        PrinterParams.h \
@@ -134,7 +137,6 @@ SOURCEFILESCORE = \
        LyX.cpp \
        LyXAction.cpp \
        lyxfind.cpp \
-       LyXFunc.cpp \
        LyXRC.cpp \
        LyXVC.cpp \
        MetricsInfo.cpp \
@@ -234,7 +236,6 @@ HEADERFILESCORE = \
        Lexer.h \
        LyXAction.h \
        lyxfind.h \
-       LyXFunc.h \
        LyX.h \
        LyXRC.h \
        LyXVC.h \
@@ -243,6 +244,7 @@ HEADERFILESCORE = \
        Mover.h \
        output_docbook.h \
        output.h \
+       OutputEnums.h \
        output_latex.h \
        output_xhtml.h \
        OutputParams.h \
@@ -297,9 +299,16 @@ liblyxcore_a_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
 
 endif
 
+#########################  Qt stuff  ##############################
+
+MOCHEADER = Compare.h
+
 if INSTALL_WINDOWS
 
-MOCHEADER = Server.h
+MOCHEADER += Server.h
+MOCFLAG = -D_WIN32
+
+endif
 
 MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 
@@ -307,12 +316,10 @@ BUILT_SOURCES += $(MOCEDFILES)
 CLEANFILES += $(MOCEDFILES)
 
 moc_%.cpp: %.h
-       $(MOC4) -D_WIN32 -o $@ $<
+       $(MOC4) $(MOCFLAG) -o $@ $<
 
 liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
 
-endif
-
 ############################### Graphics ##############################
 
 noinst_LIBRARIES += liblyxgraphics.a
@@ -542,6 +549,7 @@ SOURCEFILESINSETS = \
        insets/InsetNote.cpp \
        insets/InsetOptArg.cpp \
        insets/InsetPhantom.cpp \
+       insets/InsetPreview.cpp \
        insets/InsetQuotes.cpp \
        insets/InsetRef.cpp \
        insets/InsetSpace.cpp \
@@ -584,6 +592,7 @@ HEADERFILESINSETS = \
        insets/InsetInclude.h \
        insets/InsetIndex.h \
        insets/InsetInfo.h \
+       insets/InsetPreview.h \
        insets/InsetLabel.h \
        insets/InsetLayout.h \
        insets/InsetLine.h \