2002-12-13 Nathanael Nerode <neroden@gcc.gnu.org>

	* configure.in, Makefile.tpl, Makefile.def: Remove tclX.
	* Makefile.in: Regenerate.

5 files changed, 6 insertions, 73 deletions

diff --git a/ChangeLog b/ChangeLog
index 03e6f04..c91d20b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-13  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in, Makefile.tpl, Makefile.def: Remove tclX.
+	* Makefile.in: Regenerate.
+
 2002-12-12  Jeff Johnston  <jjohnstn@redhat.com>
 
         * COPYING.NEWLIB: Update list of alternate Regent of California
diff --git a/Makefile.def b/Makefile.def
index 80c270b..b27b071 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -66,7 +66,6 @@ host_modules= { module= zlib; no_install=true; no_check=true; };
 host_modules= { module= gdb; with_x=true; };
 host_modules= { module= expect; with_x=true; };
 host_modules= { module= guile; with_x=true; };
-host_modules= { module= tclX; with_x=true; };
 host_modules= { module= tk; with_x=true; };
 host_modules= { module= tix; with_x=true; };
 host_modules= { module= libtermcap; no_check=true; no_clean=true; };
diff --git a/Makefile.in b/Makefile.in
index 1fe1bd3..dfddbda 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -615,7 +615,6 @@ CLEAN_X11_MODULES = \
 	clean-gdb \
 	clean-expect \
 	clean-guile \
-	clean-tclX \
 	clean-tk \
 	clean-tix 
 
@@ -5575,74 +5574,6 @@ install-guile: installdirs
 	  (cd guile; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
 
 
-.PHONY: configure-tclX maybe-configure-tclX
-maybe-configure-tclX:
-configure-tclX: tclX/Makefile
-
-tclX/Makefile: config.status
-	@[ -d tclX ] || mkdir tclX; \
-	r=`${PWD}`; export r; \
-	s=`cd $(srcdir); ${PWD}`; export s; \
-	CC="$(CC)"; export CC; \
-	CFLAGS="$(CFLAGS)"; export CFLAGS; \
-	CXX="$(CXX)"; export CXX; \
-	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-	if [ z$(build_canonical) !=  z$(host_canoncial) ] ; then \
-	  AR="$(AR)"; export AR; \
-	  AS="$(AS)"; export AS; \
-	  CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-	  DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-	  LD="$(LD)"; export LD; \
-	  NM="$(NM)"; export NM; \
-	  RANLIB="$(RANLIB)"; export RANLIB; \
-	  WINDRES="$(WINDRES)"; export WINDRES; \
-	  OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-	  OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-	fi; \
-	echo Configuring in tclX; \
-	cd tclX || exit 1; \
-	case $(srcdir) in \
-	  \.) \
-	    srcdiroption="--srcdir=."; \
-	    libsrcdir=".";; \
-	  /* | [A-Za-z]:[\\/]*) \
-	    srcdiroption="--srcdir=$(srcdir)/tclX"; \
-	    libsrcdir="$$s/tclX";; \
-	  *) \
-	    srcdiroption="--srcdir=../$(srcdir)/tclX"; \
-	    libsrcdir="$$s/tclX";; \
-	esac; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  || exit 1
-
-.PHONY: all-tclX maybe-all-tclX
-maybe-all-tclX:
-all-tclX: configure-tclX
-	@r=`${PWD}`; export r; \
-	  s=`cd $(srcdir); ${PWD}`; export s; \
-	  $(SET_LIB_PATH) \
-	  (cd tclX; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
-
-
-.PHONY: check-tclX
-check-tclX:
-	@r=`${PWD}`; export r; \
-	  s=`cd $(srcdir); ${PWD}`; export s; \
-	  $(SET_LIB_PATH) \
-	  (cd tclX; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
-
-
-
-.PHONY: install-tclX maybe-install-tclX
-maybe-install-tclX:
-install-tclX: installdirs
-	@r=`${PWD}`; export r; \
-	  s=`cd $(srcdir); ${PWD}`; export s; \
-	  $(SET_LIB_PATH) \
-	  (cd tclX; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
-
-
 .PHONY: configure-tk maybe-configure-tk
 maybe-configure-tk:
 configure-tk: tk/Makefile
@@ -7733,7 +7664,6 @@ all-sed: maybe-all-libiberty
 all-send-pr: maybe-all-prms
 all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-db maybe-all-grep maybe-all-libgui
 all-tar: maybe-all-libiberty
-all-tclX: maybe-all-tcl maybe-all-tk
 all-uudecode: maybe-all-libiberty
 
 ALL_GCC = maybe-all-gcc
diff --git a/Makefile.tpl b/Makefile.tpl
index 6ae4a76..3518079 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1338,7 +1338,6 @@ all-sed: maybe-all-libiberty
 all-send-pr: maybe-all-prms
 all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-db maybe-all-grep maybe-all-libgui
 all-tar: maybe-all-libiberty
-all-tclX: maybe-all-tcl maybe-all-tk
 all-uudecode: maybe-all-libiberty
 
 ALL_GCC = maybe-all-gcc
diff --git a/configure.in b/configure.in
index ccef5c8..6969311 100644
--- a/configure.in
+++ b/configure.in
@@ -73,7 +73,7 @@ fi
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="intl mmalloc libiberty opcodes bfd readline db tcl tk tclX itcl tix libgui zlib"
+host_libs="intl mmalloc libiberty opcodes bfd readline db tcl tk itcl tix libgui zlib"
 
 libstdcxx_version="target-libstdc++-v3"