* Removed unnecessary dependence of tktest executable on the tcltest

	executable on Unix.  If there are similar dependencies on other
	platforms, they can probably be removed as well.  [Bug 572134].


FossilOrigin-Name: a659e49382004293b766fb2ae5fbbba7877ca2e8

3 files changed, 11 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 302257d..6217f30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-21  Don Porter <dgp@users.sf.net>
+
+	* unix/Makefile.in:	Removed unnecessary dependence of tktest
+	* unix/tkAppInit.c:	executable on the tcltest executable on
+	Unix.  If there are similar dependencies on other platforms, they
+	can probably be removed as well.  [Bug 572134].
+
 2002-06-20  Peter Spjuth  <peter.spjuth@space.se>
 
 	* generic/tkGrid.c: Corrected the test for grid propagate change.
diff --git a/unix/Makefile.in b/unix/Makefile.in
index dd2f1fa..b48dc78 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.69 2002/06/18 23:51:46 dkf Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.70 2002/06/21 20:24:29 dgp Exp $
 
 # Current Tk version;  used in various names.
 
@@ -260,9 +260,7 @@ ${KEYSYM_FLAGS}
 
 WISH_OBJS = tkAppInit.o
 
-TCLTEST_OBJS = ${TCL_BIN_DIR}/tclTest.o ${TCL_BIN_DIR}/tclThreadTest.o \
-        ${TCL_BIN_DIR}/tclUnixTest.o
-TKTEST_OBJS = $(TCLTEST_OBJS) tkTestInit.o tkTest.o tkSquare.o
+TKTEST_OBJS = tkTestInit.o tkTest.o tkSquare.o
 
 WIDGOBJS = tkButton.o tkEntry.o tkFrame.o tkListbox.o \
 	tkMenu.o tkMenubutton.o tkMenuDraw.o tkMessage.o \
@@ -398,19 +396,13 @@ wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
 		@TK_BUILD_LIB_SPEC@ \
 		$(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish
 
-# This rule is executed if the user tried to run tktest without first
-# building tcltest in the Tcl bin directory. Just do it for them.
-${TCL_BIN_DIR}/tcltest:
-	cd ${TCL_BIN_DIR} ; \
-	$(MAKE) tcltest
-
 # Resetting the LIB_RUNTIME_DIR below is required so that
 # the generated tktest executable gets the build directory
 # burned into its ld search path. This keeps tktest from
 # picking up an already installed version of the Tcl or
 # Tk shared libraries.
 
-tktest: ${TCL_BIN_DIR}/tcltest $(TKTEST_OBJS) $(TK_LIB_FILE)
+tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
 	$(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR)
 
 tktest-real:
diff --git a/unix/tkAppInit.c b/unix/tkAppInit.c
index 395a39d..3a215fe 100644
--- a/unix/tkAppInit.c
+++ b/unix/tkAppInit.c
@@ -10,14 +10,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkAppInit.c,v 1.6 2002/06/14 22:01:37 andreas_kupries Exp $
+ * RCS: @(#) $Id: tkAppInit.c,v 1.7 2002/06/21 20:24:29 dgp Exp $
  */
 
 #include "tk.h"
 #include "locale.h"
 
 #ifdef TK_TEST
-extern int		Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp));
 extern int		Tktest_Init _ANSI_ARGS_((Tcl_Interp *interp));
 #endif /* TK_TEST */
 
@@ -101,11 +100,6 @@ Tcl_AppInit(interp)
     }
     Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
 #ifdef TK_TEST
-    if (Tcltest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init,
-            (Tcl_PackageInitProc *) NULL);
     if (Tktest_Init(interp) == TCL_ERROR) {
 	return TCL_ERROR;
     }