Remove dependency on TEX2LYX #define in Lexer.cpp

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

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 96b479fe90173bc1cb23acebdb75a62aae63d202..2cbe65808254c09eecf77f97481148549afdfaff 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -14,7 +14,7 @@ man_MANS = tex2lyx.1
 
 bin_PROGRAMS = tex2lyx
 
-DEFAULT_INCLUDES = 
+DEFAULT_INCLUDES =
 
 AM_CPPFLAGS += -DTEX2LYX -DNO_LAYOUT_CSS $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
        -I$(top_srcdir)/src -I$(top_builddir) $(BOOST_INCLUDES)
@@ -53,7 +53,16 @@ TEST_RESULTS = \
        test/verbatim.lyx.lyx \
        test/XeTeX-polyglossia.lyx.lyx
 
-TESTS = test/runtests.py
+alltests: check alltests-recursive
+
+alltests-recursive: tex2lyx
+       @$(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"
 
@@ -100,10 +109,12 @@ tex2lyx_SOURCES = \
 
 tex2lyx_LDADD = \
        $(top_builddir)/src/support/liblyxsupport.a \
-       $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) \
+       $(LIBICONV) $(BOOST_LIBS) \
        $(QT4_LIB) $(QT4_LDFLAGS) \
        @LIBS@ $(LIBSHLWAPI) $(LIBPSAPI)
 
 if INSTALL_MACOSX
 tex2lyx_LDFLAGS = -framework AppKit
 endif
+
+.PHONY: alltests alltests-recursive updatetests