* Makefile.am (RUNTEST, RUNTESTDEFAULTFLAGS): Remove.

	* Makefile.in: Regenerate.
	* testsuite/Makefile.am (CLEANFILES): Remove.
	(RUNTESTDEFAULTFLATS): Pass --srcdir and RUNTEST=$(RUNTEST).
	* testsuite/Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 6ab49fc..def3003 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2004-02-07  Ben Elliston  <bje@wasabisystems.com>
 
+       * Makefile.am (RUNTEST, RUNTESTDEFAULTFLAGS): Remove.
+       * Makefile.in: Regenerate.
+       * testsuite/Makefile.am (CLEANFILES): Remove.
+       (RUNTESTDEFAULTFLATS): Pass --srcdir and RUNTEST=$(RUNTEST).
+       * testsuite/Makefile.in: Regenerate.
+       
+2004-02-07  Ben Elliston  <bje@wasabisystems.com>
+
        * lib/util-defs.exp: Move from here ..
        * testsuite/lib/util-defs.exp: .. to here.
        * Makefile.am (EXTRA_DIST): Remove lib/util-defs.exp.

diff --git a/Makefile.am b/Makefile.am
index 37ac6e6..3797d76 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -175,12 +175,6 @@ PACKAGING_METAFILES = packaging/depot/dejagnu.psf \
        packaging/deb/preinst packaging/deb/rules packaging/pkg/pkginfo \
        packaging/pkg/prototype packaging/rpm/dejagnu.spec
 
-RUNTESTDEFAULTFLAGS = --srcdir $(srcdir)/testsuite RUNTEST=$(RUNTEST)
-RUNTEST = ` \
-  if [ -f ${srcdir}/runtest$(EXEEXT) ] ; then \
-    echo ${srcdir}/runtest$(EXEEXT); \
-  else echo "ERROR: runtest not found" ; exit 1; fi`
-
 rpmspec: $(srcdir)/packaging/rpm/dejagnu.spec
        cp -f $(srcdir)/packaging/rpm/dejagnu.spec /usr/src/redhat/SPECS/
 

diff --git a/Makefile.in b/Makefile.in
index c881b8a..866545e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,9 @@ HEADERS = $(include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DEJATOOL = $(PACKAGE)
+RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
 EXPECT = expect
+RUNTEST = runtest
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -345,12 +347,6 @@ PACKAGING_METAFILES = packaging/depot/dejagnu.psf \
        packaging/deb/preinst packaging/deb/rules packaging/pkg/pkginfo \
        packaging/pkg/prototype packaging/rpm/dejagnu.spec
 
-RUNTESTDEFAULTFLAGS = --srcdir $(srcdir)/testsuite RUNTEST=$(RUNTEST)
-RUNTEST = ` \
-  if [ -f ${srcdir}/runtest$(EXEEXT) ] ; then \
-    echo ${srcdir}/runtest$(EXEEXT); \
-  else echo "ERROR: runtest not found" ; exit 1; fi`
-
 PKGDIR = /opt
 all: all-recursive
 

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 814db93..55254d7 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -27,6 +27,4 @@ RUNTEST = ` \
     echo ${top_srcdir}/runtest$(EXEEXT); \
   else echo "ERROR: runtest not found" ; exit 1; fi`
 
-RUNTESTDEFAULTFLAGS = --tool runtest
-# --srcdir $$srcdir
-CLEANFILES = *.log *.sum site.bak setval.tmp
+RUNTESTDEFAULTFLAGS = --tool runtest --srcdir $(srcdir) RUNTEST=$(RUNTEST)

diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 2e24bc9..c5d6657 100644 (file)
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -165,9 +165,7 @@ RUNTEST = ` \
     echo ${top_srcdir}/runtest$(EXEEXT); \
   else echo "ERROR: runtest not found" ; exit 1; fi`
 
-RUNTESTDEFAULTFLAGS = --tool runtest
-# --srcdir $$srcdir
-CLEANFILES = *.log *.sum site.bak setval.tmp
+RUNTESTDEFAULTFLAGS = --tool runtest --srcdir $(srcdir) RUNTEST=$(RUNTEST)
 all: all-recursive
 
 .SUFFIXES:
@@ -412,7 +410,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -rm -f $(CONFIG_CLEAN_FILES)