Limit the nopassthurchars case in beamer to URL

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index be8e478007e4a70e75aabc13f90ed37e3323bcbe..44ddf66491b78235a7e185f6675d78de19aea72e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/config/common.am
 AM_CPPFLAGS += -I$(top_srcdir)/src
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES)
 AM_CPPFLAGS += $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) $(MYTHES_INCLUDES)
-AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_CORE_INCLUDES)
+AM_CPPFLAGS += $(NOD_INCLUDES) $(QT_CPPFLAGS) $(QT_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
 CLIENT = client
@@ -20,7 +20,7 @@ EXTRA_DIST = lyx_commit_hash.h.in \
        mathed/CMakeLists.txt \
        tests/CMakeLists.txt
 
-OTHERLIBS = $(BOOST_LIBS) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \
+OTHERLIBS = $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \
             @LIBS@ $(ICONV_LIBS) $(ZLIB_LIBS) $(SOCKET_LIBS) \
            $(LIBSHLWAPI) $(LIBPSAPI)
 
@@ -147,7 +147,6 @@ SOURCEFILESCORE = \
        LaTeXPackages.cpp \
        LayoutFile.cpp \
        LayoutModuleList.cpp \
-       Lexer.cpp \
        LyX.cpp \
        LyXAction.cpp \
        lyxfind.cpp \
@@ -177,8 +176,6 @@ SOURCEFILESCORE = \
        TexRow.cpp \
        texstream.cpp \
        Text.cpp \
-       Text2.cpp \
-       Text3.cpp \
        TextClass.cpp \
        TextMetrics.cpp \
        TocBackend.cpp \
@@ -249,7 +246,6 @@ HEADERFILESCORE = \
        LayoutEnums.h \
        LayoutFile.h \
        LayoutModuleList.h \
-       Lexer.h \
        LyXAction.h \
        lyxfind.h \
        LyX.h \
@@ -273,6 +269,7 @@ HEADERFILESCORE = \
        ParIterator.h \
        PDFOptions.h \
        Row.h \
+       RowFlags.h \
        RowPainter.h \
        Server.h \
        ServerSocket.h \
@@ -433,6 +430,7 @@ SOURCEFILESMATHED = \
        mathed/InsetMathSubstack.cpp \
        mathed/InsetMathSymbol.cpp \
        mathed/InsetMathTabular.cpp \
+       mathed/InsetMathTextsize.cpp \
        mathed/InsetMathUnderset.cpp \
        mathed/InsetMathUnknown.cpp \
        mathed/InsetMathXArrow.cpp \
@@ -504,6 +502,7 @@ HEADERFILESMATHED = \
        mathed/InsetMathSubstack.h \
        mathed/InsetMathSymbol.h \
        mathed/InsetMathTabular.h \
+       mathed/InsetMathTextsize.h \
        mathed/InsetMathUnderset.h \
        mathed/InsetMathUnknown.h \
        mathed/InsetMathXArrow.h \
@@ -564,6 +563,7 @@ SOURCEFILESINSETS = \
        insets/InsetHyperlink.cpp \
        insets/InsetInclude.cpp \
        insets/InsetIndex.cpp \
+       insets/InsetIndexMacro.cpp \
        insets/InsetInfo.cpp \
        insets/InsetIPA.cpp \
        insets/InsetIPAMacro.cpp \
@@ -625,6 +625,7 @@ HEADERFILESINSETS = \
        insets/InsetHyperlink.h \
        insets/InsetInclude.h \
        insets/InsetIndex.h \
+       insets/InsetIndexMacro.h \
        insets/InsetInfo.h \
        insets/InsetIPA.h \
        insets/InsetIPAMacro.h \
@@ -696,7 +697,7 @@ ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework
 endif
 
 TESTS_LIBS = support/liblyxsupport.a \
-       $(LIBICONV) $(BOOST_LIBS) @LIBS@ \
+       $(LIBICONV) @LIBS@ \
        $(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI)
 
 check_layout_CPPFLAGS = $(AM_CPPFLAGS)
@@ -708,6 +709,7 @@ check_layout_SOURCES = \
        tests/boost.cpp
 check_layout_LYX_OBJS = \
        insets/InsetLayout.o \
+       support/Lexer.o \
        CiteEnginesList.o \
        Color.o \
        Counters.o \
@@ -716,7 +718,6 @@ check_layout_LYX_OBJS = \
        FontInfo.o \
        Layout.o \
        LayoutFile.o \
-       Lexer.o \
        ModuleList.o \
        Spacing.o \
        TextClass.o