Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f0c4ca3ad1d2057a4eae05cd6d19e6908be6e78e..125f1dbf2bdf420a80fdce87d0124a459cfca0fe 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,7 @@ include $(top_srcdir)/config/common.am
 
 ############################### Core  ##############################
 
-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 +13,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) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \
+            @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 noinst_LIBRARIES = liblyxcore.a
 bin_PROGRAMS = lyx
@@ -39,24 +37,31 @@ if LYX_WIN_RESOURCE
        windres -I$(top_builddir) --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
 endif
 
+if INSTALL_MACOSX
+lyx_LDFLAGS = -framework AppKit -framework ApplicationServices
+endif
+
 #lyx_LDFLAGS=-Wl,-O1
 
 BUILT_SOURCES = $(PCH_FILE)
 
 if INSTALL_MACOSX
-ASPELL = AppleSpellChecker.cpp AppleSpellChecker.h
+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
@@ -65,6 +70,7 @@ endif
 # and in fact libtools seems not able to do that.
 lyx_SOURCES = \
        main.cpp \
+       $(APPLESPELL) \
        $(ASPELL) \
        BiblioInfo.h \
        BiblioInfo.cpp \
@@ -76,6 +82,9 @@ lyx_SOURCES = \
        Dimension.h \
        $(ENCHANT) \
        $(HUNSPELL) \
+       $(PWL) \
+       LaTeXFonts.cpp \
+       LaTeXFonts.h \
        PrinterParams.cpp \
        PrinterParams.h \
        Thesaurus.cpp \
@@ -132,6 +141,7 @@ SOURCEFILESCORE = \
        Language.cpp \
        LaTeX.cpp \
        LaTeXFeatures.cpp \
+       LaTeXPackages.cpp \
        LayoutFile.cpp \
        LayoutModuleList.cpp \
        Length.cpp \
@@ -206,6 +216,7 @@ HEADERFILESCORE = \
        DepTable.h \
        DispatchResult.h \
        DocIterator.h \
+       DocumentClassPtr.h \
        Encoding.h \
        ErrorList.h \
        Exporter.h \
@@ -230,6 +241,7 @@ HEADERFILESCORE = \
        KeySequence.h \
        Language.h \
        LaTeXFeatures.h \
+       LaTeXPackages.h \
        LaTeX.h \
        Layout.h \
        LayoutEnums.h \
@@ -328,6 +340,8 @@ liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
 noinst_LIBRARIES += liblyxgraphics.a
 
 liblyxgraphics_a_SOURCES = \
+       graphics/epstools.h \
+       graphics/epstools.cpp \
        graphics/GraphicsCache.h \
        graphics/GraphicsCache.cpp \
        graphics/GraphicsCacheItem.h \
@@ -343,18 +357,15 @@ 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  ##############################
 
-EXTRA_DIST += mathed/InsetFormulaMacro.cpp
-
 noinst_LIBRARIES += liblyxmathed.a
 
 SOURCEFILESMATHED = \
+       mathed/CommandInset.cpp \
        mathed/InsetMathAMSArray.cpp \
        mathed/InsetMathArray.cpp \
        mathed/InsetMathBig.cpp \
@@ -365,7 +376,6 @@ SOURCEFILESMATHED = \
        mathed/InsetMathCases.cpp \
        mathed/InsetMathChar.cpp \
        mathed/InsetMathColor.cpp \
-       mathed/CommandInset.cpp \
        mathed/InsetMathComment.cpp \
        mathed/InsetMathDecoration.cpp \
        mathed/InsetMathDecoration.h \
@@ -384,7 +394,8 @@ SOURCEFILESMATHED = \
        mathed/InsetMathKern.cpp \
        mathed/InsetMathLefteqn.cpp \
        mathed/InsetMathLim.cpp \
-       mathed/MathMacro.cpp \
+       mathed/InsetMathCancel.cpp \
+       mathed/InsetMathCancelto.cpp \
        mathed/InsetMathMatrix.cpp \
        mathed/InsetMathNest.cpp \
        mathed/InsetMathNumber.cpp \
@@ -394,6 +405,7 @@ SOURCEFILESMATHED = \
        mathed/InsetMathRef.cpp \
        mathed/InsetMathRoot.cpp \
        mathed/InsetMathScript.cpp \
+       mathed/InsetMathSideset.cpp \
        mathed/InsetMathSize.cpp \
        mathed/InsetMathSpace.cpp \
        mathed/InsetMathSpecialChar.cpp \
@@ -408,11 +420,13 @@ SOURCEFILESMATHED = \
        mathed/InsetMathUnknown.cpp \
        mathed/InsetMathXArrow.cpp \
        mathed/InsetMathXYMatrix.cpp \
+       mathed/InsetMathDiagram.cpp \
        mathed/MathAtom.cpp \
        mathed/MathAutoCorrect.cpp \
        mathed/MathData.cpp \
        mathed/MathExtern.cpp \
        mathed/MathFactory.cpp \
+       mathed/MathMacro.cpp \
        mathed/MathMacroArgument.cpp \
        mathed/MacroTable.cpp \
        mathed/MathMacroTemplate.cpp \
@@ -422,16 +436,18 @@ SOURCEFILESMATHED = \
        mathed/TextPainter.cpp
 
 HEADERFILESMATHED = \
+       mathed/CommandInset.h \
        mathed/InsetMathAMSArray.h \
        mathed/InsetMathArray.h \
        mathed/InsetMathBig.h \
        mathed/InsetMathBoldSymbol.h \
        mathed/InsetMathBox.h \
        mathed/InsetMathBrace.h \
+       mathed/InsetMathCancel.h \
+       mathed/InsetMathCancelto.h \
        mathed/InsetMathCases.h \
        mathed/InsetMathChar.h \
        mathed/InsetMathColor.h \
-       mathed/CommandInset.h \
        mathed/InsetMathComment.h \
        mathed/InsetMathDelim.h \
        mathed/InsetMathDiff.h \
@@ -449,7 +465,6 @@ HEADERFILESMATHED = \
        mathed/InsetMathKern.h \
        mathed/InsetMathLefteqn.h \
        mathed/InsetMathLim.h \
-       mathed/MathMacro.h \
        mathed/InsetMathMatrix.h \
        mathed/InsetMathNest.h \
        mathed/InsetMathNumber.h \
@@ -459,6 +474,7 @@ HEADERFILESMATHED = \
        mathed/InsetMathRef.h \
        mathed/InsetMathRoot.h \
        mathed/InsetMathScript.h \
+       mathed/InsetMathSideset.h \
        mathed/InsetMathSize.h \
        mathed/InsetMathSpace.h \
        mathed/InsetMathSpecialChar.h \
@@ -473,13 +489,14 @@ HEADERFILESMATHED = \
        mathed/InsetMathUnknown.h \
        mathed/InsetMathXArrow.h \
        mathed/InsetMathXYMatrix.h \
+       mathed/InsetMathDiagram.h \
        mathed/MathAtom.h \
        mathed/MathAutoCorrect.h \
        mathed/MathData.h \
        mathed/MathCompletionList.h \
        mathed/MathExtern.h \
        mathed/MathFactory.h \
-       mathed/MathGridInfo.h \
+       mathed/MathMacro.h \
        mathed/MathMacroArgument.h \
        mathed/MacroTable.h \
        mathed/MathMacroTemplate.h \
@@ -541,6 +558,8 @@ SOURCEFILESINSETS = \
        insets/InsetInclude.cpp \
        insets/InsetIndex.cpp \
        insets/InsetInfo.cpp \
+       insets/InsetIPA.cpp \
+       insets/InsetIPAMacro.cpp \
        insets/InsetLabel.cpp \
        insets/InsetLayout.cpp \
        insets/InsetLine.cpp \
@@ -555,6 +574,7 @@ SOURCEFILESINSETS = \
        insets/InsetPreview.cpp \
        insets/InsetQuotes.cpp \
        insets/InsetRef.cpp \
+       insets/InsetScript.cpp \
        insets/InsetSpace.cpp \
        insets/InsetSpecialChar.cpp \
        insets/InsetTabular.cpp \
@@ -596,6 +616,8 @@ HEADERFILESINSETS = \
        insets/InsetInclude.h \
        insets/InsetIndex.h \
        insets/InsetInfo.h \
+       insets/InsetIPA.h \
+       insets/InsetIPAMacro.h \
        insets/InsetPreview.h \
        insets/InsetLabel.h \
        insets/InsetLayout.h \
@@ -610,6 +632,7 @@ HEADERFILESINSETS = \
        insets/InsetPhantom.h \
        insets/InsetQuotes.h \
        insets/InsetRef.h \
+       insets/InsetScript.h \
        insets/InsetSpace.h \
        insets/InsetSpecialChar.h \
        insets/InsetTabular.h \
@@ -638,3 +661,38 @@ else
 liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
 
 endif
+
+
+############################## Tests ##################################
+
+EXTRA_DIST += \
+       tests/test_layout
+
+
+TESTS = \
+       tests/test_layout
+
+check_PROGRAMS = \
+       check_layout
+
+check_layout_CPPFLAGS = $(AM_CPPFLAGS) -DNO_LAYOUT_CSS
+check_layout_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT4_CORE_LIBS) $(LIBSHLWAPI)
+# need to allow multiple definitions of _() (see dummy_functions.cpp)
+check_layout_LDFLAGS = $(QT4_CORE_LDFLAGS) -Wl,--allow-multiple-definition
+check_layout_SOURCES = \
+       insets/InsetLayout.cpp \
+       Color.cpp \
+       Counters.cpp \
+       Floating.cpp \
+       FloatList.cpp \
+       FontInfo.cpp \
+       Layout.cpp \
+       LayoutFile.cpp \
+       Lexer.cpp \
+       ModuleList.cpp \
+       Spacing.cpp \
+       TextClass.cpp \
+       tests/check_layout.cpp \
+       support/tests/boost.cpp \
+       support/tests/dummy_functions.cpp
+