Update gdbtk dependencies to fix --disable-gdbtk

Update gdbtk dependencies to fix --disable-gdbtk

[Daniel Jacobowitz]

I accidentally used cvs up -dP on one of my build trees last night, and a
whole bunch of my GDB scripts fell down.  I had bits designed to fix most of
this, but they didn't work well enough.

This patch addresses the only bit that completely failed outside of various
forgotten --disable-gdbtk options.  First of all, with that specified,
install-gdb depended on install-libgui but all-gdb did not depend on
all-libgui, so install-libgui failed.  Secondly, tcl/tk/itcl were still
configured and eventually built (by their install rules).

This patch makes --disable-gdbtk _really_ disable GDB's dependencies on TCL,
TK, itcl, and libgui.  Tested in a couple of cross configurations.  OK?

-- 
Daniel Jacobowitz
CodeSourcery, LLC

2005-10-19  Daniel Jacobowitz  <dan@codesourcery.com>

	* Makefile.def: Remove gdb dependencies for gdbtk.
	* Makefile.tpl (CONFIGURE_GDB_TK, INSTALL_GDB_TK): New variables.
	(configure-gdb, install-gdb): New rules.
	* configure.in: Set CONFIGURE_GDB_TK and INSTALL_GDB_TK.
	* Makefile.in, configure: Regenerated.

Index: src/Makefile.def
===================================================================
--- src.orig/Makefile.def	2005-10-18 17:26:20.000000000 -0400
+++ src/Makefile.def	2005-10-19 09:10:31.000000000 -0400
@@ -275,9 +275,6 @@ dependencies = { module=all-fixincludes;
 dependencies = { module=all-gnattools; on=all-target-libada; };
 
 // Host modules specific to gdb.
-dependencies = { module=configure-gdb; on=configure-itcl; };
-dependencies = { module=configure-gdb; on=configure-tcl; };
-dependencies = { module=configure-gdb; on=configure-tk; };
 dependencies = { module=configure-gdb; on=configure-sim; };
 dependencies = { module=all-gdb; on=all-libiberty; };
 dependencies = { module=all-gdb; on=all-opcodes; };
@@ -286,10 +283,6 @@ dependencies = { module=all-gdb; on=all-
 dependencies = { module=all-gdb; on=all-build-bison; };
 dependencies = { module=all-gdb; on=all-build-byacc; };
 dependencies = { module=all-gdb; on=all-sim; };
-dependencies = { module=install-gdb; on=install-tcl; };
-dependencies = { module=install-gdb; on=install-tk; };
-dependencies = { module=install-gdb; on=install-itcl; };
-dependencies = { module=install-gdb; on=install-libgui; };
 
 dependencies = { module=configure-libgui; on=configure-tcl; };
 dependencies = { module=configure-libgui; on=configure-tk; };
Index: src/Makefile.tpl
===================================================================
--- src.orig/Makefile.tpl	2005-10-18 17:26:21.000000000 -0400
+++ src/Makefile.tpl	2005-10-19 09:09:03.000000000 -0400
@@ -1748,8 +1748,12 @@ all-prebootstrap: maybe-all-[+module+][+
 ENDFOR host_modules +]
 @endif gcc-no-bootstrap
 
+CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@
 GDB_TK = @GDB_TK@
+INSTALL_GDB_TK = @INSTALL_GDB_TK@
+configure-gdb: $(CONFIGURE_GDB_TK)
 all-gdb: $(gdbnlmrequirements) $(GDB_TK)
+install-gdb: $(INSTALL_GDB_TK)
 
 # Serialization dependencies.  Host configures don't work well in parallel to
 # each other, due to contention over config.cache.  Target configures and 
Index: src/configure.in
===================================================================
--- src.orig/configure.in	2005-10-18 20:28:14.000000000 -0400
+++ src/configure.in	2005-10-19 09:10:16.000000000 -0400
@@ -1724,6 +1724,8 @@ case "$enable_gdbtk" in
     fi
     ;;
 esac
+CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g`
+INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
 
 # Strip out unwanted targets.
 
@@ -2077,7 +2079,9 @@ AC_SUBST(BUILD_PREFIX)
 AC_SUBST(BUILD_PREFIX_1)
 AC_SUBST(tooldir)
 AC_SUBST(build_tooldir)
+AC_SUBST(CONFIGURE_GDB_TK)
 AC_SUBST(GDB_TK)
+AC_SUBST(INSTALL_GDB_TK)
 
 # Build module lists & subconfigure args.
 AC_SUBST(build_configargs)

Re: Update gdbtk dependencies to fix --disable-gdbtk

[DJ Delorie]

I'm OK with this from a technical point of view, but I'll defer to the
gdb folks if it's a Good Idea to do it this way.

> This patch makes --disable-gdbtk _really_ disable GDB's dependencies on TCL,
> TK, itcl, and libgui.  Tested in a couple of cross configurations.  OK?
> 
> -- 
> Daniel Jacobowitz
> CodeSourcery, LLC
> 
> 2005-10-19  Daniel Jacobowitz  <dan@codesourcery.com>
> 
> 	* Makefile.def: Remove gdb dependencies for gdbtk.
> 	* Makefile.tpl (CONFIGURE_GDB_TK, INSTALL_GDB_TK): New variables.
> 	(configure-gdb, install-gdb): New rules.
> 	* configure.in: Set CONFIGURE_GDB_TK and INSTALL_GDB_TK.
> 	* Makefile.in, configure: Regenerated.

Re: Update gdbtk dependencies to fix --disable-gdbtk

[Jim Blandy]

DJ Delorie <dj@redhat.com> writes:
> I'm OK with this from a technical point of view, but I'll defer to the
> gdb folks if it's a Good Idea to do it this way.

I think it's a Good Idea to do it this way, but I'll defer to DJ for
the technical point of view.

>> 2005-10-19  Daniel Jacobowitz  <dan@codesourcery.com>
>> 
>> 	* Makefile.def: Remove gdb dependencies for gdbtk.
>> 	* Makefile.tpl (CONFIGURE_GDB_TK, INSTALL_GDB_TK): New variables.
>> 	(configure-gdb, install-gdb): New rules.
>> 	* configure.in: Set CONFIGURE_GDB_TK and INSTALL_GDB_TK.
>> 	* Makefile.in, configure: Regenerated.

Re: Update gdbtk dependencies to fix --disable-gdbtk

[DJ Delorie]

> DJ Delorie <dj@redhat.com> writes:
> > I'm OK with this from a technical point of view, but I'll defer to the
> > gdb folks if it's a Good Idea to do it this way.
> 
> I think it's a Good Idea to do it this way, but I'll defer to DJ for
> the technical point of view.

Error: recursion detected!

Abort.

Patch approved.