Fix a Makfile.am typo preventing "make lyxdist"

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

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index fc39503b90218ccaded5bedb47dfc2403590d778..d5ce4cb3f3b1762904074bb1030eb11e48fa7e0a 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -1,6 +1,7 @@
 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) \
+       CMakeLists.txt test/CMakeLists.txt
 
 #noinst_LIBRARIES = libtexparser.a
 #
@@ -14,50 +15,107 @@ man_MANS = tex2lyx.1
 
 bin_PROGRAMS = tex2lyx
 
-DEFAULT_INCLUDES = 
+DEFAULT_INCLUDES =
 
-AM_CPPFLAGS += -DTEX2LYX $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
-       -I$(top_srcdir)/src -I$(top_builddir) $(BOOST_INCLUDES)
+AM_CPPFLAGS += -I$(top_srcdir)/src/tex2lyx \
+       -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src \
+       $(BOOST_INCLUDES)
 
 TEST_FILES = \
+       test/runtests.cmake \
+       test/runtests.py \
+       test/algo2e.tex \
        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-insets-basic.tex \
        test/test.ltx \
-       test/test-structure.tex
+       test/test-memoir.tex \
+       test/test-modules.tex \
+       test/test-refstyle-theorems.tex \
+       test/test-scr.tex \
+       test/test-structure.tex \
+       test/verbatim.tex \
+       test/XeTeX-polyglossia.tex \
+       test/xfigtest.fig \
+       test/xfigtest.pstex \
+       test/xfigtest.pstex_t
+
+TEST_RESULTS = \
+       test/algo2e.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/test-insets.lyx.lyx \
+       test/test-insets-basic.lyx.lyx \
+       test/test.lyx.lyx \
+       test/test-memoir.lyx.lyx \
+       test/test-modules.lyx.lyx \
+       test/test-refstyle-theorems.lyx.lyx \
+       test/test-scr.lyx.lyx \
+       test/test-structure.lyx.lyx \
+       test/verbatim.lyx.lyx \
+       test/XeTeX-polyglossia.lyx.lyx
+
+alltests: check alltests-recursive
+
+alltests-recursive: tex2lyx
+       if test "$(srcdir)" = "$(builddir)"; then \
+               echo "tex2lyx tests require a separate build directory"; \
+               exit 1; \
+       fi
+       @$(PYTHON) "$(srcdir)/test/runtests.py"; \
+       if test $$? -eq 0; then \
+               echo -e "=====================\ntex2lyx tests passed.\n====================="; \
+       else \
+               echo -e "=====================\ntex2lyx tests failed.\n====================="; \
+       fi
+
+updatetests: tex2lyx
+       $(PYTHON) "$(srcdir)/test/runtests.py" ./tex2lyx "$(top_srcdir)/lib/scripts" "$(srcdir)/test"
 
 LINKED_FILES = \
+       ../Author.cpp \
        ../Color.cpp \
        ../Counters.cpp \
        ../Encoding.cpp \
        ../FloatList.cpp \
        ../Floating.cpp \
        ../FontInfo.cpp \
+       ../graphics/GraphicsParams.cpp \
+       ../insets/ExternalTemplate.cpp \
+       ../insets/ExternalTransforms.cpp \
        ../insets/InsetLayout.cpp \
+       ../LaTeXPackages.cpp \
        ../Layout.cpp \
        ../LayoutFile.cpp \
        ../LayoutModuleList.cpp \
+       ../Length.cpp \
        ../lengthcommon.cpp \
        ../Lexer.cpp \
        ../ModuleList.cpp \
        ../Spacing.cpp \
        ../TextClass.cpp \
-       ../TextClass.h \
        ../version.cpp
 
-BUILT_SOURCES = $(PCH_FILE)
-
 tex2lyx_SOURCES = \
        $(LINKED_FILES) \
        boost.cpp \
        Context.cpp \
        Context.h \
+       dummy_impl.cpp \
        math.cpp \
        Parser.cpp \
        Parser.h \
-       preamble.cpp \
+       Preamble.cpp \
+       Preamble.h \
        table.cpp \
        tex2lyx.cpp \
        tex2lyx.h \
@@ -65,10 +123,12 @@ tex2lyx_SOURCES = \
 
 tex2lyx_LDADD = \
        $(top_builddir)/src/support/liblyxsupport.a \
-       $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) \
-       $(QT4_LIB) $(QT4_LDFLAGS) \
+       $(LIBICONV) $(BOOST_LIBS) \
+       $(QT_LIB) $(QT_LDFLAGS) \
        @LIBS@ $(LIBSHLWAPI) $(LIBPSAPI)
 
 if INSTALL_MACOSX
 tex2lyx_LDFLAGS = -framework AppKit
 endif
+
+.PHONY: alltests alltests-recursive updatetests