############################### 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
CLIENT = client
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)
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) \
+ $(ENCHANT_LIBS) $(HUNSPELL_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
-noinst_LTLIBRARIES = liblyxcore.la
+noinst_LIBRARIES = liblyxcore.a
bin_PROGRAMS = lyx
lyx_LDADD = \
- liblyxcore.la \
- liblyxmathed.la \
- liblyxinsets.la \
- frontends/liblyxfrontends.la \
- frontends/qt4/liblyxqt4.la \
- liblyxgraphics.la \
- support/liblyxsupport.la \
+ liblyxcore.a \
+ liblyxmathed.a \
+ liblyxinsets.a \
+ frontends/liblyxfrontends.a \
+ frontends/qt4/liblyxqt4.a \
+ liblyxgraphics.a \
+ support/liblyxsupport.a \
$(OTHERLIBS) \
- $(QT4_LIB)
+ $(QT4_LDFLAGS) \
+ $(QT4_LIB)
if LYX_WIN_RESOURCE
.rc.o:
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_PSPELL
-PSPELL = PSpell.cpp PSpell.h
+
+if USE_ENCHANT
+ENCHANT = EnchantChecker.cpp EnchantChecker.h
+PWL = PersonalWordList.cpp PersonalWordList.h
endif
-if USE_ISPELL
-ISPELL = ISpell.cpp ISpell.h
+
+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
# and in fact libtools seems not able to do that.
lyx_SOURCES = \
main.cpp \
- $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.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 \
FuncRequest.cpp \
FuncStatus.cpp \
Graph.cpp \
+ HSpace.cpp \
+ IndicesList.cpp \
InsetIterator.cpp \
InsetList.cpp \
Intl.cpp \
Language.cpp \
LaTeX.cpp \
LaTeXFeatures.cpp \
+ LaTeXPackages.cpp \
LayoutFile.cpp \
+ LayoutModuleList.cpp \
Length.cpp \
lengthcommon.cpp \
Lexer.cpp \
LyX.cpp \
LyXAction.cpp \
lyxfind.cpp \
- LyXFunc.cpp \
LyXRC.cpp \
LyXVC.cpp \
MetricsInfo.cpp \
output_docbook.cpp \
output.cpp \
output_latex.cpp \
+ output_xhtml.cpp \
OutputParams.cpp \
output_plaintext.cpp \
Paragraph.cpp \
- paragraph_funcs.cpp \
ParagraphMetrics.cpp \
ParagraphParameters.cpp \
ParIterator.cpp \
CmdDef.h \
ColorCode.h \
Color.h \
+ ColorSet.h \
CompletionList.h \
ConverterCache.h \
Converter.h \
FuncRequest.h \
FuncStatus.h \
Graph.h \
+ HSpace.h \
+ IndicesList.h \
InsetIterator.h \
InsetList.h \
Intl.h \
KeySequence.h \
Language.h \
LaTeXFeatures.h \
+ LaTeXPackages.h \
LaTeX.h \
Layout.h \
LayoutEnums.h \
LayoutFile.h \
+ LayoutModuleList.h \
Length.h \
Lexer.h \
LyXAction.h \
lyxfind.h \
- LyXFunc.h \
LyX.h \
LyXRC.h \
LyXVC.h \
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 \
Session.h \
sgml.h \
Spacing.h \
- SpellBase.h \
+ SpellChecker.h \
TexRow.h \
TexStream.h \
Text.h \
BUILT_SOURCES += lyxcore.cpp $(STANDALONEFILES)
CLEANFILES += lyxcore.cpp
-liblyxcore_la_SOURCES = lyxcore.cpp $(STANDALONEFILES) $(HEADERFILESCORE)
+liblyxcore_a_SOURCES = lyxcore.cpp $(STANDALONEFILES) $(HEADERFILESCORE)
else
-liblyxcore_la_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
+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_LTLIBRARIES += liblyxgraphics.la
+noinst_LIBRARIES += liblyxgraphics.a
-liblyxgraphics_la_SOURCES = \
+liblyxgraphics_a_SOURCES = \
graphics/GraphicsCache.h \
graphics/GraphicsCache.cpp \
graphics/GraphicsCacheItem.h \
graphics/PreviewImage.h \
graphics/PreviewImage.cpp \
graphics/PreviewLoader.h \
- graphics/PreviewLoader.cpp \
- graphics/Previews.h \
- graphics/Previews.cpp
+ graphics/PreviewLoader.cpp
############################### Mathed ##############################
EXTRA_DIST += mathed/InsetFormulaMacro.cpp
-noinst_LTLIBRARIES += liblyxmathed.la
+noinst_LIBRARIES += liblyxmathed.a
SOURCEFILESMATHED = \
mathed/InsetMathAMSArray.cpp \
mathed/InsetMathUnknown.cpp \
mathed/InsetMathXArrow.cpp \
mathed/InsetMathXYMatrix.cpp \
+ mathed/InsetMathDiagram.cpp \
mathed/MathAtom.cpp \
mathed/MathAutoCorrect.cpp \
mathed/MathData.cpp \
mathed/InsetMathUnknown.h \
mathed/InsetMathXArrow.h \
mathed/InsetMathXYMatrix.h \
+ mathed/InsetMathDiagram.h \
mathed/MathAtom.h \
mathed/MathAutoCorrect.h \
mathed/MathData.h \
mathed/ReplaceData.h \
mathed/MathStream.h \
mathed/MathSupport.h \
- mathed/TextPainter.h
+ mathed/TextPainter.h
lyxmathed.cpp:
@echo -e '$(SOURCEFILESMATHED:%=\n#include "%")\n' > $@
BUILT_SOURCES += lyxmathed.cpp
CLEANFILES += lyxmathed.cpp
-liblyxmathed_la_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
+liblyxmathed_a_SOURCES = lyxmathed.cpp $(HEADERFILESMATHED)
else
-liblyxmathed_la_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
+liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
endif
############################### Insets ##############################
-noinst_LTLIBRARIES += liblyxinsets.la
+noinst_LIBRARIES += liblyxinsets.a
SOURCEFILESINSETS = \
insets/ExternalSupport.cpp \
insets/RenderGraphic.cpp \
insets/RenderPreview.cpp \
insets/Inset.cpp \
+ insets/InsetArgument.cpp \
insets/InsetBibitem.cpp \
insets/InsetBibtex.cpp \
insets/InsetBox.cpp \
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 \
insets/RenderGraphic.h \
insets/RenderPreview.h \
insets/Inset.h \
+ insets/InsetArgument.h \
insets/InsetBibitem.h \
insets/InsetBibtex.h \
insets/InsetBox.h \
insets/InsetInclude.h \
insets/InsetIndex.h \
insets/InsetInfo.h \
+ insets/InsetPreview.h \
insets/InsetLabel.h \
insets/InsetLayout.h \
insets/InsetLine.h \
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 \
BUILT_SOURCES += lyxinsets.cpp
CLEANFILES += lyxinsets.cpp
-liblyxinsets_la_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
+liblyxinsets_a_SOURCES = lyxinsets.cpp $(HEADERFILESINSETS)
else
-liblyxinsets_la_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
+liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
endif
projects / lyx.git / blobdiff