Probably the last VC++ 4.2 makefile I'll check in.

After this I will be using 5.0, which has binary workspace files...

diff --git a/PC/vc40.mak b/PC/vc40.mak
index 8d070392703d8f86b421b1f1181fb57169a09f2c..a56e3d7f347582c5089dd751d17f15f866bc82ee 100644 (file)
--- a/PC/vc40.mak
+++ b/PC/vc40.mak
@@ -87,7 +87,7 @@ CLEAN :
        -@erase "$(INTDIR)\getcopyright.obj"\r
        -@erase "$(INTDIR)\getmtime.obj"\r
        -@erase "$(INTDIR)\getopt.obj"\r
-       -@erase "$(INTDIR)\getpath_nt.obj"\r
+       -@erase "$(INTDIR)\getpathp.obj"\r
        -@erase "$(INTDIR)\getplatform.obj"\r
        -@erase "$(INTDIR)\getversion.obj"\r
        -@erase "$(INTDIR)\graminit.obj"\r
@@ -236,7 +236,7 @@ LINK32_OBJS= \
        "$(INTDIR)\getcopyright.obj" \\r
        "$(INTDIR)\getmtime.obj" \\r
        "$(INTDIR)\getopt.obj" \\r
-       "$(INTDIR)\getpath_nt.obj" \\r
+       "$(INTDIR)\getpathp.obj" \\r
        "$(INTDIR)\getplatform.obj" \\r
        "$(INTDIR)\getversion.obj" \\r
        "$(INTDIR)\graminit.obj" \\r
@@ -407,10 +407,10 @@ 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
- /Fp"$(INTDIR)/_tkinter.pch" /YX /Fo"$(INTDIR)/" /c \r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "PC" /I "Include" /I "C:\Program Files\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\\r
+ "C:\Program Files\TCL\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\\r
+ "HAVE_CONFIG_H" /Fp"$(INTDIR)/_tkinter.pch" /YX /Fo"$(INTDIR)/" /c \r
 CPP_OBJS=.\vc40\tmp/\r
 CPP_SBRS=.\.\r
 \r
@@ -458,8 +458,8 @@ DEF_FILE= \
 LINK32_OBJS= \\r
        "$(INTDIR)\_tkinter.obj" \\r
        "$(OUTDIR)\python15.lib" \\r
-       ".\PC\tcl80.lib" \\r
-       ".\PC\tk80.lib"\r
+       "..\..\..\..\Program Files\Tcl\lib\tcl80vc.lib" \\r
+       "..\..\..\..\Program Files\Tcl\lib\tk80vc.lib"\r
 \r
 "$(OUTDIR)\_tkinter.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -514,7 +514,7 @@ CLEAN :
        -@erase "$(INTDIR)\getcopyright.obj"\r
        -@erase "$(INTDIR)\getmtime.obj"\r
        -@erase "$(INTDIR)\getopt.obj"\r
-       -@erase "$(INTDIR)\getpath_nt.obj"\r
+       -@erase "$(INTDIR)\getpathp.obj"\r
        -@erase "$(INTDIR)\getplatform.obj"\r
        -@erase "$(INTDIR)\getversion.obj"\r
        -@erase "$(INTDIR)\graminit.obj"\r
@@ -662,7 +662,7 @@ LINK32_OBJS= \
        "$(INTDIR)\getcopyright.obj" \\r
        "$(INTDIR)\getmtime.obj" \\r
        "$(INTDIR)\getopt.obj" \\r
-       "$(INTDIR)\getpath_nt.obj" \\r
+       "$(INTDIR)\getpathp.obj" \\r
        "$(INTDIR)\getplatform.obj" \\r
        "$(INTDIR)\getversion.obj" \\r
        "$(INTDIR)\graminit.obj" \\r
@@ -1269,9 +1269,6 @@ DEP_CPP_GETAR=\
 # Begin Source File\r
 \r
 SOURCE=.\Objects\funcobject.c\r
-\r
-!IF  "$(CFG)" == "python15 - Win32 Release"\r
-\r
 DEP_CPP_FUNCO=\\r
        ".\Include\abstract.h"\\r
        ".\Include\ceval.h"\\r
@@ -1315,53 +1312,6 @@ DEP_CPP_FUNCO=\
    $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
-\r
-DEP_CPP_FUNCO=\\r
-       ".\Include\abstract.h"\\r
-       ".\Include\ceval.h"\\r
-       ".\Include\classobject.h"\\r
-       ".\Include\cobject.h"\\r
-       ".\Include\compile.h"\\r
-       ".\Include\complexobject.h"\\r
-       ".\Include\dictobject.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\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\sliceobject.h"\\r
-       ".\Include\stringobject.h"\\r
-       ".\Include\structmember.h"\\r
-       ".\Include\sysmodule.h"\\r
-       ".\Include\traceback.h"\\r
-       ".\Include\tupleobject.h"\\r
-       ".\PC\config.h"\\r
-       \r
-\r
-"$(INTDIR)\funcobject.obj" : $(SOURCE) $(DEP_CPP_FUNCO) "$(INTDIR)"\r
-   $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 ################################################################################\r
 # Begin Source File\r
@@ -1510,55 +1460,6 @@ DEP_CPP_FLOAT=\
 # Begin Source File\r
 \r
 SOURCE=.\Objects\fileobject.c\r
-\r
-!IF  "$(CFG)" == "python15 - Win32 Release"\r
-\r
-DEP_CPP_FILEO=\\r
-       ".\Include\abstract.h"\\r
-       ".\Include\ceval.h"\\r
-       ".\Include\classobject.h"\\r
-       ".\Include\cobject.h"\\r
-       ".\Include\complexobject.h"\\r
-       ".\Include\dictobject.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\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\sliceobject.h"\\r
-       ".\Include\stringobject.h"\\r
-       ".\Include\structmember.h"\\r
-       ".\Include\sysmodule.h"\\r
-       ".\Include\traceback.h"\\r
-       ".\Include\tupleobject.h"\\r
-       ".\PC\config.h"\\r
-       {$(INCLUDE)}"\sys\STAT.H"\\r
-       {$(INCLUDE)}"\sys\TYPES.H"\\r
-       \r
-\r
-"$(INTDIR)\fileobject.obj" : $(SOURCE) $(DEP_CPP_FILEO) "$(INTDIR)"\r
-   $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
-\r
 DEP_CPP_FILEO=\\r
        ".\Include\abstract.h"\\r
        ".\Include\ceval.h"\\r
@@ -1603,8 +1504,6 @@ DEP_CPP_FILEO=\
    $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-!ENDIF \r
-\r
 # End Source File\r
 ################################################################################\r
 # Begin Source File\r
@@ -1894,9 +1793,6 @@ DEP_CPP_CMATH=\
 # Begin Source File\r
 \r
 SOURCE=.\Objects\classobject.c\r
-\r
-!IF  "$(CFG)" == "python15 - Win32 Release"\r
-\r
 DEP_CPP_CLASS=\\r
        ".\Include\abstract.h"\\r
        ".\Include\ceval.h"\\r
@@ -1939,52 +1835,6 @@ DEP_CPP_CLASS=\
    $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"\r
-\r
-DEP_CPP_CLASS=\\r
-       ".\Include\abstract.h"\\r
-       ".\Include\ceval.h"\\r
-       ".\Include\classobject.h"\\r
-       ".\Include\cobject.h"\\r
-       ".\Include\complexobject.h"\\r
-       ".\Include\dictobject.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\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\sliceobject.h"\\r
-       ".\Include\stringobject.h"\\r
-       ".\Include\structmember.h"\\r
-       ".\Include\sysmodule.h"\\r
-       ".\Include\traceback.h"\\r
-       ".\Include\tupleobject.h"\\r
-       ".\PC\config.h"\\r
-       \r
-\r
-"$(INTDIR)\classobject.obj" : $(SOURCE) $(DEP_CPP_CLASS) "$(INTDIR)"\r
-   $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 ################################################################################\r
 # Begin Source File\r
@@ -2529,7 +2379,6 @@ DEP_CPP_THREA=\
        ".\Include\thread.h"\\r
        ".\PC\config.h"\\r
        ".\Python\thread_cthread.h"\\r
-       ".\Python\thread_foobar.h"\\r
        ".\Python\thread_lwp.h"\\r
        ".\Python\thread_nt.h"\\r
        ".\Python\thread_pthread.h"\\r
@@ -2537,9 +2386,6 @@ DEP_CPP_THREA=\
        ".\Python\thread_solaris.h"\\r
        {$(INCLUDE)}"\sys\TYPES.H"\\r
        \r
-NODEP_CPP_THREA=\\r
-       "\usr\include\thread.h"\\r
-       \r
 \r
 "$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"\r
    $(CPP) $(CPP_PROJ) $(SOURCE)\r
@@ -4059,53 +3905,6 @@ DEP_CPP_IMPORT_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-# End Source File\r
-################################################################################\r
-# Begin Source File\r
-\r
-SOURCE=.\PC\getpath_nt.c\r
-DEP_CPP_GETPA=\\r
-       ".\Include\abstract.h"\\r
-       ".\Include\ceval.h"\\r
-       ".\Include\classobject.h"\\r
-       ".\Include\cobject.h"\\r
-       ".\Include\complexobject.h"\\r
-       ".\Include\dictobject.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\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\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
 # End Source File\r
 ################################################################################\r
 # Begin Source File\r
@@ -4360,6 +4159,7 @@ DEP_CPP_CPICK=\
        ".\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
@@ -4485,36 +4285,11 @@ DEP_CPP_MSVCR=\
 \r
 \r
 # End Source File\r
-# End Target\r
-################################################################################\r
-# Begin Target\r
-\r
-# Name "python - Win32 Release"\r
 ################################################################################\r
 # Begin Source File\r
 \r
-SOURCE=.\vc40\python15.lib\r
-# End Source File\r
-################################################################################\r
-# Begin Source File\r
-\r
-SOURCE=.\Modules\python.c\r
-\r
-"$(INTDIR)\python.obj" : $(SOURCE) "$(INTDIR)"\r
-   $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
-\r
-# End Source File\r
-# End Target\r
-################################################################################\r
-# Begin Target\r
-\r
-# Name "_tkinter - Win32 Release"\r
-################################################################################\r
-# Begin Source File\r
-\r
-SOURCE=.\Modules\_tkinter.c\r
-DEP_CPP__TKIN=\\r
+SOURCE=.\PC\getpathp.c\r
+DEP_CPP_GETPA=\\r
        ".\Include\abstract.h"\\r
        ".\Include\ceval.h"\\r
        ".\Include\classobject.h"\\r
@@ -4534,10 +4309,9 @@ DEP_CPP__TKIN=\
        ".\Include\moduleobject.h"\\r
        ".\Include\mymalloc.h"\\r
        ".\Include\myproto.h"\\r
-       ".\Include\myselect.h"\\r
-       ".\Include\mytime.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
@@ -4551,11 +4325,54 @@ DEP_CPP__TKIN=\
        ".\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
+       {$(INCLUDE)}"\sys\STAT.H"\\r
+       {$(INCLUDE)}"\sys\TYPES.H"\\r
+       \r
+\r
+"$(INTDIR)\getpathp.obj" : $(SOURCE) $(DEP_CPP_GETPA) "$(INTDIR)"\r
+   $(CPP) $(CPP_PROJ) $(SOURCE)\r
+\r
+\r
+# End Source File\r
+# End Target\r
+################################################################################\r
+# Begin Target\r
+\r
+# Name "python - Win32 Release"\r
+################################################################################\r
+# Begin Source File\r
+\r
+SOURCE=.\vc40\python15.lib\r
+# End Source File\r
+################################################################################\r
+# Begin Source File\r
+\r
+SOURCE=.\Modules\python.c\r
+\r
+"$(INTDIR)\python.obj" : $(SOURCE) "$(INTDIR)"\r
+   $(CPP) $(CPP_PROJ) $(SOURCE)\r
+\r
+\r
+# End Source File\r
+# End Target\r
+################################################################################\r
+# Begin Target\r
+\r
+# Name "_tkinter - Win32 Release"\r
+################################################################################\r
+# Begin Source File\r
+\r
+SOURCE=.\Modules\_tkinter.c\r
+DEP_CPP__TKIN=\\r
+       "\Program Files\TCL\include\tcl.h"\\r
+       "\Program Files\TCL\include\tk.h"\\r
+       "\Program Files\TCL\include\X11\X.h"\\r
+       "\Program Files\TCL\include\X11\Xfuncproto.h"\\r
+       "\Program Files\TCL\include\X11\Xlib.h"\\r
+       \r
+NODEP_CPP__TKIN=\\r
+       ".\Modules\myselect.h"\\r
+       ".\Modules\Python.h"\\r
        \r
 \r
 "$(INTDIR)\_tkinter.obj" : $(SOURCE) $(DEP_CPP__TKIN) "$(INTDIR)"\r
@@ -4576,12 +4393,12 @@ SOURCE=.\vc40\python15.lib
 ################################################################################\r
 # Begin Source File\r
 \r
-SOURCE=.\PC\tk80.lib\r
+SOURCE="\Program Files\Tcl\lib\tk80vc.lib"\r
 # End Source File\r
 ################################################################################\r
 # Begin Source File\r
 \r
-SOURCE=.\PC\tcl80.lib\r
+SOURCE="\Program Files\Tcl\lib\tcl80vc.lib"\r
 # End Source File\r
 # End Target\r
 # End Project\r