X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fmakefile.mk;h=4465ba82ed29939865c0c83e8be3aee85b8d1c9d;hb=4cb44f92593924ac2c8653db054f4aaaae1d262c;hp=b266978e7f7eb9dc1a6890a5d15fb5fe09df1066;hpb=a9bf183d39b7b7cea39e881e1ccf69b36bf2f899;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/makefile.mk b/win32/makefile.mk
index b266978..4465ba8 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1,12 +1,13 @@
 #
 # Makefile to build perl on Windows NT using DMAKE.
 # Supported compilers:
-#	Visual C++ 2.0 thro 6.0
+#	Visual C++ 2.0 through 6.0 (and possibly newer versions)
 #	Borland C++ 5.02
 #	Mingw32 with gcc-2.95.2 or better  **experimental**
+#	MS Platform SDK 64-bit compiler and tools **experimental**
 #
 # This is set up to build a perl.exe that runs off a shared library
-# (perl57.dll).  Also makes individual DLLs for the XS extensions.
+# (perl59.dll).  Also makes individual DLLs for the XS extensions.
 #
 
 ##
@@ -33,7 +34,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.7.2
+INST_VER	*= \5.9.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -48,37 +49,37 @@ INST_ARCH	*= \$(ARCHNAME)
 
 #
 # uncomment to enable multiple interpreters.  This is need for fork()
-# emulation.
+# emulation and for thread support.
 #
 USE_MULTI	*= define
 
 #
-# Beginnings of interpreter cloning/threads; still very incomplete.
-# This should be enabled to get the fork() emulation.  This needs
-# USE_MULTI as well.
+# Interpreter cloning/threads; now reasonably complete.
+# This should be enabled to get the fork() emulation.  
+# This needs USE_MULTI above.
 #
 USE_ITHREADS	*= define
 
 #
 # uncomment to enable the implicit "host" layer for all system calls
-# made by perl.  This needs USE_MULTI above.  This is also needed to
-# get fork().
+# made by perl.  This needs USE_MULTI above.  
+# This is also needed to get fork().
 #
 USE_IMP_SYS	*= define
 
 #
-# uncomment to enable the experimental PerlIO I/O subsystem.
-USE_PERLIO	= define
+# Comment out next assign to disable perl's I/O subsystem and use compiler's 
+# stdio for IO - depending on your compiler vendor and run time library you may 
+# then get a number of fails from make test i.e. bugs - complain to them not us ;-). 
+# You will also be unable to take full advantage of perl5.8's support for multiple 
+# encodings and may see lower IO performance. You have been warned.
+USE_PERLIO	*= define
 
 #
-# WARNING! This option is deprecated and will eventually go away (enable
-# USE_ITHREADS instead).
-#
-# uncomment to enable threads-capabilities.  This is incompatible with
-# USE_ITHREADS, and is only here for people who may have come to rely
-# on the experimental Thread support that was in 5.005.
-#
-#USE_5005THREADS	*= define
+# Comment this out if you don't want to enable large file support for
+# some reason.  Should normally only be changed to maintain compatibility
+# with an older release of perl.
+USE_LARGE_FILES *= define
 
 #
 # uncomment exactly one of the following
@@ -93,10 +94,13 @@ CCTYPE		*= MSVC60
 #CCTYPE		*= BORLAND
 # mingw32+gcc-2.95.2 or better
 #CCTYPE		*= GCC
+# Uncomment this if you are using the latest MinGW release (2.0.0)
+# with gcc3.2
+#USE_GCC_V3_2	*= define
 
 #
 # uncomment this if your Borland compiler is older than v5.4.
-BCCOLD = define
+#BCCOLD = define
 #
 # uncomment this if you want to use Borland's VCL as your CRT
 #BCCVCL = define
@@ -111,7 +115,7 @@ BCCOLD = define
 # If not enabled, we automatically try to use maximum optimization
 # with all compilers that are known to have a working optimizer.
 #
-CFG		*= Debug
+#CFG		*= Debug
 
 #
 # uncomment to enable use of PerlCRT.DLL when using the Visual C compiler.
@@ -134,11 +138,11 @@ CFG		*= Debug
 #USE_SETARGV	*= define
 
 #
-# 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.
+# if you want to have the crypt() builtin function implemented, leave this or
+# CRYPT_LIB uncommented.  The fcrypt.c file named here contains a suitable
+# version of des_fcrypt().
 #
-#CRYPT_SRC	*= fcrypt.c
+CRYPT_SRC	*= fcrypt.c
 
 #
 # if you didn't set CRYPT_SRC and if you have des_fcrypt() available in a
@@ -163,9 +167,13 @@ CFG		*= Debug
 # so you may have to set CCHOME explicitly (spaces in the path name should
 # not be quoted)
 #
-#CCHOME		*= F:\borland\bc5
+.IF "$(CCTYPE)" == "BORLAND"
+CCHOME		*= C:\borland\bcc55
+.ELIF "$(CCTYPE)" == "GCC"
+CCHOME		*= C:\MinGW
+.ELSE
 CCHOME		*= $(MSVCDIR)
-#CCHOME		*= c:\gcc-2.95.2
+.ENDIF
 CCINCDIR	*= $(CCHOME)\include
 CCLIBDIR	*= $(CCHOME)\lib
 
@@ -227,32 +235,22 @@ CRYPT_FLAG	= -DHAVE_DES_FCRYPT
 
 PERL_MALLOC	*= undef
 
-USE_5005THREADS	*= undef
-
-.IF "$(USE_5005THREADS)" == "define"
-USE_ITHREADS	!= undef
-.ENDIF
-
-.IF "$(USE_IMP_SYS)" == "define"
-PERL_MALLOC	!= undef
-.ENDIF
-
 USE_MULTI	*= undef
 USE_ITHREADS	*= undef
 USE_IMP_SYS	*= undef
 USE_PERLIO	*= undef
+USE_LARGE_FILES	*= undef
 USE_PERLCRT	*= undef
 
-.IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)" == "defineundefundef"
+.IF "$(USE_IMP_SYS)$(USE_MULTI)" == "defineundef"
 USE_MULTI	!= define
 .ENDIF
 
 .IF "$(USE_ITHREADS)$(USE_MULTI)" == "defineundef"
 USE_MULTI	!= define
-USE_5005THREADS	!= undef
 .ENDIF
 
-.IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef"
+.IF "$(USE_MULTI)" != "undef"
 BUILDOPT	+= -DPERL_IMPLICIT_CONTEXT
 .ENDIF
 
@@ -260,13 +258,22 @@ BUILDOPT	+= -DPERL_IMPLICIT_CONTEXT
 BUILDOPT	+= -DPERL_IMPLICIT_SYS
 .ENDIF
 
-.IMPORT .IGNORE : PROCESSOR_ARCHITECTURE
+.IMPORT .IGNORE : PROCESSOR_ARCHITECTURE PROCESSOR_ARCHITEW6432
 
 PROCESSOR_ARCHITECTURE *= x86
 
-.IF "$(USE_5005THREADS)" == "define"
-ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
-.ELIF "$(USE_MULTI)" == "define"
+.IF "$(WIN64)" == ""
+.IF "$(PROCESSOR_ARCHITEW6432)" != ""
+PROCESSOR_ARCHITECTURE	!= $(PROCESSOR_ARCHITEW6432)
+WIN64			= define
+.ELIF "$(PROCESSOR_ARCHITECTURE)" == "IA64"
+WIN64			= define
+.ELSE
+WIN64			= undef
+.ENDIF
+.ENDIF
+
+.IF "$(USE_MULTI)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-multi
 .ELSE
 .IF "$(USE_PERLIO)" == "define"
@@ -335,7 +342,7 @@ RSC		= rc
 # Options
 #
 INCLUDES	= -I$(COREDIR) -I.\include -I. -I.. -I"$(CCINCDIR)"
-#PCHFLAGS	= -H -Hc -H=c:\temp\bcmoduls.pch 
+#PCHFLAGS	= -H -Hc -H=c:\temp\bcmoduls.pch
 DEFINES		= -DWIN32 $(CRYPT_FLAG)
 LOCDEFS		= -DPERLDLL -DPERL_CORE
 SUBSYS		= console
@@ -372,6 +379,9 @@ LINK_FLAGS	+= -L"$(CCLIBDIR)\Release"
 
 CC		= gcc
 LINK32		= gcc
+.IF "$(USE_GCC_V3_2)" == "define"
+LINK32		= g++
+.END
 LIB32		= ar rc
 IMPLIB		= dlltool
 RSC		= rc
@@ -446,30 +456,43 @@ PERLDLL_RES	=
 .IF  "$(CFG)" == "Debug"
 .IF "$(CCTYPE)" == "MSVC20"
 OPTIMIZE	= -Od -MD -Z7 -DDEBUGGING
-LINK_DBG	= -debug -pdb:none
 .ELSE
-# -Zi requires .pdb file(s)
-#OPTIMIZE	= -Od -MD -Zi -DDEBUGGING
-#LINK_DBG	= -debug
-OPTIMIZE	= -O1 -MD -Z7 -DDEBUGGING
-LINK_DBG	= -debug -debugtype:both -pdb:none
+OPTIMIZE	= -O1 -MD -Zi -DDEBUGGING
 .ENDIF
+LINK_DBG	= -debug
 .ELSE
-.IF "$(CFG)" == "Optimize"
-# -O1 yields smaller code, which turns out to be faster than -O2
-#OPTIMIZE	= -O2 -MD -DNDEBUG
-OPTIMIZE	= -O1 -MD -DNDEBUG
+OPTIMIZE	= -MD -DNDEBUG
+LINK_DBG	= -release
+.IF "$(WIN64)" == "define"
+# enable Whole Program Optimizations (WPO) and Link Time Code Generation (LTCG)
+OPTIMIZE	+= -Ox -GL
+LINK_DBG	+= -ltcg
 .ELSE
-OPTIMIZE	= -Od -MD -DNDEBUG
+# -O1 yields smaller code, which turns out to be faster than -O2 on x86
+OPTIMIZE	+= -O1
+#OPTIMIZE	+= -O2
 .ENDIF
-LINK_DBG	= -release
+.ENDIF
+
+.IF "$(WIN64)" == "define"
+DEFINES		+= -DWIN64 -DCONSERVATIVE
+OPTIMIZE	+= -Wp64 -Op
+.ENDIF
+
+.IF "$(USE_PERLCRT)" != "define"
+BUILDOPT	+= -DPERL_MSVCRT_READFIX
 .ENDIF
 
 LIBBASEFILES	= $(CRYPT_LIB) \
 		oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib \
 		comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
 		netapi32.lib uuid.lib wsock32.lib mpr.lib winmm.lib \
-		version.lib odbc32.lib odbccp32.lib
+		version.lib
+
+# win64 doesn't have some libs
+.IF "$(WIN64)" != "define"
+LIBBASEFILES	+= odbc32.lib odbccp32.lib
+.ENDIF
 
 # we add LIBC here, since we may be using PerlCRT.dll
 LIBFILES	= $(LIBBASEFILES) $(LIBC)
@@ -483,10 +506,6 @@ OBJOUT_FLAG	= -Fo
 EXEOUT_FLAG	= -Fe
 LIBOUT_FLAG	= /out:
 
-.IF "$(USE_PERLCRT)" != "define"
-BUILDOPT	+= -DPERL_MSVCRT_READFIX
-.ENDIF
-
 .ENDIF
 
 CFLAGS_O	= $(CFLAGS) $(BUILDOPT)
@@ -564,11 +583,15 @@ UTILS		=			\
 		..\utils\perlbug	\
 		..\utils\pl2pm 		\
 		..\utils\c2ph		\
+		..\utils\pstruct	\
 		..\utils\h2xs		\
 		..\utils\perldoc	\
 		..\utils\perlcc		\
 		..\utils\perlivp	\
 		..\utils\libnetcfg	\
+		..\utils\enc2xs		\
+		..\utils\piconv		\
+		..\utils\cpan		\
 		..\pod\checkpods	\
 		..\pod\pod2html		\
 		..\pod\pod2latex	\
@@ -578,6 +601,7 @@ UTILS		=			\
 		..\pod\podchecker	\
 		..\pod\podselect	\
 		..\x2p\find2perl	\
+		..\x2p\psed		\
 		..\x2p\s2p		\
 		..\lib\ExtUtils\xsubpp	\
 		bin\exetype.pl		\
@@ -595,20 +619,24 @@ CFGH_TMPL	= config_H.bc
 
 CFGSH_TMPL	= config.gc
 CFGH_TMPL	= config_H.gc
-PERLIMPLIB	= ..\libperl57$(a)
+PERLIMPLIB	= ..\libperl59$(a)
 
 .ELSE
 
+.IF "$(WIN64)" == "define"
+CFGSH_TMPL	= config.vc64
+CFGH_TMPL	= config_H.vc64
+.ELSE
 CFGSH_TMPL	= config.vc
 CFGH_TMPL	= config_H.vc
+.ENDIF
 
 .ENDIF
 
 # makedef.pl must be updated if this changes, and this should normally
 # only change when there is an incompatible revision of the public API.
-# XXX so why did we change it from perl56 to perl57?
-PERLIMPLIB	*= ..\perl57$(a)
-PERLDLL		= ..\perl57.dll
+PERLIMPLIB	*= ..\perl59$(a)
+PERLDLL		= ..\perl59.dll
 
 XCOPY		= xcopy /f /r /i /d
 RCOPY		= xcopy /f /r /i /e /d
@@ -633,6 +661,7 @@ MICROCORE_SRC	=		\
 		..\mg.c		\
 		..\numeric.c	\
 		..\op.c		\
+		..\pad.c	\
 		..\perl.c	\
 		..\perlapi.c	\
 		..\perly.c	\
@@ -642,12 +671,12 @@ MICROCORE_SRC	=		\
 		..\pp_pack.c	\
 		..\pp_sort.c	\
 		..\pp_sys.c	\
+		..\reentr.c	\
 		..\regcomp.c	\
 		..\regexec.c	\
 		..\run.c	\
 		..\scope.c	\
 		..\sv.c		\
-		..\sharedsv.c	\
 		..\taint.c	\
 		..\toke.c	\
 		..\universal.c	\
@@ -668,9 +697,11 @@ WIN32_SRC	=		\
 		.\win32sck.c	\
 		.\win32thread.c
 
-.IF "$(USE_PERLIO)" == "define"
+# We need this for miniperl build unless we override canned 
+# config.h #define building mini\*
+#.IF "$(USE_PERLIO)" == "define"
 WIN32_SRC	+= .\win32io.c
-.ENDIF
+#.ENDIF
 
 .IF "$(CRYPT_SRC)" != ""
 WIN32_SRC	+= .\$(CRYPT_SRC)
@@ -709,7 +740,6 @@ CORE_NOCFG_H	=		\
 		..\proto.h	\
 		..\regexp.h	\
 		..\scope.h	\
-		..\sharedsv.h	\
 		..\sv.h		\
 		..\thread.h	\
 		..\unixish.h	\
@@ -732,7 +762,7 @@ MICROCORE_OBJ	= $(MICROCORE_SRC:db:+$(o))
 CORE_OBJ	= $(MICROCORE_OBJ) $(EXTRACORE_SRC:db:+$(o))
 WIN32_OBJ	= $(WIN32_SRC:db:+$(o))
 MINICORE_OBJ	= $(MINIDIR)\{$(MICROCORE_OBJ:f) miniperlmain$(o) perlio$(o)}
-MINIWIN32_OBJ	= $(MINIDIR)\{$(WIN32_OBJ:f)} 
+MINIWIN32_OBJ	= $(MINIDIR)\{$(WIN32_OBJ:f)}
 MINI_OBJ	= $(MINICORE_OBJ) $(MINIWIN32_OBJ)
 DLL_OBJ		= $(DLL_SRC:db:+$(o))
 X2P_OBJ		= $(X2P_SRC:db:+$(o))
@@ -749,7 +779,7 @@ SETARGV_OBJ	= setargv$(o)
 DYNAMIC_EXT	= Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
 		Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \
 		Sys/Hostname Storable Filter/Util/Call Encode \
-		Digest/MD5 PerlIO/Scalar MIME/Base64 Time/HiRes \
+		Digest/MD5 PerlIO/scalar MIME/Base64 Time/HiRes \
 		Unicode/Normalize
 STATIC_EXT	= DynaLoader
 NONXS_EXT	= Errno
@@ -783,15 +813,17 @@ CFG_VARS	=					\
 		libpth=$(CCLIBDIR:s/\/\\/);$(EXTRALIBDIRS:s/\/\\/)	~	\
 		libc=$(LIBC)			~	\
 		make=dmake			~	\
-		_o=$(o)	obj_ext=$(o)		~	\
-		_a=$(a)	lib_ext=$(a)		~	\
+		_o=$(o)				~	\
+		obj_ext=$(o)			~	\
+		_a=$(a)				~	\
+		lib_ext=$(a)			~	\
 		static_ext=$(STATIC_EXT)	~	\
-		use5005threads=$(USE_5005THREADS)	~	\
+		usethreads=$(USE_ITHREADS)	~	\
 		useithreads=$(USE_ITHREADS)	~	\
-		usethreads=$(USE_5005THREADS)	~	\
 		usemultiplicity=$(USE_MULTI)	~	\
 		useperlio=$(USE_PERLIO)		~	\
-		LINK_FLAGS=$(LINK_FLAGS:s/\/\\/)		~	\
+		uselargefiles=$(USE_LARGE_FILES)	~	\
+		LINK_FLAGS=$(LINK_FLAGS:s/\/\\/)	~	\
 		optimize=$(OPTIMIZE)
 
 #
@@ -813,7 +845,7 @@ RIGHTMAKE	=
 
 all : .\config.h $(GLOBEXE) $(MINIPERL) $(MK2)		\
 	$(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(PERLEXE)	\
-	$(X2P) Extensions 
+	$(X2P) Extensions
 
 $(DYNALOADER)$(o) : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c
 
@@ -897,10 +929,11 @@ regen_config_h:
 	perl config_sh.PL --cfgsh-option-file $(mktmp $(CFG_VARS)) \
 	    $(CFGSH_TMPL) > ..\config.sh
 	-cd .. && del /f perl.exe
+	-cd .. && del /f perl*.dll
 	cd .. && perl configpm
 	-del /f $(CFGH_TMPL)
 	-mkdir $(COREDIR)
-	-perl -I..\lib config_h.PL "INST_VER=$(INST_VER)"
+	-perl config_h.PL "INST_VER=$(INST_VER)"
 	rename config.h $(CFGH_TMPL)
 
 $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl
@@ -1054,10 +1087,10 @@ $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
 	copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs
 
 #----------------------------------------------------------------------------------
-Extensions : buildext.pl $(PERLDEP) $(CONFIGPM) 
+Extensions : buildext.pl $(PERLDEP) $(CONFIGPM)
 	$(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR)
 
-Extensions_clean : 
+Extensions_clean :
 	-if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean
 
 #----------------------------------------------------------------------------------
@@ -1070,34 +1103,43 @@ doc: $(PERLEXE)
 
 utils: $(PERLEXE) $(X2P)
 	cd ..\utils && $(MAKE) PERL=$(MINIPERL)
-	copy ..\README.aix	..\pod\perlaix.pod
-	copy ..\README.amiga	..\pod\perlamiga.pod
-	copy ..\README.apollo	..\pod\perlapollo.pod
-	copy ..\README.beos	..\pod\perlbeos.pod
-	copy ..\README.bs2000	..\pod\perlbs2000.pod
-	copy ..\README.ce	..\pod\perlce.pod
-	copy ..\README.cygwin	..\pod\perlcygwin.pod
-	copy ..\README.dgux	..\pod\perldgux.pod
-	copy ..\README.dos	..\pod\perldos.pod
-	copy ..\README.epoc	..\pod\perlepoc.pod
-	copy ..\README.hpux	..\pod\perlhpux.pod
-	copy ..\README.hurd	..\pod\perlhurd.pod
-	copy ..\README.machten	..\pod\perlmachten.pod
-	copy ..\README.macos	..\pod\perlmacos.pod
-	copy ..\README.mint	..\pod\perlmint.pod
-	copy ..\README.mpeix	..\pod\perlmpeix.pod
-	copy ..\README.netware	..\pod\perlnetware.pod
-	copy ..\README.os2	..\pod\perlos2.pod
-	copy ..\README.os390	..\pod\perlos390.pod
-	copy ..\README.plan9	..\pod\perlplan9.pod
-	copy ..\README.qnx	..\pod\perlqnx.pod
-	copy ..\README.solaris	..\pod\perlsolaris.pod
-	copy ..\README.tru64	..\pod\perltru64.pod
-	copy ..\README.uts	..\pod\perluts.pod
-	copy ..\README.vmesa	..\pod\perlvmesa.pod
+	copy ..\README.aix      .\perlaix.pod
+	copy ..\README.amiga    .\perlamiga.pod
+	copy ..\README.apollo   .\perlapollo.pod
+	copy ..\README.beos     .\perlbeos.pod
+	copy ..\README.bs2000   .\perlbs2000.pod
+	copy ..\README.ce       .\perlce.pod
+	copy ..\README.cn       .\perlcn.pod
+	copy ..\README.cygwin   .\perlcygwin.pod
+	copy ..\README.dgux     .\perldgux.pod
+	copy ..\README.dos      .\perldos.pod
+	copy ..\README.epoc     .\perlepoc.pod
+	copy ..\README.freebsd  .\perlfreebsd.pod
+	copy ..\README.hpux     .\perlhpux.pod
+	copy ..\README.hurd     .\perlhurd.pod
+	copy ..\README.irix     .\perlirix.pod
+	copy ..\README.jp       .\perljp.pod
+	copy ..\README.ko       .\perlko.pod
+	copy ..\README.machten  .\perlmachten.pod
+	copy ..\README.macos    .\perlmacos.pod
+	copy ..\README.macosx   .\perlmacosx.pod
+	copy ..\README.mint     .\perlmint.pod
+	copy ..\README.mpeix    .\perlmpeix.pod
+	copy ..\README.netware  .\perlnetware.pod
+	copy ..\README.os2      .\perlos2.pod
+	copy ..\README.os390    .\perlos390.pod
+	copy ..\README.os400    .\perlos400.pod
+	copy ..\README.plan9    .\perlplan9.pod
+	copy ..\README.qnx      .\perlqnx.pod
+	copy ..\README.solaris  .\perlsolaris.pod
+	copy ..\README.tru64    .\perltru64.pod
+	copy ..\README.tw       .\perltw.pod
+	copy ..\README.uts      .\perluts.pod
+	copy ..\README.vmesa    .\perlvmesa.pod
+	copy ..\README.vms      .\perlvms.pod
+	copy ..\README.vos      .\perlvos.pod
+	copy ..\README.win32    .\perlwin32.pod
 	copy ..\vms\perlvms.pod	..\pod\perlvms.pod
-	copy ..\README.vos	..\pod\perlvos.pod
-	copy ..\README.win32	..\pod\perlwin32.pod
 	cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters
 	cd ..\lib && $(PERLEXE) lib_pm.PL
 	$(PERLEXE) $(PL2BAT) $(UTILS)
@@ -1114,7 +1156,7 @@ distclean: clean
 	-del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm
 	-del /f $(LIBDIR)\B.pm $(LIBDIR)\O.pm $(LIBDIR)\re.pm
 	-del /f $(LIBDIR)\Data\Dumper.pm $(LIBDIR)\ByteLoader.pm
-	-del /f $(LIBDIR)\PerlIO\Scalar.pm
+	-del /f $(LIBDIR)\PerlIO\scalar.pm
 	-del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm
 	-del /f $(LIBDIR)\File\Glob.pm
 	-del /f $(LIBDIR)\Storable.pm
@@ -1126,38 +1168,48 @@ distclean: clean
 	-del /f $(LIBDIR)\List\Util.pm
 	-del /f $(LIBDIR)\Scalar\Util.pm
 	-del /f $(LIBDIR)\Unicode\Normalize.pm
-	-if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO || rmdir /s $(LIBDIR)\IO
-	-if exist $(LIBDIR)\Thread rmdir /s /q $(LIBDIR)\Thread || rmdir /s $(LIBDIR)\Thread
-	-if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B || rmdir /s $(LIBDIR)\B
-	-if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data || rmdir /s $(LIBDIR)\Data
-	-if exist $(LIBDIR)\Filter\Util\Call rmdir /s /q $(LIBDIR)\Filter\Util\Call || rmdir /s $(LIBDIR)\Filter
-	-if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util || rmdir /s $(LIBDIR)\Filter
-	-if exist $(LIBDIR)\Digest rmdir /s /q $(LIBDIR)\Digest || rmdir /s $(LIBDIR)\Digest
-	-if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME || rmdir /s $(LIBDIR)\MIME
-	-if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List || rmdir /s $(LIBDIR)\List
-	-if exist $(LIBDIR)\Scalar rmdir /s /q $(LIBDIR)\Scalar || rmdir /s $(LIBDIR)\Scalar
+	-if exist $(LIBDIR)\IO rmdir /s /q $(LIBDIR)\IO
+	-if exist $(LIBDIR)\IO rmdir /s $(LIBDIR)\IO
+	-if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B
+	-if exist $(LIBDIR)\B rmdir /s $(LIBDIR)\B
+	-if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data
+	-if exist $(LIBDIR)\Data rmdir /s $(LIBDIR)\Data
+	-if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util
+	-if exist $(LIBDIR)\Filter\Util rmdir /s $(LIBDIR)\Filter\Util
+	-if exist $(LIBDIR)\Digest rmdir /s /q $(LIBDIR)\Digest
+	-if exist $(LIBDIR)\Digest rmdir /s $(LIBDIR)\Digest
+	-if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME
+	-if exist $(LIBDIR)\MIME rmdir /s $(LIBDIR)\MIME
+	-if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List
+	-if exist $(LIBDIR)\List rmdir /s $(LIBDIR)\List
+	-if exist $(LIBDIR)\Scalar rmdir /s /q $(LIBDIR)\Scalar
+	-if exist $(LIBDIR)\Scalar rmdir /s $(LIBDIR)\Scalar
+	-if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS
+	-if exist $(LIBDIR)\XS rmdir /s $(LIBDIR)\XS
 	-cd $(PODDIR) && del /f *.html *.bat checkpods \
-	    perlaix.pod perlamiga.pod perlapollo.pod \
-	    perlbeos.pod perlbs2000.pod perlce.pod perlcygwin.pod perldgux.pod \
-	    perldos.pod perlepoc.pod perlhpux.pod perlhurd.pod \
-	    perlmachten.pod perlmint.pod \
-	    perlmacos.pod perlmpeix.pod perlnetware.pod \
-	    perlos2.pod perlos390.pod \
-	    perlplan9.pod perlqnx.pod \
-	    perlsolaris.pod perltru64.pod perluts.pod \
-	    perlvmesa.pod perlvms.pod perlvos.pod \
-	    perlwin32.pod pod2html pod2latex pod2man pod2text pod2usage \
+	    perlaix.pod perlamiga.pod perlapollo.pod perlbeos.pod \
+	    perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod \
+	    perldgux.pod perldos.pod perlepoc.pod perlfreebsd.pod \
+	    perlhpux.pod perlhurd.pod perlirix.pod perljp.pod perlko.pod \
+	    perlmachten.pod perlmacos.pod perlmacosx.pod perlmint.pod \
+	    perlmpeix.pod perlnetware.pod perlos2.pod perlos390.pod \
+	    perlos400.pod perlplan9.pod perlqnx.pod perlsolaris.pod \
+	    perltru64.pod perltw.pod perluts.pod perlvmesa.pod perlvms.pod \
+	    perlvms.pod perlvos.pod perlwin32.pod \
+	    pod2html pod2latex pod2man pod2text pod2usage \
 	    podchecker podselect
-	-cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc \
-	    perlivp dprofpp *.bat
-	-cd ..\x2p && del /f find2perl s2p *.bat
+	-cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
+	    perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv cpan *.bat
+	-cd ..\x2p && del /f find2perl s2p psed *.bat
 	-del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new
 	-del /f $(CONFIGPM)
 	-del /f bin\*.bat
-	-cd $(EXTDIR) && del /s *$(a) *.def *.map *.pdb *.bs Makefile *$(o) \
-	    pm_to_blib
-	-if exist $(AUTODIR) rmdir /s /q $(AUTODIR) || rmdir /s $(AUTODIR)
-	-if exist $(COREDIR) rmdir /s /q $(COREDIR) || rmdir /s $(COREDIR)
+	-cd .. && del /s *$(a) *.map *.pdb *.ilk *.bs *$(o) .exists pm_to_blib
+	-cd $(EXTDIR) && del /s *.def Makefile Makefile.old
+	-if exist $(AUTODIR) rmdir /s /q $(AUTODIR)
+	-if exist $(AUTODIR) rmdir /s $(AUTODIR)
+	-if exist $(COREDIR) rmdir /s /q $(COREDIR)
+	-if exist $(COREDIR) rmdir /s $(COREDIR)
 
 install : all installbare installhtml
 
@@ -1212,6 +1264,16 @@ test-wide-notty : test-prep
 	    set HARNESS_PERL_SWITCHES=-C && \
 	    cd ..\t && $(PERLEXE) -I..\lib harness
 
+_test : $(RIGHTMAKE)
+	$(XCOPY) $(PERLEXE) ..\t\$(NULL)
+	$(XCOPY) $(PERLDLL) ..\t\$(NULL)
+.IF "$(CCTYPE)" == "BORLAND"
+	$(XCOPY) $(GLOBBAT) ..\t\$(NULL)
+.ELSE
+	$(XCOPY) $(GLOBEXE) ..\t\$(NULL)
+.ENDIF
+	cd ..\t && $(PERLEXE) -I..\lib harness
+
 clean : Extensions_clean
 	-@erase miniperlmain$(o)
 	-@erase $(MINIPERL)
@@ -1224,7 +1286,8 @@ clean : Extensions_clean
 	-@erase $(WPERLEXE)
 	-@erase $(PERLDLL)
 	-@erase $(CORE_OBJ)
-	-if exist $(MINIDIR) rmdir /s /q $(MINIDIR) || rmdir /s $(MINIDIR)
+	-if exist $(MINIDIR) rmdir /s /q $(MINIDIR)
+	-if exist $(MINIDIR) rmdir /s $(MINIDIR)
 	-@erase $(WIN32_OBJ)
 	-@erase $(DLL_OBJ)
 	-@erase $(X2P_OBJ)