summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2002-08-26 14:32:17 (GMT)
committerdgp <dgp@users.sourceforge.net>2002-08-26 14:32:17 (GMT)
commitcba98af9a6ea332576939b71f74b5ffbdb4c61f3 (patch)
tree9189f9f66eeeb9c03029867745be484adc5af26d /win
parent76c397a9c55474d5859fcbf98e50f57ab0a55a3c (diff)
downloadtk-cba98af9a6ea332576939b71f74b5ffbdb4c61f3.zip
tk-cba98af9a6ea332576939b71f74b5ffbdb4c61f3.tar.gz
tk-cba98af9a6ea332576939b71f74b5ffbdb4c61f3.tar.bz2
* win/Makefile.in: Removed dependence on the (parts of) the
* win/winMain.c: tcltest executable on Windows. It was not used, and the dependency complicated the Makefile. [Bug 592638].
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in30
-rw-r--r--win/winMain.c18
2 files changed, 4 insertions, 44 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 7b1f490..e864898 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.56 2002/08/16 07:52:24 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.57 2002/08/26 14:32:18 dgp Exp $
TCLVERSION = @TCL_VERSION@
VERSION = @TK_VERSION@
@@ -115,7 +115,6 @@ BITMAP_DIR_NATIVE = $(shell $(CYGPATH) '$(ROOT_DIR)/bitmaps')
XLIB_DIR_NATIVE = $(shell $(CYGPATH) '$(ROOT_DIR)/xlib')
TCL_GENERIC_NATIVE = $(shell $(CYGPATH) '$(TCL_GENERIC_DIR)')
TCL_SRC_DIR_NATIVE = $(shell $(CYGPATH) '$(TCL_SRC_DIR)')
-TCL_BIN_DIR_NATIVE = $(shell $(CYGPATH) '$(TCL_BIN_DIR)')
RC_DIR_NATIVE = $(shell $(CYGPATH) '$(RC_DIR)')
DLLSUFFIX = @DLLSUFFIX@
@@ -130,7 +129,6 @@ SHARED_LIBRARIES = $(TK_DLL_FILE) $(TK_STUB_LIB_FILE)
STATIC_LIBRARIES = $(TK_LIB_FILE)
WISH = wish$(VER)${EXESUFFIX}
-TCLTEST = $(TCL_BIN_DIR)/tcltest${EXEEXT}
TKTEST = tktest${EXEEXT}
CAT32 = cat32$(EXEEXT)
MAN2TCL = man2tcl$(EXEEXT)
@@ -223,21 +221,7 @@ INSTALL_DATA = ${INSTALL}
WISH_OBJS = \
winMain.$(OBJEXT)
-TCLTEST_OBJS = \
- ${TCL_BIN_DIR}/tclThreadTest.$(OBJEXT)
-
-TCLTEST_OBJS_NATIVE = \
- "${TCL_BIN_DIR_NATIVE}/tclThreadTest.$(OBJEXT)"
-
TKTEST_OBJS = \
- $(TCLTEST_OBJS) \
- testMain.$(OBJEXT) \
- tkSquare.$(OBJEXT) \
- tkTest.$(OBJEXT) \
- tkWinTest.$(OBJEXT)
-
-TKTEST_OBJS_NATIVE = \
- $(TCLTEST_OBJS_NATIVE) \
testMain.$(OBJEXT) \
tkSquare.$(OBJEXT) \
tkTest.$(OBJEXT) \
@@ -534,14 +518,8 @@ $(WISH): $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(WISH_OBJS) wish.$(RES)
tktest : $(TKTEST)
-# 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.
-$(TCLTEST):
- cd ${TCL_BIN_DIR} ; \
- $(MAKE) tcltest
-
-$(TKTEST): $(TCLTEST) $(TK_LIB_FILE) $(TKTEST_OBJS) wish.$(RES) $(CAT32)
- $(CC) $(CFLAGS) $(TKTEST_OBJS_NATIVE) $(TCL_LIB_FILE) \
+$(TKTEST): $(TK_LIB_FILE) $(TKTEST_OBJS) wish.$(RES) $(CAT32)
+ $(CC) $(CFLAGS) $(TKTEST_OBJS) $(TCL_LIB_FILE) \
$(TK_LIB_FILE) $(LIBS) \
wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW)
@@ -585,8 +563,6 @@ tkWinTest.$(OBJEXT): tkWinTest.c
tkSquare.$(OBJEXT): tkSquare.c
$(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)
-tclThreadTest.$(OBJEXT): $(TCL_BIN_DIR)/tclThreadTest.$(OBJEXT)
-
# Add the object extension to the implicit rules. By default .obj is not
# automatically added.
diff --git a/win/winMain.c b/win/winMain.c
index 2d24a4f..a5478a9 100644
--- a/win/winMain.c
+++ b/win/winMain.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: winMain.c,v 1.11 2001/08/04 00:29:43 hobbs Exp $
+ * RCS: @(#) $Id: winMain.c,v 1.12 2002/08/26 14:32:18 dgp Exp $
*/
#include <tk.h>
@@ -38,11 +38,6 @@ static void WishPanic _ANSI_ARGS_(TCL_VARARGS(CONST char *,format));
extern int Tktest_Init(Tcl_Interp *interp);
#endif /* TK_TEST */
-#ifdef TCL_TEST
-extern int TclObjTest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-extern int Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-#endif /* TCL_TEST */
-
static BOOL consoleRequired = TRUE;
/*
@@ -189,17 +184,6 @@ Tcl_AppInit(interp)
}
}
-#ifdef TCL_TEST
- if (Tcltest_Init(interp) == TCL_ERROR) {
- return TCL_ERROR;
- }
- Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init,
- (Tcl_PackageInitProc *) NULL);
- if (TclObjTest_Init(interp) == TCL_ERROR) {
- return TCL_ERROR;
- }
-#endif /* TCL_TEST */
-
#ifdef TK_TEST
if (Tktest_Init(interp) == TCL_ERROR) {
goto error;