Re: The Inaba patch for tr/// vs. use encoding

[p5sagit/p5-mst-13.2.git] / win32 / Makefile

diff --git a/win32/Makefile b/win32/Makefile
index 0877f4d..9cc3399 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -5,7 +5,7 @@
 #      MS Platform SDK 64-bit compiler and tools **experimental**
 #
 # This is set up to build a perl.exe that runs off a shared library
-# (perl58.dll).  Also makes individual DLLs for the XS extensions.
+# (perl59.dll).  Also makes individual DLLs for the XS extensions.
 #
 
 ##
@@ -74,16 +74,6 @@ USE_IMP_SYS = define
 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
-
-#
 # uncomment one of the following lines if you are using either
 # Visual C++ 2.x or Visual C++ 6.x (aka Visual Studio 98)
 #
@@ -206,14 +196,6 @@ CRYPT_FLAG = -DHAVE_DES_FCRYPT
 PERL_MALLOC    = undef
 !ENDIF
 
-!IF "$(USE_5005THREADS)" == ""
-USE_5005THREADS        = undef
-!ENDIF
-
-!IF "$(USE_5005THREADS)" == "define"
-USE_ITHREADS   = undef
-!ENDIF
-
 !IF "$(USE_IMP_SYS)" == "define"
 PERL_MALLOC    = undef
 !ENDIF
@@ -238,16 +220,15 @@ USE_PERLIO        = undef
 USE_PERLCRT    = undef
 !ENDIF
 
-!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       = $(BUILDOPT) -DPERL_IMPLICIT_CONTEXT
 !ENDIF
 
@@ -272,9 +253,6 @@ WIN64                       = undef
 !ENDIF
 !ENDIF
 
-!IF "$(USE_5005THREADS)" == "define"
-ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
-!ELSE
 !IF "$(USE_MULTI)" == "define"
 ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi
 !ELSE
@@ -284,7 +262,6 @@ ARCHNAME    = MSWin32-$(PROCESSOR_ARCHITECTURE)-perlio
 ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)
 !ENDIF
 !ENDIF
-!ENDIF
 
 !IF "$(USE_PERLIO)" == "define"
 BUILDOPT       = $(BUILDOPT) -DUSE_PERLIO
@@ -431,8 +408,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.
-PERLIMPLIB     = ..\perl58.lib
-PERLDLL                = ..\perl58.dll
+PERLIMPLIB     = ..\perl59.lib
+PERLDLL                = ..\perl59.dll
 
 MINIPERL       = ..\miniperl.exe
 MINIDIR                = .\mini
@@ -522,6 +499,7 @@ MICROCORE_SRC       =               \
                ..\mg.c         \
                ..\numeric.c    \
                ..\op.c         \
+               ..\pad.c        \
                ..\perl.c       \
                ..\perlapi.c    \
                ..\perly.c      \
@@ -786,9 +764,7 @@ CFG_VARS    =                                       \
                "libpth=$(CCLIBDIR:"=\");$(EXTRALIBDIRS:"=\")"  \
                "libc=$(LIBC)"                          \
                "make=$(MAKE_BARE)"                             \
-               "use5005threads=$(USE_5005THREADS)"     \
                "useithreads=$(USE_ITHREADS)"           \
-               "usethreads=$(USE_5005THREADS)"         \
                "usemultiplicity=$(USE_MULTI)"          \
                "useperlio=$(USE_PERLIO)"               \
                "LINK_FLAGS=$(LINK_FLAGS:"=\")"         \
@@ -983,6 +959,7 @@ utils: $(PERLEXE) $(X2P)
        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
@@ -1051,8 +1028,8 @@ distclean: clean
            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 \
+           perlos2.pod perlos390.pod perlos400.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