* src/LaTeXFeatures.cpp: simplify greektext definition. Patch by G. Milde (bug #6458)

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 736544e585530e8f19ec912c6feea74c13e0caee..5154354be2de8362bc87073061d43dc616d9a85f 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,30 +13,26 @@ 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
 
 lyx_LDADD = \
        liblyxcore.a \
-       liblyxmathed.a \
-       liblyxinsets.a \
+       mathed/liblyxmathed.a \
+       insets/liblyxinsets.a \
        frontends/liblyxfrontends.a \
        frontends/qt4/liblyxqt4.a \
-       liblyxgraphics.a \
+       graphics/liblyxgraphics.a \
        support/liblyxsupport.a \
        $(OTHERLIBS) \
        $(QT4_LDFLAGS) \
-       $(QT4_LIB) 
+       $(QT4_LIB)
 
 if LYX_WIN_RESOURCE
 .rc.o:
@@ -49,7 +45,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
@@ -63,8 +67,12 @@ lyx_SOURCES = \
        BiblioInfo.cpp \
        Box.cpp \
        Box.h \
+       Compare.cpp \
+       Compare.h \
        Dimension.cpp \
        Dimension.h \
+       $(ENCHANT) \
+       $(HUNSPELL) \
        PrinterParams.cpp \
        PrinterParams.h \
        Thesaurus.cpp \
@@ -111,6 +119,7 @@ SOURCEFILESCORE = \
        FuncRequest.cpp \
        FuncStatus.cpp \
        Graph.cpp \
+       HSpace.cpp \
        IndicesList.cpp \
        InsetIterator.cpp \
        InsetList.cpp \
@@ -128,7 +137,6 @@ SOURCEFILESCORE = \
        LyX.cpp \
        LyXAction.cpp \
        lyxfind.cpp \
-       LyXFunc.cpp \
        LyXRC.cpp \
        LyXVC.cpp \
        MetricsInfo.cpp \
@@ -141,7 +149,6 @@ SOURCEFILESCORE = \
        OutputParams.cpp \
        output_plaintext.cpp \
        Paragraph.cpp \
-       paragraph_funcs.cpp \
        ParagraphMetrics.cpp \
        ParagraphParameters.cpp \
        ParIterator.cpp \
@@ -211,6 +218,7 @@ HEADERFILESCORE = \
        FuncRequest.h \
        FuncStatus.h \
        Graph.h \
+       HSpace.h \
        IndicesList.h \
        InsetIterator.h \
        InsetList.h \
@@ -228,7 +236,6 @@ HEADERFILESCORE = \
        Lexer.h \
        LyXAction.h \
        lyxfind.h \
-       LyXFunc.h \
        LyX.h \
        LyXRC.h \
        LyXVC.h \
@@ -237,12 +244,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 \
@@ -292,11 +299,32 @@ 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
+noinst_LIBRARIES += graphics/liblyxgraphics.a
 
-liblyxgraphics_a_SOURCES = \
+graphics_liblyxgraphics_a_SOURCES = \
        graphics/GraphicsCache.h \
        graphics/GraphicsCache.cpp \
        graphics/GraphicsCacheItem.h \
@@ -321,7 +349,7 @@ liblyxgraphics_a_SOURCES = \
 
 EXTRA_DIST += mathed/InsetFormulaMacro.cpp
 
-noinst_LIBRARIES += liblyxmathed.a
+noinst_LIBRARIES += mathed/liblyxmathed.a
 
 SOURCEFILESMATHED = \
        mathed/InsetMathAMSArray.cpp \
@@ -457,27 +485,27 @@ HEADERFILESMATHED = \
        mathed/ReplaceData.h \
        mathed/MathStream.h \
        mathed/MathSupport.h \
-       mathed/TextPainter.h 
+       mathed/TextPainter.h
 
-lyxmathed.cpp:
+mathed/lyxmathed.cpp:
        @echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@
 
 if MONOLITHIC_MATHED
 
-BUILT_SOURCES += lyxmathed.cpp
-CLEANFILES += lyxmathed.cpp
+BUILT_SOURCES += mathed/lyxmathed.cpp
+CLEANFILES += mathed/lyxmathed.cpp
 
-liblyxmathed_a_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
+mathed_liblyxmathed_a_SOURCES = mathed/lyxmathed.cpp $(HEADERFILESMATHED)
 
 else
 
-liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED) 
+mathed_liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
 
 endif
 
 ############################### Insets  ##############################
 
-noinst_LIBRARIES += liblyxinsets.a
+noinst_LIBRARIES += insets/liblyxinsets.a
 
 SOURCEFILESINSETS = \
        insets/ExternalSupport.cpp \
@@ -521,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 \
@@ -563,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 \
@@ -590,18 +620,18 @@ HEADERFILESINSETS = \
 #      insets/InsetSection.h \
 #      insets/InsetSection.cpp
 
-lyxinsets.cpp:
+insets/lyxinsets.cpp:
        @echo -e '$(SOURCEFILESINSETS:%=\n#include "%")\n' > $@
 
 if MONOLITHIC_INSETS
 
-BUILT_SOURCES += lyxinsets.cpp
-CLEANFILES += lyxinsets.cpp
+BUILT_SOURCES += insets/lyxinsets.cpp
+CLEANFILES += insets/lyxinsets.cpp
 
-liblyxinsets_a_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
+insets_liblyxinsets_a_SOURCES = insets/lyxinsets.cpp $(HEADERFILESINSETS)
 
 else
 
-liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
+insets_liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
 
 endif