X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FMakefile.am;h=d5ce4cb3f3b1762904074bb1030eb11e48fa7e0a;hb=22104ac51831a6e489577312bd33089b1b6d1842;hp=810e693b26e00ea6b4d840e11a5dbfe4b77405a0;hpb=6c7b5b12c7ae748cbdb8d25899033e2c76e23c68;p=lyx.git

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 810e693b26..d5ce4cb3f3 100644
--- 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) $(TEST_RESULTS) pch.h \
+EXTRA_DIST = TODO.txt tex2lyx.1in $(TEST_FILES) $(TEST_RESULTS) \
 	CMakeLists.txt test/CMakeLists.txt
 
 #noinst_LIBRARIES = libtexparser.a
@@ -17,12 +17,14 @@ bin_PROGRAMS = tex2lyx
 
 DEFAULT_INCLUDES =
 
-AM_CPPFLAGS += $(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 \
@@ -31,9 +33,12 @@ TEST_FILES = \
 	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 \
@@ -42,15 +47,19 @@ TEST_FILES = \
 	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
@@ -58,6 +67,10 @@ TEST_RESULTS = \
 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====================="; \
@@ -92,8 +105,6 @@ LINKED_FILES = \
 	../TextClass.cpp \
 	../version.cpp
 
-BUILT_SOURCES = $(PCH_FILE)
-
 tex2lyx_SOURCES = \
 	$(LINKED_FILES) \
 	boost.cpp \