merged tcl 8.1 branch back into the main trunk

1 files changed, 142 insertions, 96 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index 24f3dd7..25edd12 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -2,20 +2,20 @@
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
+# 
 # Copyright (c) 1995-1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 #
-# RCS: @(#) $Id: makefile.vc,v 1.25 1999/03/10 05:52:53 stanton Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.26 1999/04/16 00:48:07 stanton Exp $
 
 # Does not depend on the presence of any environment variables in
-# order to compile tcl; all needed information is derived from
+# order to compile tcl; all needed information is derived from 
 # location of the compiler directories.
 
 #
 # Project directories
 #
-# ROOT    = top of source tree
+# ROOT	  = top of source tree
 #
 # TOOLS32 = location of VC++ 32-bit development tools. Note that the
 #	    VC++ 2.0 header files are broken, so you need to use the
@@ -24,10 +24,10 @@
 #
 # TOOLS16 = location of VC++ 1.5 16-bit tools, needed to build thunking
 #	    library.  This information is optional; if the 16-bit compiler
-#	    is not available, then the 16-bit code will not be built.
+#	    is not available, then the 16-bit code will not be built.  
 #	    Tcl will still run without the 16-bit code, but...
-#		A. Under Windows 3.X you will any calls to the exec command
-#	           will return an error.
+#		A. Under Windows 3.X any calls to the exec command
+#		   will return an error.
 #		B. A 16-bit program to test the behavior of the exec
 #		   command under NT and 95 will not be built.
 # INSTALLDIR = where the install- targets should copy the binaries and
@@ -39,11 +39,14 @@ TOOLS32		= c:\program files\devstudio\vc
 TOOLS32_rc	= c:\program files\devstudio\sharedide
 TOOLS16		= c:\msvc
 
-INSTALLDIR	= c:\programa files\Tcl
+INSTALLDIR	= c:\program files\Tcl
 
 # Set this to the appropriate value of /MACHINE: for your platform
 MACHINE	= IX86
 
+# Uncomment the following line to compile with thread support
+#THREADDEFINES = -DTCL_THREADS=1
+
 # Set NODEBUG to 0 to compile with symbols
 NODEBUG = 1
 
@@ -53,14 +56,12 @@ NODEBUG = 1
 #	-DTCL_MEM_DEBUG		Enables the debugging memory allocator.
 #	-DTCL_COMPILE_DEBUG	Enables byte compilation logging.
 #	-DTCL_COMPILE_STATS	Enables byte compilation statistics gathering.
-#	-DUSE_NATIVE_MALLOC	Disables the Tcl memory allocator in favor
+#	-DUSE_TCLALLOC=0	Disables the Tcl memory allocator in favor
 #				of the native malloc implementation.  This is
 #				needed when using Purify.
 #
-#DEBUGDEFINES	= -DTCL_MEM_DEBUG
-#DEBUGDEFINES	= -DTCL_MEM_DEBUG -DTCL_COMPILE_DEBUG
-#DEBUGDEFINES	= -DTCL_MEM_DEBUG -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
-#DEBUGDEFINES	= -DUSE_NATIVE_MALLOC
+#DEBUGDEFINES = -DTCL_MEM_DEBUG -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
+#DEBUGDEFINES = -DUSE_TCLALLOC=0
 
 ######################################################################
 # Do not modify below this line
@@ -68,8 +69,8 @@ NODEBUG = 1
 
 NAMEPREFIX = tcl
 STUBPREFIX = $(NAMEPREFIX)stub
-DOTVERSION = 8.0
-VERSION = 80
+DOTVERSION = 8.1
+VERSION = 81
 
 BINROOT		= .
 !IF "$(NODEBUG)" == "1"
@@ -100,10 +101,15 @@ TCLPIPEDLLNAME	= $(NAMEPREFIX)pip$(VERSION)$(DBGX).dll
 TCLPIPEDLL	= $(OUTDIR)\$(TCLPIPEDLLNAME)
 TCLREGDLLNAME	= $(NAMEPREFIX)reg$(VERSION)$(DBGX).dll
 TCLREGDLL	= $(OUTDIR)\$(TCLREGDLLNAME)
+TCLDDEDLLNAME	= $(NAMEPREFIX)dde$(VERSION)$(DBGX).dll
+TCLDDEDLL	= $(OUTDIR)\$(TCLDDEDLLNAME)
 TCLTEST		= $(OUTDIR)\$(NAMEPREFIX)test.exe
 DUMPEXTS	= $(TMPDIR)\dumpexts.exe
 CAT16		= $(TMPDIR)\cat16.exe
 CAT32		= $(TMPDIR)\cat32.exe
+RMDIR		= .\rmd.bat
+MKDIR		= .\mkd.bat
+RM		= del
 
 LIB_INSTALL_DIR	= $(INSTALLDIR)\lib
 BIN_INSTALL_DIR	= $(INSTALLDIR)\bin
@@ -117,11 +123,15 @@ TCLTESTOBJS = \
 	$(TMPDIR)\tclTest.obj \
 	$(TMPDIR)\tclTestObj.obj \
 	$(TMPDIR)\tclTestProcBodyObj.obj \
+	$(TMPDIR)\tclThreadTest.obj \
 	$(TMPDIR)\tclWinTest.obj \
 	$(TMPDIR)\testMain.obj
 
 TCLOBJS = \
-	$(TMPDIR)\regexp.obj \
+	$(TMPDIR)\regcomp.obj \
+	$(TMPDIR)\regexec.obj \
+	$(TMPDIR)\regfree.obj \
+	$(TMPDIR)\regerror.obj \
 	$(TMPDIR)\strftime.obj \
 	$(TMPDIR)\tclAlloc.obj \
 	$(TMPDIR)\tclAsync.obj \
@@ -132,9 +142,11 @@ TCLOBJS = \
 	$(TMPDIR)\tclCmdAH.obj \
 	$(TMPDIR)\tclCmdIL.obj \
 	$(TMPDIR)\tclCmdMZ.obj \
+	$(TMPDIR)\tclCompCmds.obj \
 	$(TMPDIR)\tclCompExpr.obj \
 	$(TMPDIR)\tclCompile.obj \
 	$(TMPDIR)\tclDate.obj \
+	$(TMPDIR)\tclEncoding.obj \
 	$(TMPDIR)\tclEnv.obj \
 	$(TMPDIR)\tclEvent.obj \
 	$(TMPDIR)\tclExecute.obj \
@@ -150,6 +162,7 @@ TCLOBJS = \
 	$(TMPDIR)\tclIOSock.obj \
 	$(TMPDIR)\tclIOUtil.obj \
 	$(TMPDIR)\tclLink.obj \
+	$(TMPDIR)\tclLiteral.obj \
 	$(TMPDIR)\tclListObj.obj \
 	$(TMPDIR)\tclLoad.obj \
 	$(TMPDIR)\tclMain.obj \
@@ -158,19 +171,28 @@ TCLOBJS = \
 	$(TMPDIR)\tclObj.obj \
 	$(TMPDIR)\tclPanic.obj \
 	$(TMPDIR)\tclParse.obj \
+	$(TMPDIR)\tclParseExpr.obj \
 	$(TMPDIR)\tclPipe.obj \
 	$(TMPDIR)\tclPkg.obj \
 	$(TMPDIR)\tclPosixStr.obj \
 	$(TMPDIR)\tclPreserve.obj \
-	$(TMPDIR)\tclResolve.obj \
 	$(TMPDIR)\tclProc.obj \
+	$(TMPDIR)\tclRegexp.obj \
+	$(TMPDIR)\tclResolve.obj \
+	$(TMPDIR)\tclResult.obj \
+	$(TMPDIR)\tclScan.obj \
 	$(TMPDIR)\tclStringObj.obj \
 	$(TMPDIR)\tclStubInit.obj \
+	$(TMPDIR)\tclStubLib.obj \
+	$(TMPDIR)\tclThread.obj \
 	$(TMPDIR)\tclTimer.obj \
+	$(TMPDIR)\tclUtf.obj \
 	$(TMPDIR)\tclUtil.obj \
 	$(TMPDIR)\tclVar.obj \
 	$(TMPDIR)\tclWin32Dll.obj \
 	$(TMPDIR)\tclWinChan.obj \
+	$(TMPDIR)\tclWinConsole.obj \
+	$(TMPDIR)\tclWinSerial.obj \
 	$(TMPDIR)\tclWinError.obj \
 	$(TMPDIR)\tclWinFCmd.obj \
 	$(TMPDIR)\tclWinFile.obj \
@@ -180,14 +202,10 @@ TCLOBJS = \
 	$(TMPDIR)\tclWinNotify.obj \
 	$(TMPDIR)\tclWinPipe.obj \
 	$(TMPDIR)\tclWinSock.obj \
-	$(TMPDIR)\tclWinTime.obj
+	$(TMPDIR)\tclWinThrd.obj \
+	$(TMPDIR)\tclWinTime.obj 
 
-TCLSTUBOBJS = \
-	$(TMPDIR)\tclStubLib.obj \
-	$(TMPDIR)\tclStubs.obj \
-	$(TMPDIR)\tclPlatStubs.obj \
-	$(TMPDIR)\tclIntStubs.obj \
-	$(TMPDIR)\tclIntPlatStubs.obj
+TCLSTUBOBJS = $(TMPDIR)\tclStubLib.obj \
 
 cc32		= "$(TOOLS32)\bin\cl.exe"
 link32		= "$(TOOLS32)\bin\link.exe"
@@ -200,16 +218,16 @@ link16		= "$(TOOLS16)\bin\link.exe"
 rc16		= "$(TOOLS16)\bin\rc.exe"
 include16	= -I"$(TOOLS16)\include"
 
-WINDIR          = $(ROOT)\win
+WINDIR		= $(ROOT)\win
 GENERICDIR	= $(ROOT)\generic
 
 TCL_INCLUDES	= -I$(WINDIR) -I$(GENERICDIR)
-TCL_DEFINES	= -D__WIN32__ $(DEBUGDEFINES)
+TCL_DEFINES	= -D__WIN32__ $(DEBUGDEFINES) $(THREADDEFINES)
 
 TCL_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
 			$(TCL_INCLUDES) $(TCL_DEFINES)
 CON_CFLAGS	= $(cdebug) $(cflags) $(cvars) $(include32) -DCONSOLE
-DOS_CFLAGS	= $(cdebug) $(cflags) $(include16) -AL
+DOS_CFLAGS	= $(cdebug) $(cflags) $(include16) -AL 
 DLL16_CFLAGS	= $(cdebug) $(cflags) $(include16) -ALw
 
 ######################################################################
@@ -228,9 +246,9 @@ lcommon = /NODEFAULTLIB /RELEASE /NOLOGO
 # declarations for use on Intel i386, i486, and Pentium systems
 !IF "$(MACHINE)" == "IX86"
 DLLENTRY = @12
-lflags   = $(lcommon) /MACHINE:$(MACHINE)
+lflags	 = $(lcommon) /MACHINE:$(MACHINE)
 !ELSE
-lflags   = $(lcommon) /MACHINE:$(MACHINE)
+lflags	 = $(lcommon) /MACHINE:$(MACHINE)
 !ENDIF
 
 conlflags = $(lflags) -subsystem:console -entry:mainCRTStartup
@@ -246,7 +264,7 @@ libcdll = msvcrt$(DBGX).lib oldnames.lib
 !ENDIF
 
 baselibs   = kernel32.lib $(optlibs) advapi32.lib user32.lib
-winlibs    = $(baselibs) gdi32.lib comdlg32.lib winspool.lib
+winlibs	   = $(baselibs) gdi32.lib comdlg32.lib winspool.lib
 
 guilibs	   = $(libc) $(winlibs)
 conlibs	   = $(libc) $(baselibs)
@@ -283,8 +301,8 @@ cflags = $(ccommon) -D_ALPHA_=1
 !ENDIF
 !ENDIF
 
-cvars      = -DWIN32 -D_WIN32
-cvarsmt    = $(cvars) -D_MT
+cvars	   = -DWIN32 -D_WIN32
+cvarsmt	   = $(cvars) -D_MT
 cvarsdll   = $(cvarsmt) -D_DLL
 
 !IF "$(NODEBUG)" == "1"
@@ -298,8 +316,8 @@ cvarsdll   = $(cvars) -MDd
 ######################################################################
 
 release:    setup $(TCLSH) dlls
-dlls:	    setup $(TCL16DLL) $(TCLPIPEDLL) $(TCLREGDLL)
-all:	    setup $(TCLSH) dlls $(CAT16) $(CAT32)
+dlls:	    setup $(TCL16DLL) $(TCLPIPEDLL) $(TCLREGDLL) $(TCLDDEDLL)
+all:	    setup $(TCLSH) dlls $(CAT16) $(CAT32) 
 tcltest:    setup $(TCLTEST) dlls $(CAT16) $(CAT32)
 plugin:	    setup $(TCLPLUGINDLL) $(TCLSHP)
 install:    install-binaries install-libraries
@@ -308,19 +326,18 @@ test:	    setup $(TCLTEST) dlls $(CAT16) $(CAT32)
 	set TCL_LIBRARY=$(ROOT)/library
 	$(TCLTEST) << "$(TCLREGDLL)"
 		load [lindex $$argv 0] registry
-		cd ../tests
-		source all
+		source $(ROOT)/tests/all.tcl
 <<
 
 setup:
-	@mkd $(TMPDIR)
-	@mkd $(OUTDIR)
+	@$(MKDIR) $(TMPDIR)
+	@$(MKDIR) $(OUTDIR)
 
 $(DUMPEXTS): $(WINDIR)\winDumpExts.c
 	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $?
 	set LIB="$(TOOLS32)\lib"
 	$(link32) $(ldebug) $(conlflags) $(guilibs) -out:$@ \
-		$(TMPDIR)\winDumpExts.obj
+		$(TMPDIR)\winDumpExts.obj 
 
 $(TCLLIB): $(TCLDLL)
 
@@ -346,12 +363,12 @@ $(TCLOBJS)
 $(TCLSH): $(TCLSHOBJS) $(TCLLIB) $(TMPDIR)\tclsh.res
 	set LIB="$(TOOLS32)\lib"
 	$(link32) $(ldebug) $(conlflags) $(TMPDIR)\tclsh.res -stack:2300000 \
-		-out:$@ $(conlibsdll) $(TCLLIB) $(TCLSHOBJS)
+		-out:$@ $(conlibsdll) $(TCLLIB) $(TCLSHOBJS) 
 
 $(TCLSHP): $(TCLSHOBJS) $(TCLPLUGINLIB) $(TMPDIR)\tclsh.res
-	set LIB="$(TOOLS32)\lib"
+	set LIB=$(TOOLS32)\lib
 	$(link32) $(ldebug) $(conlflags) $(TMPDIR)\tclsh.res -stack:2300000 \
-		-out:$@ $(conlibsdll) $(TCLPLUGINLIB) $(TCLSHOBJS)
+		-out:$@ $(conlibsdll) $(TCLPLUGINLIB) $(TCLSHOBJS) 
 
 $(TCLTEST): $(TCLTESTOBJS) $(TCLLIB) $(TMPDIR)\tclsh.res
 	set LIB="$(TOOLS32)\lib"
@@ -361,17 +378,17 @@ $(TCLTEST): $(TCLTESTOBJS) $(TCLLIB) $(TMPDIR)\tclsh.res
 $(TCL16DLL):  $(WINDIR)\tcl16.rc $(WINDIR)\tclWin16.c
 	if exist $(cc16) $(cc16) @<<
 $(DLL16_CFLAGS) -Fo$(TMPDIR)\ $(WINDIR)\tclWin16.c
-<<
+<<			   
 	@copy << $(TMPDIR)\tclWin16.def > nul
 LIBRARY $(@B);dll
 EXETYPE WINDOWS
 CODE PRELOAD MOVEABLE DISCARDABLE
 DATA PRELOAD MOVEABLE SINGLE
-HEAPSIZE 1024
+HEAPSIZE 1024 
 EXPORTS
 	WEP @1 RESIDENTNAME
-	UTPROC @2
-<<
+	UTPROC @2 
+<< 
 	if exist $(cc16) $(link16) /NOLOGO /ONERROR:NOEXE /NOE @<<
 $(TMPDIR)\tclWin16.obj
 $@
@@ -386,6 +403,11 @@ $(TCLPIPEDLL): $(WINDIR)\stub16.c
 	set LIB="$(TOOLS32)\lib"
 	$(link32) $(ldebug) $(conlflags) -out:$@ $(TMPDIR)\stub16.obj $(guilibs)
 
+$(TCLDDEDLL): $(TMPDIR)\tclWinDde.obj $(TCLSTUBLIB)
+	set LIB="$(TOOLS32)\lib"
+	$(link32) $(ldebug) $(dlllflags) -out:$@ $(TMPDIR)\tclWinDde.obj \
+		$(conlibsdll) $(TCLSTUBLIB)
+
 $(TCLREGDLL): $(TMPDIR)\tclWinReg.obj $(TCLSTUBLIB)
 	set LIB="$(TOOLS32)\lib"
 	$(link32) $(ldebug) $(dlllflags) -out:$@ $(TMPDIR)\tclWinReg.obj \
@@ -398,7 +420,7 @@ $(CAT32): $(WINDIR)\cat.c
 
 $(CAT16): $(WINDIR)\cat.c
 	if exist $(cc16) $(cc16) $(DOS_CFLAGS) -Fo$(TMPDIR)\ $?
-	set LIB="$(TOOLS16)\lib"
+	set LIB=$(TOOLS16)\lib
 	if exist $(cc16) $(link16) /NOLOGO /ONERROR:NOEXE /NOI /STACK:16384 \
 		$(TMPDIR)\cat.obj,$@,nul,llibce.lib,nul
 
@@ -413,44 +435,49 @@ $(TCLOBJS)
 <<
 
 install-binaries: $(TCLSH)
-	@mkd $(BIN_INSTALL_DIR)
-	@mkd $(LIB_INSTALL_DIR)
+	$(MKDIR) "$(BIN_INSTALL_DIR)"
+	$(MKDIR) "$(LIB_INSTALL_DIR)"
 	@echo installing $(TCLDLLNAME)
-	@copy $(TCLDLL) $(BIN_INSTALL_DIR)
-	@copy $(TCLLIB) $(LIB_INSTALL_DIR)
-	@echo installing $(TCLSH)
-	@copy $(TCLSH) $(BIN_INSTALL_DIR)
+	@copy "$(TCLDLL)" "$(BIN_INSTALL_DIR)"
+	@copy "$(TCLLIB)" "$(LIB_INSTALL_DIR)"
+	@echo installing "$(TCLSH)"
+	@copy "$(TCLSH)" "$(BIN_INSTALL_DIR)"
 	@echo installing $(TCLPIPEDLLNAME)
-	@copy $(TCLPIPEDLL) $(BIN_INSTALL_DIR)
+	@copy "$(TCLPIPEDLL)" "$(BIN_INSTALL_DIR)"
 	@echo installing $(TCLREGDLLNAME)
-	@copy $(TCLREGDLL) $(LIB_INSTALL_DIR)
-	echo installing $(TCLSTUBLIBNAME)
-	copy $(TCLSTUBLIB) $(LIB_INSTALL_DIR)
+	@copy "$(TCLREGDLL)" "$(LIB_INSTALL_DIR)"
+	@echo installing $(TCLDDEDLLNAME)
+	@copy "$(TCLDDEDLL)" "$(LIB_INSTALL_DIR)"
+	@echo installing $(TCLSTUBLIBNAME)
+	@copy "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)"
 
 install-libraries:
-	-@mkd $(LIB_INSTALL_DIR)
-	-@mkd $(INCLUDE_INSTALL_DIR)
-	-@mkd $(SCRIPT_INSTALL_DIR)
-	-@mkd $(SCRIPT_INSTALL_DIR)\http1.0
+	-@$(MKDIR) "$(LIB_INSTALL_DIR)"
+	-@$(MKDIR) "$(INCLUDE_INSTALL_DIR)"
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http1.0"
 	@copy << "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
 package ifneeded registry 1.0 "load [list [file join $$dir .. $(TCLREGDLLNAME)]] registry"
+package ifneeded dde 1.0 "load [list [file join $$dir .. $(TCLDDEDLLNAME)]] dde"
 <<
-	-@copy $(ROOT)\library\http1.0\http.tcl $(SCRIPT_INSTALL_DIR)\http1.0
-	-@copy $(ROOT)\library\http1.0\pkgIndex.tcl $(SCRIPT_INSTALL_DIR)\http1.0
-	-@mkd $(SCRIPT_INSTALL_DIR)\http2.0
-	-@copy $(ROOT)\library\http2.0\http.tcl $(SCRIPT_INSTALL_DIR)\http2.0
-	-@copy $(ROOT)\library\http2.0\pkgIndex.tcl $(SCRIPT_INSTALL_DIR)\http2.0
-	-@mkd $(SCRIPT_INSTALL_DIR)\opt0.1
-	-@copy $(ROOT)\library\opt0.1\optparse.tcl $(SCRIPT_INSTALL_DIR)\opt0.1
-	-@copy $(ROOT)\library\opt0.1\pkgIndex.tcl $(SCRIPT_INSTALL_DIR)\opt0.1
-	-@copy $(GENERICDIR)\tcl.h $(INCLUDE_INSTALL_DIR)
-	-@copy $(ROOT)\library\history.tcl $(SCRIPT_INSTALL_DIR)
-	-@copy $(ROOT)\library\init.tcl $(SCRIPT_INSTALL_DIR)
-	-@copy $(ROOT)\library\ldAout.tcl $(SCRIPT_INSTALL_DIR)
-	-@copy $(ROOT)\library\parray.tcl $(SCRIPT_INSTALL_DIR)
-	-@copy $(ROOT)\library\safe.tcl $(SCRIPT_INSTALL_DIR)
-	-@copy $(ROOT)\library\tclIndex $(SCRIPT_INSTALL_DIR)
-	-@copy $(ROOT)\library\word.tcl $(SCRIPT_INSTALL_DIR)
+	-@copy "$(ROOT)\library\http1.0\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http1.0"
+	-@copy "$(ROOT)\library\http1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0"
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.0"
+	-@copy "$(ROOT)\library\http2.0\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http2.0"
+	-@copy "$(ROOT)\library\http2.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.0"
+	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"
+	-@copy "$(ROOT)\library\opt0.4\optparse.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
+	-@copy "$(ROOT)\library\opt0.4\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
+	-@copy "$(GENERICDIR)\tcl.h"         "$(INCLUDE_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\history.tcl" "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\init.tcl"    "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\ldAout.tcl"  "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\parray.tcl"  "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\safe.tcl"    "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\tclIndex"    "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\package.tcl" "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\word.tcl"    "$(SCRIPT_INSTALL_DIR)"
+	-@copy "$(ROOT)\library\auto.tcl"    "$(SCRIPT_INSTALL_DIR)"
 
 #
 # Regenerate the stubs files.
@@ -487,18 +514,37 @@ $(TMPDIR)\tclAppInit.obj : $(WINDIR)\tclAppInit.c
 $(TMPDIR)\tclWinReg.obj : $(WINDIR)\tclWinReg.c
 	$(cc32) $(TCL_CFLAGS) -DUSE_TCL_STUBS -Fo$@ $?
 
+$(TMPDIR)\tclWinDde.obj : $(WINDIR)\tclWinDde.c
+	$(cc32) $(TCL_CFLAGS) -DUSE_TCL_STUBS -Fo$@ $?
+
 # The following objects are part of the stub library and should not
 # be built as DLL objects but none of the symbols should be exported
 
-$(TMPDIR)\tclStubs.obj : $(GENERICDIR)\tclStubs.c
-	$(cc32) $(TCL_CFLAGS) -DSTATIC_BUILD -Fo$@ $?
-$(TMPDIR)\tclPlatStubs.obj : $(GENERICDIR)\tclPlatStubs.c
-	$(cc32) $(TCL_CFLAGS) -DSTATIC_BUILD -Fo$@ $?
-$(TMPDIR)\tclIntStubs.obj : $(GENERICDIR)\tclIntStubs.c
-	$(cc32) $(TCL_CFLAGS) -DSTATIC_BUILD -Fo$@ $?
-$(TMPDIR)\tclPlatIntStubs.obj : $(GENERICDIR)\tclPlatIntStubs.c
+$(TMPDIR)\tclStubLib.obj : $(GENERICDIR)\tclStubLib.c
 	$(cc32) $(TCL_CFLAGS) -DSTATIC_BUILD -Fo$@ $?
 
+
+# Dedependency rules
+
+$(GENERICDIR)\regcomp.c: \
+	$(GENERICDIR)\regguts.h \
+	$(GENERICDIR)\regc_lex.c \
+	$(GENERICDIR)\regc_color.c \
+	$(GENERICDIR)\regc_nfa.c \
+	$(GENERICDIR)\regc_cvec.c \
+	$(GENERICDIR)\regc_locale.c
+$(GENERICDIR)\regcustom.h: \
+	$(GENERICDIR)\tclInt.h \
+	$(GENERICDIR)\tclPort.h \
+	$(GENERICDIR)\regex.h
+$(GENERICDIR)\regexec.c: \
+	$(GENERICDIR)\rege_dfa.c \
+	$(GENERICDIR)\regguts.h
+$(GENERICDIR)\regerror.c: $(GENERICDIR)\regguts.h
+$(GENERICDIR)\regfree.c: $(GENERICDIR)\regguts.h
+$(GENERICDIR)\regfronts.c: $(GENERICDIR)\regguts.h
+$(GENERICDIR)\regguts.h: $(GENERICDIR)\regcustom.h
+
 #
 # Implicit rules
 #
@@ -517,15 +563,15 @@ $(TMPDIR)\tclPlatIntStubs.obj : $(GENERICDIR)\tclPlatIntStubs.c
 		$(TCL_DEFINES) $<
 
 clean:
-        -@del $(OUTDIR)\*.exp
-	-@del $(OUTDIR)\*.lib
-	-@del $(OUTDIR)\*.dll
-	-@del $(OUTDIR)\*.exe
-	-@del $(OUTDIR)\*.pdb
-	-@del $(TMPDIR)\*.pch
-        -@del $(TMPDIR)\*.obj
-        -@del $(TMPDIR)\*.res
-        -@del $(TMPDIR)\*.def
-        -@del $(TMPDIR)\*.exe
-	-@rmd $(OUTDIR)
-	-@rmd $(TMPDIR)
+	-@$(RM) $(OUTDIR)\*.exp 
+	-@$(RM) $(OUTDIR)\*.lib 
+	-@$(RM) $(OUTDIR)\*.dll 
+	-@$(RM) $(OUTDIR)\*.exe
+	-@$(RM) $(OUTDIR)\*.pdb
+	-@$(RM) $(TMPDIR)\*.pch
+	-@$(RM) $(TMPDIR)\*.obj
+	-@$(RM) $(TMPDIR)\*.res
+	-@$(RM) $(TMPDIR)\*.def
+	-@$(RM) $(TMPDIR)\*.exe
+	-@$(RMDIR) $(OUTDIR)
+	-@$(RMDIR) $(TMPDIR)