X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FMakefile.am;h=bf2d66d67f81e9f7773f07756d900e37654f9046;hb=00b8f04988236026b3686744b239d545d8143877;hp=94e6c4d6b75a03465487fa13fb048602573a1195;hpb=ecf24f1cb5189dfd493609c7f2bc577b0b1c4b3b;p=lyx.git

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 94e6c4d6b7..bf2d66d67f 100644
--- 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,29 +15,71 @@ 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) $(ICONV_INCLUDES) $(ZLIB_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-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
 
-TESTS = test/runtests.py
+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 ../../../lib/scripts "$(srcdir)/test"
+	$(PYTHON) "$(srcdir)/test/runtests.py" ./tex2lyx "$(top_srcdir)/lib/scripts" "$(srcdir)/test"
 
 LINKED_FILES = \
 	../Author.cpp \
@@ -62,13 +105,12 @@ LINKED_FILES = \
 	../TextClass.cpp \
 	../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 \
@@ -81,10 +123,14 @@ tex2lyx_SOURCES = \
 
 tex2lyx_LDADD = \
 	$(top_builddir)/src/support/liblyxsupport.a \
-	$(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) \
-	$(QT4_LIB) $(QT4_LDFLAGS) \
-	@LIBS@ $(LIBSHLWAPI) $(LIBPSAPI)
+	$(LIBICONV) $(BOOST_LIBS) \
+	$(QT_LIB) $(QT_LDFLAGS) \
+	@LIBS@ $(ICONV_LIBS) $(ZLIB_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 if INSTALL_MACOSX
-tex2lyx_LDFLAGS = -framework AppKit
+tex2lyx_LDFLAGS = -framework AppKit \
+	-Wl,-rpath,@loader_path/../Frameworks \
+	-Wl,-rpath,@executable_path/../Frameworks
 endif
+
+.PHONY: alltests alltests-recursive updatetests