From c329887411085ea0d667a86d12e27723a24a77c4 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Wed, 29 Jun 2005 20:30:00 +0000 Subject: * Makefile.am (EXPECT): Set to expect. (RUNTEST): Likewise, set to runtest. * Makefile.in: Regenerate. --- ld/ChangeLog | 6 ++++++ ld/Makefile.am | 10 ++-------- ld/Makefile.in | 10 ++-------- 3 files changed, 10 insertions(+), 16 deletions(-) (limited to 'ld') diff --git a/ld/ChangeLog b/ld/ChangeLog index 72b6974..c8e9dd3 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2005-06-30 Ben Elliston + + * Makefile.am (EXPECT): Set to expect. + (RUNTEST): Likewise, set to runtest. + * Makefile.in: Regenerate. + 2005-06-16 Alexander Klimov * emultempl/armelf.em: Add quotes to avoid a null test diff --git a/ld/Makefile.am b/ld/Makefile.am index b5ee369..c2e0e81 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -57,14 +57,8 @@ HOSTING_LIBS = @HOSTING_LIBS@ HOSTING_EMU = -m $(EMUL) # Setup the testing framework, if you have one -EXPECT = `if [ -f $$r/../expect/expect ] ; \ - then echo $$r/../expect/expect ; \ - else echo expect ; fi` - -RUNTEST = `if [ -f $${srcroot}/../dejagnu/runtest ] ; \ - then echo $${srcroot}/../dejagnu/runtest ; \ - else echo runtest ; fi` - +EXPECT = expect +RUNTEST = runtest RUNTESTFLAGS = CC_FOR_TARGET = ` \ diff --git a/ld/Makefile.in b/ld/Makefile.in index babca26..fccd2e4 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -286,14 +286,8 @@ POD2MAN = pod2man --center="GNU Development Tools" \ HOSTING_EMU = -m $(EMUL) # Setup the testing framework, if you have one -EXPECT = `if [ -f $$r/../expect/expect ] ; \ - then echo $$r/../expect/expect ; \ - else echo expect ; fi` - -RUNTEST = `if [ -f $${srcroot}/../dejagnu/runtest ] ; \ - then echo $${srcroot}/../dejagnu/runtest ; \ - else echo runtest ; fi` - +EXPECT = expect +RUNTEST = runtest RUNTESTFLAGS = CC_FOR_TARGET = ` \ if [ -f $$r/../gcc/xgcc ] ; then \ -- cgit v1.1