some top-level changes

some top-level changes

[Ben Elliston]

[-- Attachment #1: Type: text/plain, Size: 8790 bytes --]

The following changes to the top-level bring things up to date for the
demise of src/expect and src/dejagnu.  I've ommitted the generated
files for brevity.  Okay to commit?


2005-06-30  Ben Elliston  <bje@gnu.org>

	* configure.in (host_tools): Remove dejagnu.
	(noconfigdirs): Remove dejagnu for applicable targets.
	* Makefile.tpl (EXPECT): Set to expect.
	(RUNTEST): Likewise, set to runtest.
	* Makefile.def: Remove dejagnu and expect host modules.
	(all-dejagnu): Remove dependencies.
	(configure-expect): Likewise.
	(all-expect): Likewise.
	* Makefile.in: Regenerate.
	* configure: Likewise.

Index: Makefile.def
===================================================================
RCS file: /cvs/src/src/Makefile.def,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile.def
--- Makefile.def	23 Jun 2005 07:34:15 -0000	1.49
+++ Makefile.def	30 Jun 2005 06:05:33 -0000
@@ -43,7 +43,6 @@ host_modules= { module= binutils; bootst
 host_modules= { module= bison; no_check_cross= true; };
 host_modules= { module= byacc; no_check_cross= true; };
 host_modules= { module= bzip2; };
-host_modules= { module= dejagnu; };
 host_modules= { module= diff; };
 host_modules= { module= dosutils; no_check= true; };
 host_modules= { module= etc; };
@@ -102,7 +101,6 @@ host_modules= { module= wdiff; };
 host_modules= { module= zip; no_check_cross=true; };
 host_modules= { module= zlib; no_install=true; no_check=true; bootstrap=true; };
 host_modules= { module= gdb; extra_make_flags="$(X11_FLAGS_TO_PASS)"; };
-host_modules= { module= expect; extra_make_flags="$(X11_FLAGS_TO_PASS)"; };
 host_modules= { module= guile; extra_make_flags="$(X11_FLAGS_TO_PASS)"; };
 host_modules= { module= tk; extra_make_flags="$(X11_FLAGS_TO_PASS)"; };
 host_modules= { module= libtermcap; no_check=true; 
@@ -332,13 +330,6 @@ dependencies = { module=all-opcodes; on=
 dependencies = { module=all-opcodes; on=all-libiberty; };
 
 // Other host modules in the 'src' repository.
-dependencies = { module=all-dejagnu; on=all-tcl; };
-dependencies = { module=all-dejagnu; on=all-expect; };
-dependencies = { module=all-dejagnu; on=all-tk; };
-dependencies = { module=configure-expect; on=configure-tcl; };
-dependencies = { module=configure-expect; on=configure-tk; };
-dependencies = { module=all-expect; on=all-tcl; };
-dependencies = { module=all-expect; on=all-tk; };
 
 // We put install-tcl before install-itcl because itcl wants to run a
 // program on installation which uses the Tcl libraries.
Index: Makefile.tpl
===================================================================
RCS file: /cvs/src/src/Makefile.tpl,v
retrieving revision 1.136
diff -u -p -r1.136 Makefile.tpl
--- Makefile.tpl	23 Jun 2005 07:34:15 -0000	1.136
+++ Makefile.tpl	30 Jun 2005 06:06:01 -0000
@@ -292,13 +292,8 @@ MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/
 MAKEINFOFLAGS = --split-size=5000000
 
 # FIXME: expect may become a build tool?
-EXPECT = `if [ -f $$r/$(HOST_SUBDIR)/expect/expect ] ; \
-	then echo $$r/$(HOST_SUBDIR)/expect/expect ; \
-	else echo expect ; fi`
-
-RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
-	then echo $$s/dejagnu/runtest ; \
-	else echo runtest ; fi`
+EXPECT = expect
+RUNTEST = runtest
 
 # ---------------------------------------------
 # Programs producing files for the HOST machine
Index: configure.in
===================================================================
RCS file: /cvs/src/src/configure.in,v
retrieving revision 1.271
diff -u -p -r1.271 configure.in
--- configure.in	7 Jun 2005 09:33:44 -0000	1.271
+++ configure.in	30 Jun 2005 06:06:07 -0000
@@ -130,7 +130,7 @@ host_libs="intl mmalloc libiberty opcode
 # know that we are building the simulator.
 # binutils, gas and ld appear in that order because it makes sense to run
 # "make check" in that particular order.
-host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
+host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
 
 # libgcj represents the runtime libraries only used by gcj.
 libgcj="target-libffi \
@@ -270,14 +270,14 @@ case "${host}" in
     noconfigdirs="$noconfigdirs byacc"
     ;;
   i[[3456789]]86-*-vsta)
-    noconfigdirs="$noconfigdirs tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl gnuserv gettext"
+    noconfigdirs="$noconfigdirs tcl make texinfo bison patch flex byacc send-pr gprof uudecode diff guile perl itcl gnuserv gettext"
     ;;
   i[[3456789]]86-*-go32* | i[[3456789]]86-*-msdosdjgpp*)
-    noconfigdirs="$noconfigdirs tcl tk expect dejagnu send-pr uudecode guile itcl gnuserv libffi"
+    noconfigdirs="$noconfigdirs tcl tk send-pr uudecode guile itcl gnuserv libffi"
     ;;
   i[[3456789]]86-*-mingw32*)
-    # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl itcl gnuserv"
-    noconfigdirs="$noconfigdirs expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool"
+    # noconfigdirs="tcl tk make texinfo bison patch flex byacc send-pr uudecode diff guile perl itcl gnuserv"
+    noconfigdirs="$noconfigdirs autoconf automake send-pr rcs guile perl texinfo libtool"
     ;;
   i[[3456789]]86-*-beos*)
     noconfigdirs="$noconfigdirs tk itcl libgui gdb"
@@ -289,10 +289,10 @@ case "${host}" in
     noconfigdirs="$noconfigdirs rcs"
     ;;
   ppc*-*-pe)
-    noconfigdirs="$noconfigdirs patch diff make tk tcl expect dejagnu autoconf automake texinfo bison send-pr gprof rcs guile perl itcl gnuserv"
+    noconfigdirs="$noconfigdirs patch diff make tk tcl autoconf automake texinfo bison send-pr gprof rcs guile perl itcl gnuserv"
     ;;
   powerpc-*-beos*)
-    noconfigdirs="$noconfigdirs tk itcl libgui gdb dejagnu readline"
+    noconfigdirs="$noconfigdirs tk itcl libgui gdb readline"
     ;;
 esac
 
@@ -436,7 +436,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-examples"
     noconfigdirs="$noconfigdirs target-libiberty texinfo send-pr"
     noconfigdirs="$noconfigdirs tcl tk itcl libgui sim"
-    noconfigdirs="$noconfigdirs expect dejagnu"
+    noconfigdirs="$noconfigdirs"
     # the C++ libraries don't build on top of CE's C libraries
     noconfigdirs="$noconfigdirs target-libstdc++-v3"
     noconfigdirs="$noconfigdirs target-newlib"
@@ -579,12 +579,12 @@ case "${target}" in
     ;;
   i[[3456789]]86-*-mingw32*)
     target_configdirs="$target_configdirs target-mingw"
-    noconfigdirs="$noconfigdirs expect target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
 
     # Can't build gdb for mingw32 if not native.
     case "${host}" in
-      i[[3456789]]86-*-mingw32) ;; # keep gdb tcl tk expect etc.
-      *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl gnuserv"
+      i[[3456789]]86-*-mingw32) ;; # keep gdb tcl tk etc.
+      *) noconfigdirs="$noconfigdirs gdb tcl tk itcl gnuserv"
          ;;
     esac
     ;;    
@@ -600,8 +600,8 @@ case "${target}" in
 
     # Can't build gdb for Cygwin if not native.
     case "${host}" in
-      *-*-cygwin*) ;; # keep gdb tcl tk expect etc.
-      *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl libgui gnuserv"
+      *-*-cygwin*) ;; # keep gdb tcl tk etc.
+      *) noconfigdirs="$noconfigdirs gdb tcl tk itcl libgui gnuserv"
          ;;
     esac
     ;;    
@@ -664,13 +664,13 @@ case "${target}" in
     ;;
   powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
     target_configdirs="$target_configdirs target-winsup"
-    noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl gnuserv ${libgcj}"
+    noconfigdirs="$noconfigdirs gdb tcl tk make target-libgloss itcl gnuserv ${libgcj}"
     # always build newlib.
     skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
     ;;
     # This is temporary until we can link against shared libraries
   powerpcle-*-solaris*)
-    noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl gnuserv ${libgcj}"
+    noconfigdirs="$noconfigdirs gdb sim make tcl tk itcl gnuserv ${libgcj}"
     ;;
   powerpc-*-beos*)
     noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: some top-level changes

[DJ Delorie]

We have a number of other projects listed there that aren't part of
our source trees (like "hello" or "textutils").  Why can't expect and
dejagnu have the same status?  Is there any harm in leaving them in?
You never know when some third party (Red Hat Inc comes to mind) will
want to build everything in one tree themselves.

Re: some top-level changes

[Ben Elliston]

[-- Attachment #1: Type: text/plain, Size: 467 bytes --]

> We have a number of other projects listed there that aren't part of
> our source trees (like "hello" or "textutils").  Why can't expect
> and dejagnu have the same status?  Is there any harm in leaving them
> in?  You never know when some third party (Red Hat Inc comes to
> mind) will want to build everything in one tree themselves.

This is the objection I was anticipating and, if that's considered to
be the case, then that's fine.  Patch withdrawn.  :-)

Ben

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]