Latest and greatest.

diff --git a/PC/vc40.mak b/PC/vc40.mak
index 2b2912164cd2a6db33dbf9cec52458f17a994bb4..362fee64d2cda54a1a2b12def9774bc0d8b88efe 100644 (file)
--- a/PC/vc40.mak
+++ b/PC/vc40.mak
@@ -405,9 +405,9 @@ CLEAN :
 \r
 CPP=cl.exe\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "PC" /I "Include" /I "C:\tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /c\r
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "PC" /I "Include" /I "C:\tcl\include" /D\\r
- "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H"\\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "PC" /I "Include" /I "C:\TCL80A2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /c\r
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "PC" /I "Include" /I "C:\TCL80A2\include"\\r
+ /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H"\\r
  /Fp"$(INTDIR)/_tkinter.pch" /YX /Fo"$(INTDIR)/" /c \r
 CPP_OBJS=.\vc40\tmp/\r
 CPP_SBRS=.\.\r
@@ -456,8 +456,8 @@ DEF_FILE= \
 LINK32_OBJS= \\r
        "$(INTDIR)\_tkinter.obj" \\r
        "$(OUTDIR)\python15.lib" \\r
-       ".\PC\tcl75.lib" \\r
-       ".\PC\tk41.lib"\r
+       ".\PC\tcl80.lib" \\r
+       ".\PC\tk80.lib"\r
 \r
 "$(OUTDIR)\_tkinter.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -770,7 +770,6 @@ DEP_CPP_LONGO=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -818,7 +817,6 @@ DEP_CPP_LISTO=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -867,7 +865,6 @@ DEP_CPP_INTOB=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -916,7 +913,6 @@ DEP_CPP_IMPOR=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -972,7 +968,6 @@ DEP_CPP_IMAGE=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -997,7 +992,6 @@ DEP_CPP_GRAMM=\
        ".\Include\myproto.h"\\r
        ".\Include\pgenheaders.h"\\r
        ".\Include\pydebug.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\token.h"\\r
        ".\PC\config.h"\\r
        \r
@@ -1018,7 +1012,6 @@ DEP_CPP_GRAMI=\
        ".\Include\myproto.h"\\r
        ".\Include\pgenheaders.h"\\r
        ".\Include\pydebug.h"\\r
-       ".\Include\rename2.h"\\r
        ".\PC\config.h"\\r
        \r
 \r
@@ -1062,7 +1055,6 @@ DEP_CPP_GETVE=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -1110,7 +1102,6 @@ DEP_CPP_GETPL=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -1129,7 +1120,6 @@ DEP_CPP_GETPL=\
 \r
 SOURCE=.\Python\getmtime.c\r
 DEP_CPP_GETMT=\\r
-       ".\Include\rename2.h"\\r
        ".\PC\config.h"\\r
        {$(INCLUDE)}"\sys\STAT.H"\\r
        {$(INCLUDE)}"\sys\TYPES.H"\\r
@@ -1174,7 +1164,6 @@ DEP_CPP_GETCO=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -1222,7 +1211,6 @@ DEP_CPP_GETCOM=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -1240,54 +1228,6 @@ DEP_CPP_GETCOM=\
 # Begin Source File\r
 \r
 SOURCE=.\Python\getargs.c\r
-\r
-!IF  "$(CFG)" == "python15 - Win32 Release"\r
-\r
-DEP_CPP_GETAR=\\r
-       ".\Include\abstract.h"\\r
-       ".\Include\bltinmodule.h"\\r
-       ".\Include\ceval.h"\\r
-       ".\Include\classobject.h"\\r
-       ".\Include\cobject.h"\\r
-       ".\Include\complexobject.h"\\r
-       ".\Include\fileobject.h"\\r
-       ".\Include\floatobject.h"\\r
-       ".\Include\funcobject.h"\\r
-       ".\Include\import.h"\\r
-       ".\Include\intobject.h"\\r
-       ".\Include\intrcheck.h"\\r
-       ".\Include\listobject.h"\\r
-       ".\Include\longobject.h"\\r
-       ".\Include\mappingobject.h"\\r
-       ".\Include\methodobject.h"\\r
-       ".\Include\modsupport.h"\\r
-       ".\Include\moduleobject.h"\\r
-       ".\Include\mymalloc.h"\\r
-       ".\Include\myproto.h"\\r
-       ".\Include\object.h"\\r
-       ".\Include\objimpl.h"\\r
-       ".\Include\pydebug.h"\\r
-       ".\Include\pyerrors.h"\\r
-       ".\Include\pyfpe.h"\\r
-       ".\Include\pystate.h"\\r
-       ".\Include\Python.h"\\r
-       ".\Include\pythonrun.h"\\r
-       ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
-       ".\Include\sliceobject.h"\\r
-       ".\Include\stringobject.h"\\r
-       ".\Include\sysmodule.h"\\r
-       ".\Include\traceback.h"\\r
-       ".\Include\tupleobject.h"\\r
-       ".\PC\config.h"\\r
-       \r
-\r
-"$(INTDIR)\getargs.obj" : $(SOURCE) $(DEP_CPP_GETAR) "$(INTDIR)"\r
-   $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
-\r
 DEP_CPP_GETAR=\\r
        ".\Include\abstract.h"\\r
        ".\Include\bltinmodule.h"\\r
@@ -1318,7 +1258,6 @@ DEP_CPP_GETAR=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -1331,8 +1270,6 @@ DEP_CPP_GETAR=\
    $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-!ENDIF \r
-\r
 # End Source File\r
 ################################################################################\r
 # Begin Source File\r
@@ -1369,7 +1306,6 @@ DEP_CPP_FUNCO=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\structmember.h"\\r
@@ -1418,7 +1354,6 @@ DEP_CPP_FROZE=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -1469,7 +1404,6 @@ DEP_CPP_FRAME=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\structmember.h"\\r
@@ -1519,7 +1453,6 @@ DEP_CPP_FLOAT=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -1567,7 +1500,6 @@ DEP_CPP_FILEO=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\structmember.h"\\r
@@ -1616,7 +1548,6 @@ DEP_CPP_ERROR=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -1664,7 +1595,6 @@ DEP_CPP_CONFI=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -1713,7 +1643,6 @@ DEP_CPP_COMPL=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -1765,7 +1694,6 @@ DEP_CPP_COMPI=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\structmember.h"\\r
@@ -1815,7 +1743,6 @@ DEP_CPP_COBJE=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -1864,7 +1791,6 @@ DEP_CPP_CMATH=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -1912,7 +1838,6 @@ DEP_CPP_CLASS=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\structmember.h"\\r
@@ -1944,7 +1869,6 @@ DEP_CPP_CEVAL=\
        ".\Include\floatobject.h"\\r
        ".\Include\frameobject.h"\\r
        ".\Include\funcobject.h"\\r
-       ".\Include\graminit.h"\\r
        ".\Include\import.h"\\r
        ".\Include\intobject.h"\\r
        ".\Include\intrcheck.h"\\r
@@ -1966,7 +1890,6 @@ DEP_CPP_CEVAL=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -1997,7 +1920,6 @@ DEP_CPP_BLTIN=\
        ".\Include\fileobject.h"\\r
        ".\Include\floatobject.h"\\r
        ".\Include\funcobject.h"\\r
-       ".\Include\graminit.h"\\r
        ".\Include\import.h"\\r
        ".\Include\intobject.h"\\r
        ".\Include\intrcheck.h"\\r
@@ -2020,7 +1942,6 @@ DEP_CPP_BLTIN=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2068,7 +1989,6 @@ DEP_CPP_BINAS=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2117,7 +2037,6 @@ DEP_CPP_AUDIO=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2165,7 +2084,6 @@ DEP_CPP_ARRAY=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2192,7 +2110,6 @@ DEP_CPP_ACCEL=\
        ".\Include\node.h"\\r
        ".\Include\pgenheaders.h"\\r
        ".\Include\pydebug.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\token.h"\\r
        ".\Parser\parser.h"\\r
        ".\PC\config.h"\\r
@@ -2237,7 +2154,6 @@ DEP_CPP_ABSTR=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2298,7 +2214,6 @@ DEP_CPP_TYPEO=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2346,7 +2261,6 @@ DEP_CPP_TUPLE=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2397,7 +2311,6 @@ DEP_CPP_TRACE=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\structmember.h"\\r
@@ -2422,7 +2335,6 @@ DEP_CPP_TOKEN=\
        ".\Include\myproto.h"\\r
        ".\Include\pgenheaders.h"\\r
        ".\Include\pydebug.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\token.h"\\r
        ".\Parser\tokenizer.h"\\r
        ".\PC\config.h"\\r
@@ -2470,7 +2382,6 @@ DEP_CPP_TIMEM=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2542,7 +2453,6 @@ DEP_CPP_STRUC=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2590,7 +2500,6 @@ DEP_CPP_STRUCT=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\structmember.h"\\r
@@ -2639,7 +2548,6 @@ DEP_CPP_STROP=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2687,7 +2595,6 @@ DEP_CPP_STRIN=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2735,7 +2642,6 @@ DEP_CPP_SOUND=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2783,7 +2689,6 @@ DEP_CPP_SIGNA=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2833,7 +2738,6 @@ DEP_CPP_ROTOR=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2881,7 +2785,6 @@ DEP_CPP_RGBIM=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2901,7 +2804,6 @@ DEP_CPP_RGBIM=\
 SOURCE=.\Modules\regexpr.c\r
 DEP_CPP_REGEX=\\r
        ".\Include\myproto.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Modules\regexpr.h"\\r
        ".\PC\config.h"\\r
        \r
@@ -2950,7 +2852,6 @@ DEP_CPP_REGEXM=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -2999,7 +2900,6 @@ DEP_CPP_RANGE=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3031,7 +2931,6 @@ DEP_CPP_PYTHO=\
        ".\Include\fileobject.h"\\r
        ".\Include\floatobject.h"\\r
        ".\Include\funcobject.h"\\r
-       ".\Include\graminit.h"\\r
        ".\Include\grammar.h"\\r
        ".\Include\import.h"\\r
        ".\Include\intobject.h"\\r
@@ -3056,7 +2955,6 @@ DEP_CPP_PYTHO=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3085,7 +2983,6 @@ DEP_CPP_PARSE=\
        ".\Include\parsetok.h"\\r
        ".\Include\pgenheaders.h"\\r
        ".\Include\pydebug.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\token.h"\\r
        ".\Parser\parser.h"\\r
        ".\Parser\tokenizer.h"\\r
@@ -3110,7 +3007,6 @@ DEP_CPP_PARSER=\
        ".\Include\node.h"\\r
        ".\Include\pgenheaders.h"\\r
        ".\Include\pydebug.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\token.h"\\r
        ".\Parser\parser.h"\\r
        ".\PC\config.h"\\r
@@ -3155,7 +3051,6 @@ DEP_CPP_OBJEC=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3179,7 +3074,6 @@ DEP_CPP_NODE_=\
        ".\Include\node.h"\\r
        ".\Include\pgenheaders.h"\\r
        ".\Include\pydebug.h"\\r
-       ".\Include\rename2.h"\\r
        ".\PC\config.h"\\r
        \r
 \r
@@ -3223,7 +3117,6 @@ DEP_CPP_NEWMO=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3274,7 +3167,6 @@ DEP_CPP_MARSH=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3293,7 +3185,6 @@ DEP_CPP_MARSH=\
 \r
 SOURCE=.\Python\mystrtoul.c\r
 DEP_CPP_MYSTR=\\r
-       ".\Include\rename2.h"\\r
        ".\PC\config.h"\\r
        \r
 \r
@@ -3310,7 +3201,6 @@ DEP_CPP_MYREA=\
        ".\Include\intrcheck.h"\\r
        ".\Include\mymalloc.h"\\r
        ".\Include\myproto.h"\\r
-       ".\Include\rename2.h"\\r
        ".\PC\config.h"\\r
        \r
 \r
@@ -3353,7 +3243,6 @@ DEP_CPP_MODUL=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3401,7 +3290,6 @@ DEP_CPP_MODSU=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3449,7 +3337,6 @@ DEP_CPP_METHO=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3498,7 +3385,6 @@ DEP_CPP_MD5MO=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3562,7 +3448,6 @@ DEP_CPP_MATHM=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3610,7 +3495,6 @@ DEP_CPP_MAPPI=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3659,7 +3543,6 @@ DEP_CPP_SOCKE=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3710,7 +3593,6 @@ DEP_CPP_SELEC=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3760,7 +3642,6 @@ DEP_CPP_SYSMO=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3791,7 +3672,6 @@ DEP_CPP_IMPORT=\
        ".\Include\fileobject.h"\\r
        ".\Include\floatobject.h"\\r
        ".\Include\funcobject.h"\\r
-       ".\Include\graminit.h"\\r
        ".\Include\import.h"\\r
        ".\Include\intobject.h"\\r
        ".\Include\intrcheck.h"\\r
@@ -3815,7 +3695,6 @@ DEP_CPP_IMPORT=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3869,7 +3748,6 @@ DEP_CPP_POSIX=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3920,7 +3798,6 @@ DEP_CPP_OPERA=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -3968,7 +3845,6 @@ DEP_CPP_ERRNO=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -4016,7 +3892,6 @@ DEP_CPP_SLICE=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -4034,9 +3909,6 @@ DEP_CPP_SLICE=\
 # Begin Source File\r
 \r
 SOURCE=.\Modules\main.c\r
-\r
-!IF  "$(CFG)" == "python15 - Win32 Release"\r
-\r
 DEP_CPP_MAIN_=\\r
        ".\Include\abstract.h"\\r
        ".\Include\bltinmodule.h"\\r
@@ -4067,7 +3939,6 @@ DEP_CPP_MAIN_=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -4080,53 +3951,6 @@ DEP_CPP_MAIN_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
-\r
-DEP_CPP_MAIN_=\\r
-       ".\Include\abstract.h"\\r
-       ".\Include\bltinmodule.h"\\r
-       ".\Include\ceval.h"\\r
-       ".\Include\classobject.h"\\r
-       ".\Include\cobject.h"\\r
-       ".\Include\complexobject.h"\\r
-       ".\Include\fileobject.h"\\r
-       ".\Include\floatobject.h"\\r
-       ".\Include\funcobject.h"\\r
-       ".\Include\import.h"\\r
-       ".\Include\intobject.h"\\r
-       ".\Include\intrcheck.h"\\r
-       ".\Include\listobject.h"\\r
-       ".\Include\longobject.h"\\r
-       ".\Include\mappingobject.h"\\r
-       ".\Include\methodobject.h"\\r
-       ".\Include\modsupport.h"\\r
-       ".\Include\moduleobject.h"\\r
-       ".\Include\mymalloc.h"\\r
-       ".\Include\myproto.h"\\r
-       ".\Include\object.h"\\r
-       ".\Include\objimpl.h"\\r
-       ".\Include\pydebug.h"\\r
-       ".\Include\pyerrors.h"\\r
-       ".\Include\pyfpe.h"\\r
-       ".\Include\pystate.h"\\r
-       ".\Include\Python.h"\\r
-       ".\Include\pythonrun.h"\\r
-       ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
-       ".\Include\sliceobject.h"\\r
-       ".\Include\stringobject.h"\\r
-       ".\Include\sysmodule.h"\\r
-       ".\Include\traceback.h"\\r
-       ".\Include\tupleobject.h"\\r
-       ".\PC\config.h"\\r
-       \r
-\r
-"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"\r
-   $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 ################################################################################\r
 # Begin Source File\r
@@ -4173,7 +3997,6 @@ DEP_CPP_IMPORT_=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -4192,9 +4015,6 @@ DEP_CPP_IMPORT_=\
 # Begin Source File\r
 \r
 SOURCE=.\PC\getpath_nt.c\r
-\r
-!IF  "$(CFG)" == "python15 - Win32 Release"\r
-\r
 DEP_CPP_GETPA=\\r
        ".\Include\abstract.h"\\r
        ".\Include\bltinmodule.h"\\r
@@ -4226,7 +4046,6 @@ DEP_CPP_GETPA=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -4239,54 +4058,6 @@ DEP_CPP_GETPA=\
    $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
-\r
-DEP_CPP_GETPA=\\r
-       ".\Include\abstract.h"\\r
-       ".\Include\bltinmodule.h"\\r
-       ".\Include\ceval.h"\\r
-       ".\Include\classobject.h"\\r
-       ".\Include\cobject.h"\\r
-       ".\Include\complexobject.h"\\r
-       ".\Include\fileobject.h"\\r
-       ".\Include\floatobject.h"\\r
-       ".\Include\funcobject.h"\\r
-       ".\Include\import.h"\\r
-       ".\Include\intobject.h"\\r
-       ".\Include\intrcheck.h"\\r
-       ".\Include\listobject.h"\\r
-       ".\Include\longobject.h"\\r
-       ".\Include\mappingobject.h"\\r
-       ".\Include\methodobject.h"\\r
-       ".\Include\modsupport.h"\\r
-       ".\Include\moduleobject.h"\\r
-       ".\Include\mymalloc.h"\\r
-       ".\Include\myproto.h"\\r
-       ".\Include\object.h"\\r
-       ".\Include\objimpl.h"\\r
-       ".\Include\osdefs.h"\\r
-       ".\Include\pydebug.h"\\r
-       ".\Include\pyerrors.h"\\r
-       ".\Include\pyfpe.h"\\r
-       ".\Include\pystate.h"\\r
-       ".\Include\Python.h"\\r
-       ".\Include\pythonrun.h"\\r
-       ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
-       ".\Include\sliceobject.h"\\r
-       ".\Include\stringobject.h"\\r
-       ".\Include\sysmodule.h"\\r
-       ".\Include\traceback.h"\\r
-       ".\Include\tupleobject.h"\\r
-       ".\PC\config.h"\\r
-       \r
-\r
-"$(INTDIR)\getpath_nt.obj" : $(SOURCE) $(DEP_CPP_GETPA) "$(INTDIR)"\r
-   $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 ################################################################################\r
 # Begin Source File\r
@@ -4322,7 +4093,6 @@ DEP_CPP_DL_NT=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -4382,7 +4152,6 @@ DEP_CPP_THREAD=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -4468,7 +4237,6 @@ DEP_CPP_PYSTA=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -4493,6 +4261,7 @@ DEP_CPP_CSTRI=\
        ".\Include\classobject.h"\\r
        ".\Include\cobject.h"\\r
        ".\Include\complexobject.h"\\r
+       ".\Include\cStringIO.h"\\r
        ".\Include\fileobject.h"\\r
        ".\Include\floatobject.h"\\r
        ".\Include\funcobject.h"\\r
@@ -4516,7 +4285,6 @@ DEP_CPP_CSTRI=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -4524,10 +4292,6 @@ DEP_CPP_CSTRI=\
        ".\Include\tupleobject.h"\\r
        ".\PC\config.h"\\r
        \r
-NODEP_CPP_CSTRI=\\r
-       ".\Modules\cStringIO.h"\\r
-       ".\Modules\import.h"\\r
-       \r
 \r
 "$(INTDIR)\cStringIO.obj" : $(SOURCE) $(DEP_CPP_CSTRI) "$(INTDIR)"\r
    $(CPP) $(CPP_PROJ) $(SOURCE)\r
@@ -4545,10 +4309,10 @@ DEP_CPP_CPICK=\
        ".\Include\classobject.h"\\r
        ".\Include\cobject.h"\\r
        ".\Include\complexobject.h"\\r
+       ".\Include\cStringIO.h"\\r
        ".\Include\fileobject.h"\\r
        ".\Include\floatobject.h"\\r
        ".\Include\funcobject.h"\\r
-       ".\Include\graminit.h"\\r
        ".\Include\import.h"\\r
        ".\Include\intobject.h"\\r
        ".\Include\intrcheck.h"\\r
@@ -4570,7 +4334,6 @@ DEP_CPP_CPICK=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
@@ -4578,9 +4341,6 @@ DEP_CPP_CPICK=\
        ".\Include\tupleobject.h"\\r
        ".\PC\config.h"\\r
        \r
-NODEP_CPP_CPICK=\\r
-       ".\Modules\cStringIO.h"\\r
-       \r
 \r
 "$(INTDIR)\cPickle.obj" : $(SOURCE) $(DEP_CPP_CPICK) "$(INTDIR)"\r
    $(CPP) $(CPP_PROJ) $(SOURCE)\r
@@ -4616,6 +4376,9 @@ SOURCE=.\vc40\python15.lib
 # Begin Source File\r
 \r
 SOURCE=.\Modules\_tkinter.c\r
+\r
+!IF  "$(CFG)" == "_tkinter - Win32 Release"\r
+\r
 DEP_CPP__TKIN=\\r
        ".\Include\abstract.h"\\r
        ".\Include\bltinmodule.h"\\r
@@ -4646,44 +4409,45 @@ DEP_CPP__TKIN=\
        ".\Include\Python.h"\\r
        ".\Include\pythonrun.h"\\r
        ".\Include\rangeobject.h"\\r
-       ".\Include\rename2.h"\\r
        ".\Include\sliceobject.h"\\r
        ".\Include\stringobject.h"\\r
        ".\Include\sysmodule.h"\\r
        ".\Include\traceback.h"\\r
        ".\Include\tupleobject.h"\\r
        ".\PC\config.h"\\r
-       "C:\tcl\include\tcl.h"\\r
-       "C:\tcl\include\tk.h"\\r
-       "C:\tcl\include\X11\X.h"\\r
-       "C:\tcl\include\X11\Xfuncproto.h"\\r
-       "C:\tcl\include\X11\Xlib.h"\\r
+       "C:\TCL80A2\include\tcl.h"\\r
+       "C:\TCL80A2\include\tk.h"\\r
+       "C:\TCL80A2\include\X11\X.h"\\r
+       "C:\TCL80A2\include\X11\Xfuncproto.h"\\r
+       "C:\TCL80A2\include\X11\Xlib.h"\\r
        \r
 \r
 "$(INTDIR)\_tkinter.obj" : $(SOURCE) $(DEP_CPP__TKIN) "$(INTDIR)"\r
    $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
+!ENDIF \r
+\r
 # End Source File\r
 ################################################################################\r
 # Begin Source File\r
 \r
-SOURCE=.\PC\tk41.lib\r
+SOURCE=.\PC\_tkinter.def\r
 # End Source File\r
 ################################################################################\r
 # Begin Source File\r
 \r
-SOURCE=.\PC\tcl75.lib\r
+SOURCE=.\vc40\python15.lib\r
 # End Source File\r
 ################################################################################\r
 # Begin Source File\r
 \r
-SOURCE=.\PC\_tkinter.def\r
+SOURCE=.\PC\tk80.lib\r
 # End Source File\r
 ################################################################################\r
 # Begin Source File\r
 \r
-SOURCE=.\vc40\python15.lib\r
+SOURCE=.\PC\tcl80.lib\r
 # End Source File\r
 # End Target\r
 # End Project\r