* Makefile.am (RUNTEST): Simplify, as Automake already generates

	similar logic in Makefile.in.
	* Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 0bdbc26..3b08e8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-12-24  Ben Elliston  <bje@gnu.org>
 
+       * Makefile.am (RUNTEST): Simplify, as Automake already generates
+       similar logic in Makefile.in.
+       * Makefile.in: Regenerate.
+       
+2005-12-24  Ben Elliston  <bje@gnu.org>
+
        * Makefile.am (RUNTESTDEFAULTFLAGS): Omit --tool so that
        libdejagnu tests are run too.
        * Makefile.in: Regenerate.

diff --git a/Makefile.am b/Makefile.am
index 5f24161..0d36c64 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -189,11 +189,9 @@ TESTSUITE_FILES = \
        testsuite/lib/util-defs.exp \
        testsuite/libdejagnu/tunit.exp
 
-RUNTEST = `if [ -f ${top_srcdir}/runtest$(EXEEXT) ] ; then \
-    echo ${top_srcdir}/runtest$(EXEEXT); \
-  else echo "ERROR: runtest not found" ; exit 1; fi`
-
+RUNTEST = ${top_srcdir}/runtest
 RUNTESTDEFAULTFLAGS = --srcdir $(srcdir)/testsuite
+
 AM_CXXFLAGS = -I$(top_srcdir) -g
 check_PROGRAMS = unit
 unit_SOURCES = testsuite/libdejagnu/unit.cc

diff --git a/Makefile.in b/Makefile.in
index 4aceb1c..811b217 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -388,10 +388,7 @@ TESTSUITE_FILES = \
        testsuite/lib/util-defs.exp \
        testsuite/libdejagnu/tunit.exp
 
-RUNTEST = `if [ -f ${top_srcdir}/runtest$(EXEEXT) ] ; then \
-    echo ${top_srcdir}/runtest$(EXEEXT); \
-  else echo "ERROR: runtest not found" ; exit 1; fi`
-
+RUNTEST = ${top_srcdir}/runtest$(EXEEXT)
 RUNTESTDEFAULTFLAGS = --srcdir $(srcdir)/testsuite
 AM_CXXFLAGS = -I$(top_srcdir) -g
 unit_SOURCES = testsuite/libdejagnu/unit.cc