diff options
| -rw-r--r-- | binutils/ChangeLog | 6 | ||||
| -rw-r--r-- | binutils/Makefile.am | 8 | ||||
| -rw-r--r-- | binutils/Makefile.in | 10 | ||||
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/Makefile.am | 9 | ||||
| -rw-r--r-- | gas/Makefile.in | 10 | ||||
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/Makefile.am | 10 | ||||
| -rw-r--r-- | ld/Makefile.in | 10 |
9 files changed, 30 insertions, 45 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 4319811d14..5083a9c5ac 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2005-06-30 Ben Elliston <bje@gnu.org> + + * Makefile.am (EXPECT): Set to expect. + (RUNTEST): Likewise, set to runtest. + * Makefile.in: Regenerate. + 2005-06-17 Jakub Jelinek <jakub@redhat.com> * readelf.c (CHECK_ENTSIZE_VALUES, CHECK_ENTSIZE): Define. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index bac398f44a..d0f87e380d 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -119,12 +119,8 @@ po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \ && mv tmp $(srcdir)/po/POTFILES.in -EXPECT = `if [ -f $$r/../expect/expect ] ; then \ - echo $$r/../expect/expect ; \ - else echo expect ; fi` -RUNTEST = `if [ -f ${srcdir}/../dejagnu/runtest ] ; then \ - echo ${srcdir}/../dejagnu/runtest ; \ - else echo runtest ; fi` +EXPECT = expect +RUNTEST = runtest CC_FOR_TARGET = ` \ if [ -f $$r/../gcc/xgcc ] ; then \ diff --git a/binutils/Makefile.in b/binutils/Makefile.in index cb6b864547..9fa11a92c0 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -436,14 +436,8 @@ BFDLIB = ../bfd/libbfd.la OPCODES = ../opcodes/libopcodes.la LIBIBERTY = ../libiberty/libiberty.a POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES) -EXPECT = `if [ -f $$r/../expect/expect ] ; then \ - echo $$r/../expect/expect ; \ - else echo expect ; fi` - -RUNTEST = `if [ -f ${srcdir}/../dejagnu/runtest ] ; then \ - echo ${srcdir}/../dejagnu/runtest ; \ - else echo runtest ; fi` - +EXPECT = expect +RUNTEST = runtest CC_FOR_TARGET = ` \ if [ -f $$r/../gcc/xgcc ] ; then \ if [ -f $$r/../newlib/Makefile ] ; then \ diff --git a/gas/ChangeLog b/gas/ChangeLog index f234a75da3..10ceaf3ba9 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2005-06-30 Ben Elliston <bje@gnu.org> + + * Makefile.am (EXPECT): Set to expect. + (RUNTEST): Likewise, set to runtest. + * Makefile.in: Regenerate. + 2005-06-23 Ben Elliston <bje@gnu.org> * config/m68k-parse.h: Use ISO C90. diff --git a/gas/Makefile.am b/gas/Makefile.am index 50166a8573..19a9865cb1 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -527,13 +527,8 @@ $(OBJS): $(INCDIR)/bin-bugs.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ as.h asintl.h bignum.h bit_fix.h config.h emul.h expr.h flonum.h \ frags.h hash.h listing.h obj.h read.h symbols.h tc.h write.h -EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \ - echo $${rootme}/../expect/expect ; \ - else echo expect ; fi` - -RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \ - echo $${srcdir}/../dejagnu/runtest ; else echo runtest; \ - fi` +EXPECT = expect +RUNTEST = runtest RUNTESTFLAGS= check-DEJAGNU: site.exp diff --git a/gas/Makefile.in b/gas/Makefile.in index d96861e653..8bdc35397b 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -723,14 +723,8 @@ as_new_LDADD = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \ as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \ $(extra_objects) $(GASLIBS) $(INTLDEPS) -EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \ - echo $${rootme}/../expect/expect ; \ - else echo expect ; fi` - -RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \ - echo $${srcdir}/../dejagnu/runtest ; else echo runtest; \ - fi` - +EXPECT = expect +RUNTEST = runtest RUNTESTFLAGS = # The m68k operand parser. diff --git a/ld/ChangeLog b/ld/ChangeLog index 72b69742e2..c8e9dd3d54 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2005-06-30 Ben Elliston <bje@gnu.org> + + * Makefile.am (EXPECT): Set to expect. + (RUNTEST): Likewise, set to runtest. + * Makefile.in: Regenerate. + 2005-06-16 Alexander Klimov <alserkli@inbox.ru> * emultempl/armelf.em: Add quotes to avoid a null test diff --git a/ld/Makefile.am b/ld/Makefile.am index b5ee369f14..c2e0e81414 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 babca2621b..fccd2e4aa9 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 \ |
