aboutsummaryrefslogtreecommitdiff
path: root/gas/Makefile.in
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1995-09-13 20:35:17 +0000
committerIan Lance Taylor <ian@airs.com>1995-09-13 20:35:17 +0000
commit5f757edc84fb6d5db2e2b91c342b14c3d96ef92f (patch)
treec089f1c5afe507b1bc6fbb6275dad956fff8175a /gas/Makefile.in
parentaa4b3dc5091e2e50726b78da3550ccc9a1e57711 (diff)
downloadgdb-5f757edc84fb6d5db2e2b91c342b14c3d96ef92f.zip
gdb-5f757edc84fb6d5db2e2b91c342b14c3d96ef92f.tar.gz
gdb-5f757edc84fb6d5db2e2b91c342b14c3d96ef92f.tar.bz2
* Makefile.in (EXPECT): New variable.
(CHECKFLAGS): Remove. (site.exp): New target. (check): Rewrite to invoke runtest directly, rather than recurring down into testsuite. (clean-here): Remove testsuite directory. (clean, distclean): Don't recur into testsuite. * configure.in: Don't call AC_CONFIG_SUBDIRS(testsuite). * configure: Rebuild.
Diffstat (limited to 'gas/Makefile.in')
-rw-r--r--gas/Makefile.in59
1 files changed, 47 insertions, 12 deletions
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 88dbabf..2fd0339 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -76,6 +76,10 @@ CFLAGS = -g
MAKEOVERRIDES=
+EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \
+ echo $${rootme}/../expect/expect ; \
+ else echo expect ; fi`
+
FLAGS_TO_PASS = \
"prefix=$(prefix)" \
"exec_prefix=$(exec_prefix)" \
@@ -98,9 +102,6 @@ RUNTEST = `if [ -f ${srcdir}/../dejagnu/runtest ] ; then \
echo ${srcdir}/../dejagnu/runtest ; else echo runtest; \
fi`
RUNTESTFLAGS=
-CHECKFLAGS= \
- "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
- "RUNTEST=$(RUNTEST)"
# Lists of files for various purposes.
@@ -261,9 +262,48 @@ gasp.new: $(GASPOBJS) ../libiberty/libiberty.a
installcheck:
@echo No installcheck target is available yet for the GNU assembler.
-check:
- @(here=`pwd` ; export here ; \
- cd testsuite ; $(MAKE) $(FLAGS_TO_PASS) $(CHECKFLAGS) check)
+site.exp: ./Makefile
+ @echo "Making a new config file..."
+ -@rm -f ./tmp?
+ @touch site.exp
+ -@mv site.exp site.bak
+ @echo "## these variables are automatically generated by make ##" > ./tmp0
+ @echo "# Do not edit here. If you wish to override these values," >> ./tmp0
+ @echo "# do so in the last section." >> ./tmp0
+ @echo set host_os @host_os@ >> ./tmp0
+ @echo set host_alias @host_alias@ >> ./tmp0
+ @echo set host_cpu @host_cpu@ >> ./tmp0
+ @echo set host_vendor @host_vendor@ >> ./tmp0
+ @echo set target_os @target_os@ >> ./tmp0
+ @echo set target_alias @target_alias@ >> ./tmp0
+ @echo set target_cpu @target_cpu@ >> ./tmp0
+ @echo set target_vendor @target_vendor@ >> ./tmp0
+ @echo set host_triplet @host@ >> ./tmp0
+ @echo set target_triplet @target@ >> ./tmp0
+ @echo set target_canonical @target@ >> ./tmp0
+ @echo set srcdir ${srcdir} >> ./tmp0
+ @echo set exec_prefix ${exec_prefix} >> ./tmp0
+ @echo set objdir `pwd` >> ./tmp0
+ @echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0
+ @sed -e '1,/^## All variables above are.*##/ d' < site.bak >> ./tmp0
+ @mv -f ./tmp0 site.exp
+
+check: site.exp
+ if [ -d testsuite ]; then \
+ true; \
+ else \
+ mkdir testsuite; \
+ fi
+ rm -f testsuite/site.exp
+ cp site.exp testsuite/site.exp
+ rootme=`pwd`; export rootme; \
+ srcdir=`cd ${srcdir}; pwd` ; export srcdir ; \
+ cd testsuite; \
+ EXPECT=${EXPECT} ; export EXPECT ; \
+ if [ -f $${rootme}/../expect/expect ] ; then \
+ TCL_LIBRARY=$${srcdir}/../tcl/library ; \
+ export TCL_LIBRARY ; fi ; \
+ $(RUNTEST) --tool gas --srcdir $${srcdir}/testsuite $(RUNTESTFLAGS)
config.status: configure
if [ -r config.status ]; then \
@@ -379,19 +419,14 @@ diststuff: $(DISTSTUFF)
clean-here:
-rm -f $(STAGESTUFF) core stamp-mk.com
+ -rm -rf testsuite
clean mostlyclean: clean-here
@cd doc ; $(MAKE) $(FLAGS_TO_PASS) $@
- @if [ -d testsuite ] ; then \
- cd testsuite ; $(MAKE) $(FLAGS_TO_PASS) $@ ; \
- else true; fi
# Like clean but also delete the links made to configure gas.
distclean: clean-here
@cd doc ; $(MAKE) $(FLAGS_TO_PASS) $@
- @if [ -d testsuite ] ; then \
- cd testsuite ; $(MAKE) $(FLAGS_TO_PASS) $@ ; \
- else true; fi
-rm -f config.status Makefile targ-env.h targ-cpu.h \
targ-cpu.c obj-format.h obj-format.c atof-targ.c TAGS \
config-stamp config.h conf config.log config.cache .gdbinit