X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2FMakefile;h=cc360f85b5ac5305baf5efdf4dc65c7f8922da57;hb=15af043884e0520355045b5d53efce3cdf6f3094;hp=20512cd59cadbf017cf7c682322bd17e6ad396e3;hpb=847a5fae45dac396d0f9e1bb61d5b4ff9d94cdcd;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/Makefile b/win32/Makefile
index 20512cd..cc360f8 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1,10 +1,11 @@
 #
 # Makefile to build perl on Windows NT using Microsoft NMAKE.
 # Supported compilers:
-#	Visual C++ 5.x (possibly other versions)
+#	Visual C++ 2.0 through 6.0 (and possibly newer versions)
+#	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.
+# (perl58.dll).  Also makes individual DLLs for the XS extensions.
 #
 
 ##
@@ -31,7 +32,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.0
+#INST_VER = \5.8.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -46,12 +47,12 @@ INST_TOP	= $(INST_DRV)\perl
 
 #
 # 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.
+# Beginnings of interpreter cloning/threads; now reasonably complete.
 # This should be enabled to get the fork() emulation.  This needs
 # USE_MULTI as well.
 #
@@ -65,10 +66,12 @@ USE_ITHREADS = define
 USE_IMP_SYS = define
 
 #
-# uncomment to enable the experimental PerlIO I/O subsystem.
-# This is currently incompatible with USE_MULTI, USE_ITHREADS,
-# and USE_IMP_SYS
-#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
@@ -81,17 +84,6 @@ USE_IMP_SYS = define
 #USE_5005THREADS	= define
 
 #
-# WARNING! This option is deprecated and will eventually go away (enable
-# USE_MULTI instead).
-#
-# uncomment next line if you want to use the PERL_OBJECT build option.
-# DO NOT ENABLE unless you have legacy code that relies on the C++
-# CPerlObj class that was available in 5.005.  This cannot be enabled
-# if you ask for USE_5005THREADS above.
-#
-#USE_OBJECT	= define
-
-#
 # uncomment one of the following lines if you are using either
 # Visual C++ 2.x or Visual C++ 6.x (aka Visual Studio 98)
 #
@@ -100,6 +92,8 @@ USE_IMP_SYS = define
 
 #
 # uncomment next line if you want debug version of perl (big,slow)
+# If not enabled, we automatically try to use maximum optimization
+# with all compilers that are known to have a working optimizer.
 #
 #CFG		= Debug
 
@@ -107,7 +101,7 @@ USE_IMP_SYS = define
 # uncomment to enable use of PerlCRT.DLL when using the Visual C compiler.
 # It has patches that fix known bugs in older versions of MSVCRT.DLL.
 # This currently requires VC 5.0 with Service Pack 3 or later.
-# Get it from CPAN at http://www.perl.com/CPAN/authors/id/D/DO/DOUGL/
+# Get it from CPAN at http://www.cpan.org/authors/id/D/DO/DOUGL/
 # and follow the directions in the package to install.
 #
 # Not recommended if you have VC 6.x and you're not running Windows 9x.
@@ -208,13 +202,6 @@ D_CRYPT		= define
 CRYPT_FLAG	= -DHAVE_DES_FCRYPT
 !ENDIF
 
-!IF "$(USE_OBJECT)" == "define"
-PERL_MALLOC	= undef
-USE_5005THREADS	= undef
-USE_MULTI	= undef
-USE_IMP_SYS	= define
-!ENDIF
-
 !IF "$(PERL_MALLOC)" == ""
 PERL_MALLOC	= undef
 !ENDIF
@@ -235,10 +222,6 @@ PERL_MALLOC	= undef
 USE_MULTI	= undef
 !ENDIF
 
-!IF "$(USE_OBJECT)" == ""
-USE_OBJECT	= undef
-!ENDIF
-
 !IF "$(USE_ITHREADS)" == ""
 USE_ITHREADS	= undef
 !ENDIF
@@ -247,20 +230,24 @@ USE_ITHREADS	= undef
 USE_IMP_SYS	= undef
 !ENDIF
 
+!IF "$(USE_PERLIO)" == ""
+USE_PERLIO	= undef
+!ENDIF
+
 !IF "$(USE_PERLCRT)" == ""
 USE_PERLCRT	= undef
 !ENDIF
 
-!IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" == "defineundefundefundef"
+!IF "$(USE_IMP_SYS)$(USE_MULTI)$(USE_5005THREADS)" == "defineundefundef"
 USE_MULTI	= define
 !ENDIF
 
-!IF "$(USE_ITHREADS)$(USE_MULTI)$(USE_OBJECT)" == "defineundefundef"
+!IF "$(USE_ITHREADS)$(USE_MULTI)" == "defineundef"
 USE_MULTI	= define
 USE_5005THREADS	= undef
 !ENDIF
 
-!IF "$(USE_MULTI)$(USE_5005THREADS)$(USE_OBJECT)" != "undefundefundef"
+!IF "$(USE_MULTI)$(USE_5005THREADS)" != "undefundef"
 BUILDOPT	= $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
 
@@ -272,9 +259,19 @@ BUILDOPT	= $(BUILDOPT) -DPERL_IMPLICIT_SYS
 PROCESSOR_ARCHITECTURE	= x86
 !ENDIF
 
-!IF "$(USE_OBJECT)" == "define"
-ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-object
+!IF "$(WIN64)" == ""
+!IF "$(PROCESSOR_ARCHITEW6432)" != ""
+PROCESSOR_ARCHITECTURE	= $(PROCESSOR_ARCHITEW6432)
+WIN64			= define
+!ELSE
+!IF "$(PROCESSOR_ARCHITECTURE)" == "IA64"
+WIN64			= define
 !ELSE
+WIN64			= undef
+!ENDIF
+!ENDIF
+!ENDIF
+
 !IF "$(USE_5005THREADS)" == "define"
 ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
 !ELSE
@@ -288,7 +285,6 @@ ARCHNAME	= MSWin32-$(PROCESSOR_ARCHITECTURE)
 !ENDIF
 !ENDIF
 !ENDIF
-!ENDIF
 
 !IF "$(USE_PERLIO)" == "define"
 BUILDOPT	= $(BUILDOPT) -DUSE_PERLIO
@@ -321,7 +317,7 @@ INST_LIB	= $(INST_TOP)$(INST_VER)\lib
 INST_ARCHLIB	= $(INST_LIB)$(INST_ARCH)
 INST_COREDIR	= $(INST_ARCHLIB)\CORE
 INST_POD	= $(INST_LIB)\pod
-INST_HTML	= $(INST_POD)\html
+INST_HTML	= $(INST_TOP)$(INST_VER)\html
 
 #
 # Programs to compile, build .lib files and link
@@ -358,17 +354,24 @@ OPTIMIZE	= -Od -MD -Z7 -DDEBUGGING
 !  ELSE
 OPTIMIZE	= -Od -MD -Zi -DDEBUGGING
 !  ENDIF
-LINK_DBG	= -debug -pdb:none
+LINK_DBG	= -debug
 !ELSE
-# -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	= $(OPTIMIZE) -Ox -GL
+LINK_DBG	= $(LINK_DBG) -ltcg
+!  ELSE
+# -O1 yields smaller code, which turns out to be faster than -O2 on x86
+OPTIMIZE	= $(OPTIMIZE) -O1
+#OPTIMIZE	= $(OPTIMIZE) -O2
+!  ENDIF
 !ENDIF
 
-!IF "$(USE_OBJECT)" == "define"
-OPTIMIZE	= $(OPTIMIZE) $(CXX_FLAG)
-BUILDOPT	= $(BUILDOPT) -DPERL_OBJECT
+!IF "$(WIN64)" == "define"
+DEFINES		= $(DEFINES) -DWIN64 -DCONSERVATIVE
+OPTIMIZE	= $(OPTIMIZE) -Wp64 -Op
 !ENDIF
 
 !IF "$(USE_PERLCRT)" != "define"
@@ -379,7 +382,12 @@ 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	= $(LIBBASEFILES) odbc32.lib odbccp32.lib
+!ENDIF
 
 # we add LIBC here, since we may be using PerlCRT.dll
 LIBFILES	= $(LIBBASEFILES) $(LIBC)
@@ -423,9 +431,8 @@ $(o).dll:
 
 # 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.lib
-PERLDLL		= ..\perl57.dll
+PERLIMPLIB	= ..\perl58.lib
+PERLDLL		= ..\perl58.dll
 
 MINIPERL	= ..\miniperl.exe
 MINIDIR		= .\mini
@@ -436,6 +443,12 @@ CONFIGPM	= ..\lib\Config.pm
 MINIMOD		= ..\lib\ExtUtils\Miniperl.pm
 X2P		= ..\x2p\a2p.exe
 
+# Nominate a target which causes extensions to be re-built
+# This used to be $(PERLEXE), but at worst it is the .dll that they depend
+# on and really only the interface - i.e. the .def file used to export symbols
+# from the .dll
+PERLDEP		= perldll.def
+
 PL2BAT		= bin\pl2bat.pl
 GLOBBAT		= bin\perlglob.bat
 
@@ -446,9 +459,14 @@ UTILS		=			\
 		..\utils\perlbug	\
 		..\utils\pl2pm 		\
 		..\utils\c2ph		\
+		..\utils\pstruct	\
 		..\utils\h2xs		\
 		..\utils\perldoc	\
 		..\utils\perlcc		\
+		..\utils\perlivp	\
+		..\utils\libnetcfg	\
+		..\utils\enc2xs		\
+		..\utils\piconv		\
 		..\pod\checkpods	\
 		..\pod\pod2html		\
 		..\pod\pod2latex	\
@@ -458,7 +476,9 @@ UTILS		=			\
 		..\pod\podchecker	\
 		..\pod\podselect	\
 		..\x2p\find2perl	\
+		..\x2p\psed		\
 		..\x2p\s2p		\
+		..\lib\ExtUtils\xsubpp	\
 		bin\exetype.pl		\
 		bin\runperl.pl		\
 		bin\pl2bat.pl		\
@@ -466,16 +486,22 @@ UTILS		=			\
 		bin\search.pl
 
 MAKE		= nmake -nologo
+MAKE_BARE	= nmake
 
+!IF "$(WIN64)" == "define"
+CFGSH_TMPL	= config.vc64
+CFGH_TMPL	= config_H.vc64
+!ELSE
 CFGSH_TMPL	= config.vc
 CFGH_TMPL	= config_H.vc
+!ENDIF
 
 XCOPY		= xcopy /f /r /i /d
 RCOPY		= xcopy /f /r /i /e /d
 NOOP		= @echo
 NULL		=
 
-DEL		= bin\mdelete.bat
+DEL		= del
 
 #
 # filenames given to xsubpp must have forward slashes (since it puts
@@ -492,7 +518,9 @@ MICROCORE_SRC	=		\
 		..\globals.c	\
 		..\gv.c		\
 		..\hv.c		\
+		..\locale.c	\
 		..\mg.c		\
+		..\numeric.c	\
 		..\op.c		\
 		..\perl.c	\
 		..\perlapi.c	\
@@ -500,7 +528,10 @@ MICROCORE_SRC	=		\
 		..\pp.c		\
 		..\pp_ctl.c	\
 		..\pp_hot.c	\
+		..\pp_pack.c	\
+		..\pp_sort.c	\
 		..\pp_sys.c	\
+		..\reentr.c	\
 		..\regcomp.c	\
 		..\regexec.c	\
 		..\run.c	\
@@ -519,15 +550,19 @@ EXTRACORE_SRC	= $(EXTRACORE_SRC) perllib.c
 EXTRACORE_SRC	= $(EXTRACORE_SRC) ..\malloc.c
 !ENDIF
 
-!IF "$(USE_OBJECT)" != "define"
 EXTRACORE_SRC	= $(EXTRACORE_SRC) ..\perlio.c
-!ENDIF
 
 WIN32_SRC	=		\
 		.\win32.c	\
 		.\win32sck.c	\
 		.\win32thread.c
 
+# We need this for miniperl build unless we override canned 
+# config.h #define building mini\*
+#!IF "$(USE_PERLIO)" == "define"
+WIN32_SRC	= $(WIN32_SRC) .\win32io.c
+#!ENDIF
+
 !IF "$(CRYPT_SRC)" != ""
 WIN32_SRC	= $(WIN32_SRC) .\$(CRYPT_SRC)
 !ENDIF
@@ -604,55 +639,67 @@ PERLDLL_OBJ	= $(PERLDLL_OBJ) $(WIN32_OBJ) $(DLL_OBJ)
 SETARGV_OBJ	= setargv$(o)
 !ENDIF
 
-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
-STATIC_EXT	= DynaLoader
-NONXS_EXT	= Errno
-
-DYNALOADER	= $(EXTDIR)\DynaLoader\DynaLoader
-SOCKET		= $(EXTDIR)\Socket\Socket
-FCNTL		= $(EXTDIR)\Fcntl\Fcntl
-OPCODE		= $(EXTDIR)\Opcode\Opcode
-SDBM_FILE	= $(EXTDIR)\SDBM_File\SDBM_File
-IO		= $(EXTDIR)\IO\IO
-POSIX		= $(EXTDIR)\POSIX\POSIX
-ATTRS		= $(EXTDIR)\attrs\attrs
-THREAD		= $(EXTDIR)\Thread\Thread
-B		= $(EXTDIR)\B\B
-RE		= $(EXTDIR)\re\re
-DUMPER		= $(EXTDIR)\Data\Dumper\Dumper
-ERRNO		= $(EXTDIR)\Errno\Errno
-PEEK		= $(EXTDIR)\Devel\Peek\Peek
-BYTELOADER	= $(EXTDIR)\ByteLoader\ByteLoader
-DPROF		= $(EXTDIR)\Devel\DProf\DProf
-GLOB		= $(EXTDIR)\File\Glob\Glob
-HOSTNAME	= $(EXTDIR)\Sys\Hostname\Hostname
-STORABLE	= $(EXTDIR)\Storable\Storable
-FILTER		= $(EXTDIR)\Filter\Util\Call\Call
-ENCODE		= $(EXTDIR)\Encode\Encode
-
-SOCKET_DLL	= $(AUTODIR)\Socket\Socket.dll
-FCNTL_DLL	= $(AUTODIR)\Fcntl\Fcntl.dll
-OPCODE_DLL	= $(AUTODIR)\Opcode\Opcode.dll
-SDBM_FILE_DLL	= $(AUTODIR)\SDBM_File\SDBM_File.dll
-IO_DLL		= $(AUTODIR)\IO\IO.dll
-POSIX_DLL	= $(AUTODIR)\POSIX\POSIX.dll
-ATTRS_DLL	= $(AUTODIR)\attrs\attrs.dll
-THREAD_DLL	= $(AUTODIR)\Thread\Thread.dll
-B_DLL		= $(AUTODIR)\B\B.dll
-DUMPER_DLL	= $(AUTODIR)\Data\Dumper\Dumper.dll
-PEEK_DLL	= $(AUTODIR)\Devel\Peek\Peek.dll
-RE_DLL		= $(AUTODIR)\re\re.dll
-BYTELOADER_DLL	= $(AUTODIR)\ByteLoader\ByteLoader.dll
-DPROF_DLL	= $(AUTODIR)\Devel\DProf\DProf.dll
-GLOB_DLL	= $(AUTODIR)\File\Glob\Glob.dll
-HOSTNAME_DLL	= $(AUTODIR)\Sys\Hostname\Hostname.dll
-STORABLE_DLL	= $(AUTODIR)\Storable\Storable.dll
-FILTER_DLL	= $(AUTODIR)\Filter\Util\Call\Call.dll
-ENCODE_DLL	= $(AUTODIR)\Encode\Encode.dll
-
-ERRNO_PM	= $(LIBDIR)\Errno.pm
+DYNALOADER		= $(EXTDIR)\DynaLoader\DynaLoader
+SOCKET			= $(EXTDIR)\Socket\Socket
+FCNTL			= $(EXTDIR)\Fcntl\Fcntl
+OPCODE			= $(EXTDIR)\Opcode\Opcode
+SDBM_FILE		= $(EXTDIR)\SDBM_File\SDBM_File
+IO			= $(EXTDIR)\IO\IO
+POSIX			= $(EXTDIR)\POSIX\POSIX
+ATTRS			= $(EXTDIR)\attrs\attrs
+THREAD			= $(EXTDIR)\Thread\Thread
+B			= $(EXTDIR)\B\B
+RE			= $(EXTDIR)\re\re
+DUMPER			= $(EXTDIR)\Data\Dumper\Dumper
+ERRNO			= $(EXTDIR)\Errno\Errno
+PEEK			= $(EXTDIR)\Devel\Peek\Peek
+BYTELOADER		= $(EXTDIR)\ByteLoader\ByteLoader
+DPROF			= $(EXTDIR)\Devel\DProf\DProf
+GLOB			= $(EXTDIR)\File\Glob\Glob
+HOSTNAME		= $(EXTDIR)\Sys\Hostname\Hostname
+STORABLE		= $(EXTDIR)\Storable\Storable
+FILTER			= $(EXTDIR)\Filter\Util\Call\Call
+ENCODE			= $(EXTDIR)\Encode\Encode
+MD5			= $(EXTDIR)\Digest\MD5\MD5
+PERLIOSCALAR		= $(EXTDIR)\PerlIO\Scalar\Scalar
+MIMEBASE64		= $(EXTDIR)\MIME\Base64\Base64
+TIMEHIRES		= $(EXTDIR)\Time\HiRes\HiRes
+CWD			= $(EXTDIR)\Cwd\Cwd
+LISTUTIL  		= $(EXTDIR)\List\Util\Util
+PERLIOVIA		= $(EXTDIR)\PerlIO\Via\Via
+XSAPITEST		= $(EXTDIR)\XS\APItest\APItest
+XSTYPEMAP		= $(EXTDIR)\XS\Typemap\Typemap
+UNICODENORMALIZE	= $(EXTDIR)\Unicode\Normalize\Normalize
+
+SOCKET_DLL		= $(AUTODIR)\Socket\Socket.dll
+FCNTL_DLL		= $(AUTODIR)\Fcntl\Fcntl.dll
+OPCODE_DLL		= $(AUTODIR)\Opcode\Opcode.dll
+SDBM_FILE_DLL		= $(AUTODIR)\SDBM_File\SDBM_File.dll
+IO_DLL			= $(AUTODIR)\IO\IO.dll
+POSIX_DLL		= $(AUTODIR)\POSIX\POSIX.dll
+ATTRS_DLL		= $(AUTODIR)\attrs\attrs.dll
+THREAD_DLL		= $(AUTODIR)\Thread\Thread.dll
+B_DLL			= $(AUTODIR)\B\B.dll
+DUMPER_DLL		= $(AUTODIR)\Data\Dumper\Dumper.dll
+PEEK_DLL		= $(AUTODIR)\Devel\Peek\Peek.dll
+RE_DLL			= $(AUTODIR)\re\re.dll
+BYTELOADER_DLL		= $(AUTODIR)\ByteLoader\ByteLoader.dll
+DPROF_DLL		= $(AUTODIR)\Devel\DProf\DProf.dll
+GLOB_DLL		= $(AUTODIR)\File\Glob\Glob.dll
+HOSTNAME_DLL		= $(AUTODIR)\Sys\Hostname\Hostname.dll
+STORABLE_DLL		= $(AUTODIR)\Storable\Storable.dll
+FILTER_DLL		= $(AUTODIR)\Filter\Util\Call\Call.dll
+ENCODE_DLL		= $(AUTODIR)\Encode\Encode.dll
+MD5_DLL			= $(AUTODIR)\Digest\MD5\MD5.dll
+PERLIOSCALAR_DLL	= $(AUTODIR)\PerlIO\Scalar\Scalar.dll
+MIMEBASE64_DLL		= $(AUTODIR)\MIME\Base64\Base64.dll
+TIMEHIRES_DLL		= $(AUTODIR)\Time\HiRes\HiRes.dll
+CWD_DLL			= $(AUTODIR)\Cwd\Cwd.dll
+LISTUTIL_DLL		= $(AUTODIR)\List\Util\Util.dll
+PERLIOVIA_DLL		= $(AUTODIR)\PerlIO\Via\Via.dll
+XSAPITEST_DLL		= $(AUTODIR)\XS\APItest\APItest.dll
+XSTYPEMAP_DLL		= $(AUTODIR)\XS\Typemap\Typemap.dll
+UNICODENORMALIZE_DLL	= $(AUTODIR)\Unicode\Normalize\Normalize.dll
 
 EXTENSION_C	= 		\
 		$(SOCKET).c	\
@@ -673,7 +720,17 @@ EXTENSION_C	= 		\
 		$(HOSTNAME).c	\
 		$(STORABLE).c	\
 		$(FILTER).c	\
-		$(ENCODE).c	
+		$(ENCODE).c	\
+		$(MD5).c	\
+		$(PERLIOSCALAR).c	\
+		$(MIMEBASE64).c	\
+		$(TIMEHIRES).c	\
+		$(CWD).c	\
+		$(LISTUTIL).c	\
+		$(PERLIOVIA).c	\
+		$(XSAPITEST).c	\
+		$(XSTYPEMAP).c	\
+		$(UNICODENORMALIZE).c
 
 EXTENSION_DLL	= 		\
 		$(SOCKET_DLL)	\
@@ -694,10 +751,17 @@ EXTENSION_DLL	= 		\
 		$(HOSTNAME_DLL)	\
 		$(STORABLE_DLL)	\
 		$(FILTER_DLL)   \
-		$(ENCODE_DLL)
-
-EXTENSION_PM	=		\
-		$(ERRNO_PM)
+		$(ENCODE_DLL)   \
+		$(MD5_DLL)	\
+		$(PERLIOSCALAR_DLL) \
+		$(MIMEBASE64_DLL) \
+		$(TIMEHIRES_DLL)  \
+		$(CWD_DLL)	\
+		$(LISTUTIL_DLL)	\
+		$(PERLIOVIA_DLL)	\
+		$(XSAPITEST_DLL)	\
+		$(XSTYPEMAP_DLL)	\
+		$(UNICODENORMALIZE_DLL)
 
 POD2HTML	= $(PODDIR)\pod2html
 POD2MAN		= $(PODDIR)\pod2man
@@ -721,14 +785,12 @@ CFG_VARS	=					\
 		"libperl=$(PERLIMPLIB:..\=)"		\
 		"libpth=$(CCLIBDIR:"=\");$(EXTRALIBDIRS:"=\")"	\
 		"libc=$(LIBC)"				\
-		"make=nmake"				\
-		"static_ext=$(STATIC_EXT)"		\
-		"dynamic_ext=$(DYNAMIC_EXT)"		\
-		"nonxs_ext=$(NONXS_EXT)"		\
+		"make=$(MAKE_BARE)"				\
 		"use5005threads=$(USE_5005THREADS)"	\
 		"useithreads=$(USE_ITHREADS)"		\
 		"usethreads=$(USE_5005THREADS)"		\
 		"usemultiplicity=$(USE_MULTI)"		\
+		"useperlio=$(USE_PERLIO)"		\
 		"LINK_FLAGS=$(LINK_FLAGS:"=\")"		\
 		"optimize=$(OPTIMIZE:"=\")"
 
@@ -737,7 +799,8 @@ CFG_VARS	=					\
 #
 
 all : .\config.h $(GLOBEXE) $(MINIMOD) $(CONFIGPM) $(PERLEXE) \
-	$(X2P) $(EXTENSION_DLL) $(EXTENSION_PM)
+	$(X2P) Extensions
+	@echo	Everything is up to date. '$(MAKE_BARE) test' to run test suite.
 
 $(DYNALOADER)$(o) : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c
 
@@ -765,12 +828,12 @@ config.w32 : $(CFGSH_TMPL)
 regen_config_h:
 	perl config_sh.PL $(CFG_VARS) $(CFGSH_TMPL) > ..\config.sh
 	cd ..
-	-del /f perl.exe
+	-del /f perl.exe perl*.dll
 	perl configpm
 	cd win32
 	-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
@@ -801,7 +864,7 @@ $(MINIWIN32_OBJ) : $(CORE_NOCFG_H)
 
 # -DPERL_IMPLICIT_SYS needs C++ for perllib.c
 # This is the only file that depends on perlhost.h, vmem.h, and vdir.h
-!IF "$(USE_IMP_SYS)$(USE_OBJECT)" == "defineundef"
+!IF "$(USE_IMP_SYS)" == "define"
 perllib$(o)	: perllib.c .\perlhost.h .\vdir.h .\vmem.h
 	$(CC) -c -I. $(CFLAGS_O) $(CXX_FLAG) $(OBJOUT_FLAG)$@ perllib.c
 !ENDIF
@@ -881,131 +944,14 @@ $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM)
 $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
 	copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs
 
-$(DUMPER_DLL): $(PERLEXE) $(DUMPER).xs
-	cd $(EXTDIR)\Data\$(*B)
-	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\..\win32
-
-$(DPROF_DLL): $(PERLEXE) $(DPROF).xs
-	cd $(EXTDIR)\Devel\$(*B)
-	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\..\win32
-
-$(GLOB_DLL): $(PERLEXE) $(GLOB).xs
-	cd $(EXTDIR)\File\$(*B)
-	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\..\win32
-
-$(PEEK_DLL): $(PERLEXE) $(PEEK).xs
-	cd $(EXTDIR)\Devel\$(*B)
-	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\..\win32
-
-$(RE_DLL): $(PERLEXE) $(RE).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
-
-$(B_DLL): $(PERLEXE) $(B).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
-
-$(THREAD_DLL): $(PERLEXE) $(THREAD).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
-
-$(ATTRS_DLL): $(PERLEXE) $(ATTRS).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
-
-$(POSIX_DLL): $(PERLEXE) $(POSIX).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
-
-$(IO_DLL): $(PERLEXE) $(IO).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
-
-$(SDBM_FILE_DLL) : $(PERLEXE) $(SDBM_FILE).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
-
-$(FCNTL_DLL): $(PERLEXE) $(FCNTL).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
+#----------------------------------------------------------------------------------
+Extensions: buildext.pl $(PERLDEP) $(CONFIGPM)
+	$(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR)
 
-$(OPCODE_DLL): $(PERLEXE) $(OPCODE).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
-
-$(SOCKET_DLL): $(PERLEXE) $(SOCKET).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
+Extensions_clean: 
+	-if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean
 
-$(HOSTNAME_DLL): $(PERLEXE) $(HOSTNAME).xs
-	cd $(EXTDIR)\Sys\$(*B)
-	..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\..\win32
-
-$(BYTELOADER_DLL): $(PERLEXE) $(BYTELOADER).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
-
-$(ENCODE_DLL): $(PERLEXE) $(ENCODE).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
-
-$(STORABLE_DLL): $(PERLEXE) $(STORABLE).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
-
-$(FILTER_DLL): $(PERLEXE) $(FILTER).xs
-	cd $(EXTDIR)\Filter\Util\Call
-	..\..\..\..\miniperl -I..\..\..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\..\..\win32
-
-$(ENCODE_DLL): $(PERLEXE) $(ENCODE).xs
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
-
-$(ERRNO_PM): $(PERLEXE) $(ERRNO)_pm.PL
-	cd $(EXTDIR)\$(*B)
-	..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
-	$(MAKE)
-	cd ..\..\win32
+#----------------------------------------------------------------------------------
 
 doc: $(PERLEXE)
 	$(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=./html \
@@ -1016,20 +962,36 @@ utils: $(PERLEXE) $(X2P)
 	cd ..\utils
 	$(MAKE) PERL=$(MINIPERL)
 	cd ..\pod
-	copy ..\README.aix .\perlaix.pod
-	copy ..\README.amiga .\perlamiga.pod
-	copy ..\README.cygwin .\perlcygwin.pod
-	copy ..\README.dos .\perldos.pod
-	copy ..\README.epoc .\perlepoc.pod
-	copy ..\README.hpux .\perlhpux.pod
-	copy ..\README.machten .\perlmachten.pod
-	copy ..\README.os2 .\perlos2.pod
-	copy ..\README.os390 .\perlos390.pod
-	copy ..\README.posix .\perlposix.pod
-	copy ..\README.solaris .\perlsolaris.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.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.hurd     .\perlhurd.pod
+	copy ..\README.hpux     .\perlhpux.pod
+	copy ..\README.irix     .\perlirix.pod
+	copy ..\README.machten  .\perlmachten.pod
+	copy ..\README.macos    .\perlmacos.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.plan9    .\perlplan9.pod
+	copy ..\README.qnx      .\perlqnx.pod
+	copy ..\README.solaris  .\perlsolaris.pod
+	copy ..\README.tru64    .\perltru64.pod
+	copy ..\README.uts      .\perluts.pod
+	copy ..\README.vmesa    .\perlvmesa.pod
 	copy ..\vms\perlvms.pod .\perlvms.pod
-	copy ..\README.vos .\perlvos.pod
-	copy ..\README.win32 .\perlwin32.pod
+	copy ..\README.vos      .\perlvos.pod
+	copy ..\README.win32    .\perlwin32.pod
 	$(MAKE) -f ..\win32\pod.mak converters
 	cd ..\lib
 	$(PERLEXE) lib_pm.PL
@@ -1040,45 +1002,77 @@ distclean: clean
 	-del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \
 		$(PERLIMPLIB) ..\miniperl.lib $(MINIMOD)
 	-del /f *.def *.map
-	-del /f $(EXTENSION_DLL) $(EXTENSION_PM)
+	-del /f $(EXTENSION_DLL)
 	-del /f $(EXTENSION_C) $(DYNALOADER).c $(ERRNO).pm
 	-del /f $(EXTDIR)\DynaLoader\dl_win32.xs
 	-del /f $(LIBDIR)\.exists $(LIBDIR)\attrs.pm $(LIBDIR)\DynaLoader.pm
 	-del /f $(LIBDIR)\XSLoader.pm
 	-del /f $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm
-	-del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm $(LIBDIR)\Thread.pm
+	-del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm
 	-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)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm
 	-del /f $(LIBDIR)\File\Glob.pm
 	-del /f $(LIBDIR)\Storable.pm
-	-del /f $(LIBDIR)\Filter\Util\Call\Call.pm
+	-del /f $(LIBDIR)\Filter\Util\Call.pm
+	-del /f $(LIBDIR)\Digest\MD5.pm
+	-del /f $(LIBDIR)\PerlIO\Scalar.pm
+	-del /f $(LIBDIR)\PerlIO\Via.pm
+	-del /f $(LIBDIR)\MIME\Base64.pm
+	-del /f $(LIBDIR)\MIME\QuotedPrint.pm
+	-del /f $(LIBDIR)\List\Util.pm
+	-del /f $(LIBDIR)\Scalar\Util.pm
+	-del /f $(LIBDIR)\Time\HiRes.pm
+	-del /f $(LIBDIR)\XS\APItest.pm
+	-del /f $(LIBDIR)\XS\Typemap.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
 	-if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util
-	-del /f $(PODDIR)\*.html
-	-del /f $(PODDIR)\*.bat
+	-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)\XS rmdir /s /q $(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 perlfreebsd.pod perlhurd.pod \
+	    perlhpux.pod perlirix.pod perlmachten.pod \
+	    perlmacos.pod perlmint.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 \
+	    podchecker podselect
 	cd ..\utils
-	-del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc dprofpp
+	-del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs perldoc perlivp \
+	    dprofpp perlcc libnetcfg enc2xs piconv
 	-del /f *.bat
 	cd ..\win32
 	cd ..\x2p
-	-del /f find2perl s2p
+	-del /f find2perl s2p psed
 	-del /f *.bat
 	cd ..\win32
 	-del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new
 	-del /f $(CONFIGPM)
 	-del /f bin\*.bat
+	cd ..
+	-del /s *.lib *.map *.pdb *.ilk *.bs *$(o) .exists pm_to_blib
+	cd win32
 	cd $(EXTDIR)
-	-del /s *.lib *.def *.map *.pdb *.bs Makefile *$(o) pm_to_blib
+	-del /s *.def Makefile Makefile.old
 	cd ..\win32
 	-if exist $(AUTODIR) rmdir /s /q $(AUTODIR)
 	-rmdir /s $(AUTODIR)
@@ -1139,13 +1133,21 @@ test-wide-notty : test-prep
 	$(PERLEXE) -I..\lib harness
 	cd ..\win32
 
-clean :
+_test : 
+       $(XCOPY) $(PERLEXE) ..\t\$(NULL)
+       $(XCOPY) $(PERLDLL) ..\t\$(NULL)
+       $(XCOPY) $(GLOBEXE) ..\t\$(NULL)
+       cd ..\t
+       $(PERLEXE) -I..\lib harness
+       cd ..\win32
+
+clean : Extensions_clean
 	-@$(DEL) miniperlmain$(o)
 	-@$(DEL) $(MINIPERL)
 	-@$(DEL) perlglob$(o)
 	-@$(DEL) perlmain$(o)
 	-@$(DEL) config.w32
-	-@$(DEL) /f config.h
+	-@$(DEL) config.h
 	-@$(DEL) $(GLOBEXE)
 	-@$(DEL) $(PERLEXE)
 	-@$(DEL) $(WPERLEXE)