up patchlevel to 5.005_02

[p5sagit/p5-mst-13.2.git] / win32 / makefile.mk

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 8e4b0a5..4089aac 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -29,7 +29,7 @@ INST_TOP      *= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER       *= \5.00475
+INST_VER       *= \5.00502
 
 #
 # uncomment to enable threads-capabilities
@@ -57,9 +57,10 @@ CCTYPE               *= BORLAND
 #CFG           *= Debug
 
 #
-# uncomment to enable use of PerlCRT.DLL.  Highly recommended.  It has
-# patches that fix known bugs in MSCVRT.DLL.  You will need to download it
-# from: <TBD> and follow the directions in the package to install.
+# uncomment to enable use of PerlCRT.DLL when using the Visual C compiler.
+# Highly recommended.  It has patches that fix known bugs in MSVCRT.DLL.
+# You will need to download it from: http://www.activestate.com/
+# and follow the directions in the package to install.
 #
 #USE_PERLCRT   *= define
 
@@ -75,7 +76,7 @@ CCTYPE                *= BORLAND
 #
 # if you have the source for des_fcrypt(), uncomment this and make sure the
 # file exists (see README.win32).  File should be located in the same
-# directory as this file.  Not (yet) supported with PERL_OBJECT.
+# directory as this file.
 #
 #CRYPT_SRC     *= des_fcrypt.c
 
@@ -225,8 +226,8 @@ SUBSYS              = console
 CXX_FLAG       = -xc++
 
 LIBC           = -lcrtdll
-LIBFILES       = $(CRYPT_LIB) -ladvapi32 -luser32 -lnetapi32 -lwsock32 -lmingw32 \
-               -lgcc -lmoldname $(LIBC) -lkernel32
+LIBFILES       = $(CRYPT_LIB) -ladvapi32 -luser32 -lnetapi32 -lwsock32 \
+               -lmingw32 -lgcc -lmoldname $(LIBC) -lkernel32
 
 .IF  "$(CFG)" == "Debug"
 OPTIMIZE       = -g -O2 $(RUNTIME) -DDEBUGGING
@@ -408,7 +409,11 @@ CFGH_TMPL  = config_H.bc
 
 CFGSH_TMPL     = config.gc
 CFGH_TMPL      = config_H.gc
-PERLIMPLIB     *= ..\libperl$(a)
+.IF "$(OBJECT)" == "-DPERL_OBJECT"
+PERLIMPLIB     = ..\libperlcore$(a)
+.ELSE
+PERLIMPLIB     = ..\libperl$(a)
+.ENDIF
 
 .ELSE
 
@@ -423,7 +428,7 @@ PERL95EXE   = ..\perl95.exe
 .IF "$(OBJECT)" == "-DPERL_OBJECT"
 PERLIMPLIB     *= ..\perlcore$(a)
 PERLDLL                = ..\perlcore.dll
-CAPILIB                = $(COREDIR)\PerlCAPI$(a)
+CAPILIB                = $(COREDIR)\perlCAPI$(a)
 .ELSE
 PERLIMPLIB     *= ..\perl$(a)
 PERLDLL                = ..\perl.dll
@@ -887,24 +892,24 @@ $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM)
 
 .IF "$(OBJECT)" == "-DPERL_OBJECT"
 
-PerlCAPI.cpp : $(MINIPERL)
+perlCAPI.cpp : $(MINIPERL)
        $(MINIPERL) GenCAPI.pl $(COREDIR)
 
-PerlCAPI$(o) : PerlCAPI.cpp
+perlCAPI$(o) : perlCAPI.cpp
 .IF "$(CCTYPE)" == "BORLAND"
-       $(CC) $(CFLAGS_O) -c $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp
+       $(CC) $(CFLAGS_O) -c $(OBJOUT_FLAG)perlCAPI$(o) perlCAPI.cpp
 .ELIF "$(CCTYPE)" == "GCC"
-       $(CC) $(CFLAGS_O) -c $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp
+       $(CC) $(CFLAGS_O) -c $(OBJOUT_FLAG)perlCAPI$(o) perlCAPI.cpp
 .ELSE
        $(CC) $(CFLAGS_O) $(RUNTIME) -UPERLDLL -c \
-           $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp
+           $(OBJOUT_FLAG)perlCAPI$(o) perlCAPI.cpp
 .ENDIF
 
-$(CAPILIB) : PerlCAPI.cpp PerlCAPI$(o)
+$(CAPILIB) : perlCAPI.cpp perlCAPI$(o)
 .IF "$(CCTYPE)" == "BORLAND"
-       $(LIB32) $(LIBOUT_FLAG)$(CAPILIB) +PerlCAPI$(o)
+       $(LIB32) $(LIBOUT_FLAG)$(CAPILIB) +perlCAPI$(o)
 .ELSE
-       $(LIB32) $(LIBOUT_FLAG)$(CAPILIB) PerlCAPI$(o)
+       $(LIB32) $(LIBOUT_FLAG)$(CAPILIB) perlCAPI$(o)
 .ENDIF
 
 .ENDIF
@@ -973,13 +978,13 @@ $(ERRNO_PM): $(PERLEXE) $(ERRNO)_pm.PL
        cd $(EXTDIR)\$(*B) && $(MAKE)
 
 doc: $(PERLEXE)
-       copy ..\README.win32 ..\pod\perlwin32.pod
        $(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=./html \
            --podpath=pod:lib:ext:utils --htmlroot="file://$(INST_HTML:s,:,|,)"\
            --libpod=perlfunc:perlguts:perlvar:perlrun:perlop --recurse
 
 utils: $(PERLEXE) $(X2P)
        cd ..\utils && $(MAKE) PERL=$(MINIPERL)
+       copy ..\README.win32 ..\pod\perlwin32.pod
        cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters
        $(PERLEXE) $(PL2BAT) $(UTILS)
 
@@ -1066,7 +1071,7 @@ clean :
        -@erase $(MINIPERL)
        -@erase perlglob$(o)
        -@erase perlmain$(o)
-       -@erase PerlCAPI.cpp
+       -@erase perlCAPI.cpp
        -@erase config.w32
        -@erase /f config.h
        -@erase $(GLOBEXE)