Rename eolString() to eol() and pass a MathTeXStream parameter

[lyx.git] / src / tex2lyx / Makefile.am

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 7089ea420c18aefffec16a34b09e038490712d23..7ad91a08289f28584a64e40cb51af8ca64560062 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -15,16 +15,15 @@ man_MANS = tex2lyx.1
 
 bin_PROGRAMS = tex2lyx
 
-DEFAULT_INCLUDES =
-
 AM_CPPFLAGS += -I$(top_srcdir)/src/tex2lyx \
        -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src \
-       $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES)
+       $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES) $(NOD_INCLUDES)
 
 TEST_FILES = \
        test/runtests.cmake \
        test/runtests.py \
        test/algo2e.tex \
+       test/beamer.tex \
        test/box-color-size-space-align.tex \
        test/CJK.tex \
        test/CJKutf8.tex \
@@ -32,10 +31,12 @@ TEST_FILES = \
        test/Dummy~Document.tex \
        test/foo.eps \
        test/foo.png \
+       test/listpreamble.tex \
        test/test-insets.tex \
        test/test-insets-basic.tex \
        test/test.ltx \
        test/test-memoir.tex \
+       test/test-minted.tex \
        test/test-modules.tex \
        test/test-refstyle-theorems.tex \
        test/test-scr.tex \
@@ -48,15 +49,18 @@ TEST_FILES = \
 
 TEST_RESULTS = \
        test/algo2e.lyx.lyx \
+       test/beamer.lyx.lyx \
        test/box-color-size-space-align.lyx.lyx \
        test/CJK.lyx.lyx \
        test/CJKutf8.lyx.lyx \
        test/DummyDocument.lyx.lyx \
        test/Dummy~Document.lyx.lyx \
+       test/listpreamble.lyx.lyx \
        test/test-insets.lyx.lyx \
        test/test-insets-basic.lyx.lyx \
        test/test.lyx.lyx \
        test/test-memoir.lyx.lyx \
+       test/test-minted.lyx.lyx \
        test/test-modules.lyx.lyx \
        test/test-refstyle-theorems.lyx.lyx \
        test/test-scr.lyx.lyx \
@@ -98,8 +102,6 @@ LYX_OBJS = \
        ../Layout.o \
        ../LayoutFile.o \
        ../LayoutModuleList.o \
-       ../Length.o \
-       ../lengthcommon.o \
        ../Lexer.o \
        ../ModuleList.o \
        ../Spacing.o \
@@ -124,14 +126,15 @@ tex2lyx_SOURCES = \
 tex2lyx_LDADD = \
        $(LYX_OBJS) \
        $(top_builddir)/src/support/liblyxsupport.a \
-       $(LIBICONV) $(BOOST_LIBS) \
+       $(LIBICONV) \
        $(QT_LIB) $(QT_LDFLAGS) \
        @LIBS@ $(ICONV_LIBS) $(ZLIB_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 if INSTALL_MACOSX
 tex2lyx_LDFLAGS = -framework AppKit \
        -Wl,-rpath,@loader_path/../Frameworks \
-       -Wl,-rpath,@executable_path/../Frameworks
+       -Wl,-rpath,@executable_path/../Frameworks \
+       -Wl,-headerpad_max_install_names
 endif
 
 .PHONY: alltests alltests-recursive updatetests