Fix failing test caused by 89b2c54c00.

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

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index d239ed3cf839c4c391a8296d2f2790d25702f6c9..9ebbdc0fde7985ed466f3243f5c1d0402af51cf4 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/common.am
 
-EXTRA_DIST = TODO.txt tex2lyx.1in $(TEST_FILES) pch.h
+EXTRA_DIST = TODO.txt tex2lyx.1in $(TEST_FILES) $(TEST_RESULTS) pch.h
 
 #noinst_LIBRARIES = libtexparser.a
 #
@@ -14,24 +14,48 @@ man_MANS = tex2lyx.1
 
 bin_PROGRAMS = tex2lyx
 
-DEFAULT_INCLUDES = 
+DEFAULT_INCLUDES =
 
-AM_CPPFLAGS += -DTEX2LYX $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
+AM_CPPFLAGS += -DTEX2LYX -DNO_LAYOUT_CSS $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
        -I$(top_srcdir)/src -I$(top_builddir) $(BOOST_INCLUDES)
 
 TEST_FILES = \
        test/runtests.py \
        test/box-color-size-space-align.tex \
        test/CJK.tex \
+       test/CJKutf8.tex \
        test/DummyDocument.tex \
+       test/Dummy~Document.tex \
        test/foo.eps \
        test/foo.png \
        test/test-insets.tex \
        test/test.ltx \
+       test/test-modules.tex \
+       test/test-refstyle-theorems.tex \
        test/test-structure.tex \
-       test/XeTeX-polyglossia.tex
+       test/verbatim.tex \
+       test/XeTeX-polyglossia.tex \
+       test/xfigtest.fig \
+       test/xfigtest.pstex \
+       test/xfigtest.pstex_t
+
+TEST_RESULTS = \
+       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/test-insets.lyx.lyx \
+       test/test.lyx.lyx \
+       test/test-modules.lyx.lyx \
+       test/test-refstyle-theorems.lyx.lyx \
+       test/test-structure.lyx.lyx \
+       test/verbatim.lyx.lyx \
+       test/XeTeX-polyglossia.lyx.lyx
 
 TESTS = test/runtests.py
+updatetests: tex2lyx
+       $(PYTHON) "$(srcdir)/test/runtests.py" ./tex2lyx "$(top_srcdir)/lib/scripts" "$(srcdir)/test"
 
 LINKED_FILES = \
        ../Author.cpp \
@@ -76,7 +100,7 @@ tex2lyx_SOURCES = \
 
 tex2lyx_LDADD = \
        $(top_builddir)/src/support/liblyxsupport.a \
-       $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) \
+       $(LIBICONV) $(BOOST_LIBS) \
        $(QT4_LIB) $(QT4_LDFLAGS) \
        @LIBS@ $(LIBSHLWAPI) $(LIBPSAPI)