(gas-dg-test): Detect invalid values of `do_what'.

[deliverable/binutils-gdb.git] / binutils / Makefile.in

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 9d258191ebed32ecdfb856e715d7208cd3d0b25c..d3ec002866b759ff9fac58ed783cbafca8dc121b 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -70,7 +70,7 @@ LEX_OPTIONS = -I -Cem
 LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ; else echo flex ; fi`
 
 # Distribution version
-VERSION=cygnus-2.4.1
+VERSION=cygnus-2.5
 # Distribution name
 DIST_NAME=binutils-${VERSION}
 
@@ -168,16 +168,46 @@ FLAGS_TO_PASS = \
 
 all: $(ADDL_LIBS) $(PROGS)
 
-testsuite:
-       if [ -f testsuite/Makefile.in ]; then \
-               (rootme=`pwd`/ ; export rootme ; \
-                rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
-                cd testsuite; $(MAKE) FLAGS_TO_PASS=$(FLAGS_TO_PASS)); \
-       else true ; fi
-
-check: force
-       rootme=`pwd`; export rootme; cd testsuite ; \
-       $(MAKE) check $(FLAGS_TO_PASS)
+# These targets are for the dejagnu testsuites. The file site.exp 
+# contains global variables that all the testsuites will use.
+
+site.exp: ./config.status Makefile
+       @echo "Making a new config file..."
+       @rm -f ./tmp?
+       @touch site.exp
+       @mv site.exp site.bak
+       @echo "## variables are automatically generated by make ##" > ./tmp0
+       @echo "# Do not edit here. If you wish to override these" >> ./tmp0
+       @echo "# values, add them to the last section" >> ./tmp0
+       @echo "# HOST AND TARGET INFO" >> ./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_canonical)" >> ./tmp0
+       @echo "set target_triplet $(target_canonical)" >> ./tmp0
+       @echo "# DIRECTORY INFO" >> ./tmp0
+       @echo "set objdir `pwd`" >> ./tmp0
+       @echo "" >> ./tmp0      
+       @echo "## Variables generated by configure. Do Not Edit ##" >> ./tmp0
+       @cat ./tmp0 > site.exp
+       @cat site.bak | sed \
+                       -e '1,/^## Variables generated by.*##/ d' >> site.exp
+       -@rm -f ./tmp?
+
+check: site.exp
+       r=`pwd`; export r; \
+       srcroot=`cd ${srcdir}; pwd` ; export srcroot ; \
+       EXPECT=${EXPECT} ; export EXPECT ; \
+       if [ -f $$r/../expect/expect ] ; then  \
+          TCL_LIBRARY=$${srcroot}/../tcl/library ; \
+          export TCL_LIBRARY ; else true; fi ; \
+       $(RUNTEST) --tool binutils --srcdir $(srcdir)/testsuite \
+         $(RUNTESTFLAGS)
 
 installcheck:
        /bin/sh $(srcdir)/sanity.sh $(bindir)
@@ -307,7 +337,7 @@ srconv: srconv.o coffgrok.o $(ADDL_LIBS)
 coffdump: coffdump.o coffgrok.o $(ADDL_LIBS)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@  coffdump.o coffgrok.o $(ADDL_LIBS) $(EXTRALIBS)
 
-sysdump.o: sysdump.c sysroff.h
+sysdump.o: sysdump.c sysroff.h sysroff.c
 
 sysdump: sysdump.o $(ADDL_LIBS)
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ sysdump.o $(ADDL_LIBS) $(EXTRALIBS)
@@ -485,15 +515,10 @@ binutils.me: $(srcdir)/binutils.texi
 
 mostlyclean:
        -rm -f *.o *~ \#* core binutils.?? binutils.???
+       -rm -rf tmpdir
 clean: mostlyclean
-       @if [ -d testsuite ] ; then \
-         cd testsuite ; $(MAKE) $(FLAGS_TO_PASS) clean ; \
-       else true; fi
        -rm -f $(PROGS) underscore.c
 distclean:
-       @if [ -d testsuite ] ; then \
-         cd testsuite ; $(MAKE) $(FLAGS_TO_PASS) distclean ; \
-       else true; fi
        -rm -f Makefile config.status sysdep.h *.o *~ \#* core y.* \
                binutils.?? binutils.??s binutils.aux binutils.log binutils.toc
        -rm -f $(PROGS) underscore.c
@@ -534,7 +559,7 @@ install-info: binutils.info
          dir=$(srcdir) ; \
        fi ; \
        for i in `cd $$dir; echo binutils.info*` ; do \
-               $(INSTALL_DATA) $$i $(infodir)/$$i ; \
+               $(INSTALL_DATA) $$dir/$$i $(infodir)/$$i ; \
        done
 
 clean-info: