Rename the old threading tutorial, start a new one,

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

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 0aa4835..0b4b685 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -81,17 +81,6 @@ USE_PERLIO   = 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 exactly one of the following
 #
 # Visual C++ 2.x
@@ -236,13 +225,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
-
 PERL_MALLOC    *= undef
 
 USE_5005THREADS        *= undef
@@ -256,22 +238,21 @@ PERL_MALLOC       != undef
 .ENDIF
 
 USE_MULTI      *= undef
-USE_OBJECT     *= undef
 USE_ITHREADS   *= undef
 USE_IMP_SYS    *= undef
 USE_PERLIO     *= undef
 USE_PERLCRT    *= undef
 
-.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       += -DPERL_IMPLICIT_CONTEXT
 .ENDIF
 
@@ -283,9 +264,7 @@ BUILDOPT    += -DPERL_IMPLICIT_SYS
 
 PROCESSOR_ARCHITECTURE *= x86
 
-.IF "$(USE_OBJECT)" == "define"
-ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)-object
-.ELIF "$(USE_5005THREADS)" == "define"
+.IF "$(USE_5005THREADS)" == "define"
 ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
 .ELIF "$(USE_MULTI)" == "define"
 ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi
@@ -510,11 +489,6 @@ BUILDOPT   += -DPERL_MSVCRT_READFIX
 
 .ENDIF
 
-.IF "$(USE_OBJECT)" == "define"
-OPTIMIZE       += $(CXX_FLAG)
-BUILDOPT       += -DPERL_OBJECT
-.ENDIF
-
 CFLAGS_O       = $(CFLAGS) $(BUILDOPT)
 
 # used to allow local linking flags that are not propogated into Config.pm,
@@ -593,6 +567,7 @@ UTILS               =                       \
                ..\utils\h2xs           \
                ..\utils\perldoc        \
                ..\utils\perlcc         \
+               ..\utils\perlivp        \
                ..\utils\libnetcfg      \
                ..\pod\checkpods        \
                ..\pod\pod2html         \
@@ -671,6 +646,7 @@ MICROCORE_SRC       =               \
                ..\run.c        \
                ..\scope.c      \
                ..\sv.c         \
+               ..\sharedsv.c   \
                ..\taint.c      \
                ..\toke.c       \
                ..\universal.c  \
@@ -684,9 +660,7 @@ EXTRACORE_SRC       += perllib.c
 EXTRACORE_SRC  += ..\malloc.c
 .ENDIF
 
-.IF "$(USE_OBJECT)" != "define"
 EXTRACORE_SRC  += ..\perlio.c
-.ENDIF
 
 WIN32_SRC      =               \
                .\win32.c       \
@@ -731,6 +705,7 @@ CORE_NOCFG_H        =               \
                ..\proto.h      \
                ..\regexp.h     \
                ..\scope.h      \
+               ..\sharedsv.h   \
                ..\sv.h         \
                ..\thread.h     \
                ..\unixish.h    \
@@ -770,7 +745,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 Time/Piece
+               Digest/MD5 PerlIO/Scalar MIME/Base64 Time/HiRes
 STATIC_EXT     = DynaLoader
 NONXS_EXT      = Errno
 
@@ -960,7 +935,7 @@ $(MINIWIN32_OBJ) : $(CORE_NOCFG_H)
 # This is the only file that depends on perlhost.h, vmem.h, and vdir.h
 
 perllib$(o)    : perllib.c .\perlhost.h .\vdir.h .\vmem.h
-.IF "$(USE_IMP_SYS)$(USE_OBJECT)" == "defineundef"
+.IF "$(USE_IMP_SYS)" == "define"
        $(CC) -c -I. $(CFLAGS_O) $(CXX_FLAG) $(OBJOUT_FLAG)$@ perllib.c
 .ELSE
        $(CC) -c -I. $(CFLAGS_O) $(OBJOUT_FLAG)$@ perllib.c
@@ -1095,6 +1070,7 @@ utils: $(PERLEXE) $(X2P)
        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
@@ -1144,7 +1120,6 @@ distclean: clean
        -del /f $(LIBDIR)\Time\HiRes.pm
        -del /f $(LIBDIR)\List\Util.pm
        -del /f $(LIBDIR)\Scalar\Util.pm
-       -del /f $(LIBDIR)\Time\Piece.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
@@ -1157,7 +1132,7 @@ distclean: clean
        -if exist $(LIBDIR)\Scalar rmdir /s /q $(LIBDIR)\Scalar || rmdir /s $(LIBDIR)\Scalar
        -cd $(PODDIR) && del /f *.html *.bat checkpods \
            perlaix.pod perlamiga.pod perlapollo.pod \
-           perlbeos.pod perlbs2000.pod perlcygwin.pod perldgux.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 \
@@ -1168,7 +1143,7 @@ distclean: clean
            perlwin32.pod pod2html pod2latex pod2man pod2text pod2usage \
            podchecker podselect
        -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc \
-           dprofpp *.bat
+           perlivp dprofpp *.bat
        -cd ..\x2p && del /f find2perl s2p *.bat
        -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new
        -del /f $(CONFIGPM)