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 754ca15d4202d84ad218cb58526521a02f5a8e05..d5ce4cb3f3b1762904074bb1030eb11e48fa7e0a 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -1,68 +1,134 @@
 include $(top_srcdir)/config/common.am
 
-EXTRA_DIST = tex2lyx.man pch.h test-structure.tex test-insets.tex
+EXTRA_DIST = TODO.txt tex2lyx.1in $(TEST_FILES) $(TEST_RESULTS) \
+       CMakeLists.txt test/CMakeLists.txt
 
-DISTCLEANFILES += tex2lyx.1 $(LINKED_FILES)
-
-#noinst_LTLIBRARIES = libtexparser.la
+#noinst_LIBRARIES = libtexparser.a
 #
-#libtexparser_la_SOURCES = \
-#      texparser.C \
-#      texparser.h
+#libtexparser_a_SOURCES = \
+#      Parser.cpp \
+#      Parser.h
 #
-#tex2lyx_LDADD = libtexparser.la
+#tex2lyx_LDADD = libtexparser.a
 
 man_MANS = tex2lyx.1
 
 bin_PROGRAMS = tex2lyx
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
+DEFAULT_INCLUDES =
 
-BOOST_LIBS = $(BOOST_REGEX) $(BOOST_FILESYSTEM) $(BOOST_IOSTREAMS)
+AM_CPPFLAGS += -I$(top_srcdir)/src/tex2lyx \
+       -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src \
+       $(BOOST_INCLUDES)
 
-COMPRESSIONLIB = -lz
+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-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
 
-LINKED_FILES = \
-       FloatList.C \
-       Floating.C \
-       counters.C \
-       lyxlayout.h \
-       lyxlayout.C \
-       lyxtextclass.C \
-       lyxtextclass.h \
-       lyxlex.C 
+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
 
-BUILT_SOURCES = $(PCH_FILE) $(LINKED_FILES)
+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 \
+       ../version.cpp
 
 tex2lyx_SOURCES = \
        $(LINKED_FILES) \
-       Spacing.h \
-       boost.C \
-       context.C \
-       context.h \
-       gettext.C \
-       lengthcommon.C \
-       lyxfont.C \
-       lyxfont.h \
-       texparser.C \
-       texparser.h \
-       tex2lyx.C \
+       boost.cpp \
+       Context.cpp \
+       Context.h \
+       dummy_impl.cpp \
+       math.cpp \
+       Parser.cpp \
+       Parser.h \
+       Preamble.cpp \
+       Preamble.h \
+       table.cpp \
+       tex2lyx.cpp \
        tex2lyx.h \
-       preamble.C \
-       math.C \
-       table.C \
-       text.C
+       text.cpp
 
 tex2lyx_LDADD = \
-       $(top_builddir)/src/support/libsupport.la \
-       $(BOOST_LIBS) $(LIBICONV) @LIBS@ $(COMPRESSIONLIB)
-
-$(LINKED_FILES) :
-       @rm -f $@ ; \
-       $(LN_S) $(top_srcdir)/src/$@ .
+       $(top_builddir)/src/support/liblyxsupport.a \
+       $(LIBICONV) $(BOOST_LIBS) \
+       $(QT_LIB) $(QT_LDFLAGS) \
+       @LIBS@ $(LIBSHLWAPI) $(LIBPSAPI)
 
-rm_link_files:
-       rm -f $(LINKED_FILES)
+if INSTALL_MACOSX
+tex2lyx_LDFLAGS = -framework AppKit
+endif
 
-tex2lyx.1:
-       cp -p $(srcdir)/tex2lyx.man tex2lyx.1
+.PHONY: alltests alltests-recursive updatetests