Having to pull in the whole Encode just to get SvUTF8()

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

diff --git a/win32/Makefile b/win32/Makefile
index 9cc3399..22ddba1 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -74,11 +74,17 @@ USE_IMP_SYS = define
 USE_PERLIO     = 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 one of the following lines if you are using either
 # Visual C++ 2.x or Visual C++ 6.x (aka Visual Studio 98)
 #
 #CCTYPE                = MSVC20
-#CCTYPE                = MSVC60
+CCTYPE         = MSVC60
 
 #
 # uncomment next line if you want debug version of perl (big,slow)
@@ -131,6 +137,14 @@ USE_PERLIO = define
 #PERL_MALLOC   = define
 
 #
+# set this to enable debugging mstats
+# This must be enabled to use the Devel::Peek::mstat() function.  This cannot
+# be enabled without PERL_MALLOC as well.
+#
+#DEBUG_MSTATS  = define
+
+#
+#
 # set the install locations of the compiler include/libraries
 # Running VCVARS32.BAT is *required* when using Visual C.
 # Some versions of Visual C don't define MSVCDIR in the environment,
@@ -194,6 +208,15 @@ CRYPT_FLAG = -DHAVE_DES_FCRYPT
 
 !IF "$(PERL_MALLOC)" == ""
 PERL_MALLOC    = undef
+DEBUG_MSTATS   = undef
+!ENDIF
+
+!IF "$(DEBUG_MSTATS)" == ""
+DEBUG_MSTATS   = undef
+!ENDIF
+
+!IF "$(DEBUG_MSTATS)" == "define"
+BUILDOPT       = $(BUILDOPT) -DPERL_DEBUGGING_MSTATS
 !ENDIF
 
 !IF "$(USE_IMP_SYS)" == "define"
@@ -216,6 +239,10 @@ USE_IMP_SYS        = undef
 USE_PERLIO     = undef
 !ENDIF
 
+!IF "$(USE_LARGE_FILES)" == ""
+USE_LARGE_FILES        = undef
+!ENDIF
+
 !IF "$(USE_PERLCRT)" == ""
 USE_PERLCRT    = undef
 !ENDIF
@@ -444,6 +471,7 @@ UTILS               =                       \
                ..\utils\libnetcfg      \
                ..\utils\enc2xs         \
                ..\utils\piconv         \
+               ..\utils\cpan           \
                ..\pod\checkpods        \
                ..\pod\pod2html         \
                ..\pod\pod2latex        \
@@ -764,9 +792,11 @@ CFG_VARS   =                                       \
                "libpth=$(CCLIBDIR:"=\");$(EXTRALIBDIRS:"=\")"  \
                "libc=$(LIBC)"                          \
                "make=$(MAKE_BARE)"                             \
+               "usethreads=$(USE_ITHREADS)"            \
                "useithreads=$(USE_ITHREADS)"           \
                "usemultiplicity=$(USE_MULTI)"          \
                "useperlio=$(USE_PERLIO)"               \
+               "uselargefiles=$(USE_LARGE_FILES)"      \
                "LINK_FLAGS=$(LINK_FLAGS:"=\")"         \
                "optimize=$(OPTIMIZE:"=\")"
 
@@ -975,6 +1005,8 @@ utils: $(PERLEXE) $(X2P)
        cd ..\win32
        $(PERLEXE) $(PL2BAT) $(UTILS)
 
+# the doubled rmdir calls are needed because older cmd shells
+# don't understand /q
 distclean: clean
        -del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \
                $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD)
@@ -1005,22 +1037,23 @@ distclean: clean
        -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)\IO rmdir /s $(LIBDIR)\IO
        -if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B
-       -rmdir /s $(LIBDIR)\B
+       -if exist $(LIBDIR)\B rmdir /s $(LIBDIR)\B
        -if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data
-       -rmdir /s $(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
-       -rmdir /s $(LIBDIR)\Digest
+       -if exist $(LIBDIR)\Digest rmdir /s $(LIBDIR)\Digest
        -if exist $(LIBDIR)\MIME rmdir /s /q $(LIBDIR)\MIME
-       -rmdir /s $(LIBDIR)\MIME
+       -if exist $(LIBDIR)\MIME rmdir /s $(LIBDIR)\MIME
        -if exist $(LIBDIR)\List rmdir /s /q $(LIBDIR)\List
-       -rmdir /s $(LIBDIR)\List
+       -if exist $(LIBDIR)\List rmdir /s $(LIBDIR)\List
        -if exist $(LIBDIR)\Scalar rmdir /s /q $(LIBDIR)\Scalar
-       -rmdir /s $(LIBDIR)\Scalar
+       -if exist $(LIBDIR)\Scalar rmdir /s $(LIBDIR)\Scalar
        -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS
-       -rmdir /s $(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 \
@@ -1035,7 +1068,7 @@ distclean: clean
            podchecker podselect
        cd ..\utils
        -del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs perldoc perlivp \
-           dprofpp perlcc libnetcfg enc2xs piconv
+           dprofpp perlcc libnetcfg enc2xs piconv cpan
        -del /f *.bat
        cd ..\win32
        cd ..\x2p
@@ -1052,9 +1085,9 @@ distclean: clean
        -del /s *.def Makefile Makefile.old
        cd ..\win32
        -if exist $(AUTODIR) rmdir /s /q $(AUTODIR)
-       -rmdir /s $(AUTODIR)
+       -if exist $(AUTODIR) rmdir /s $(AUTODIR)
        -if exist $(COREDIR) rmdir /s /q $(COREDIR)
-       -rmdir /s $(COREDIR)
+       -if exist $(COREDIR) rmdir /s $(COREDIR)
 
 install : all installbare installhtml
 
@@ -1131,7 +1164,7 @@ clean : Extensions_clean
        -@$(DEL) $(PERLDLL)
        -@$(DEL) $(CORE_OBJ)
        -if exist $(MINIDIR) rmdir /s /q $(MINIDIR)
-       -rmdir /s $(MINIDIR)
+       -if exist $(MINIDIR) rmdir /s $(MINIDIR)
        -@$(DEL) $(WIN32_OBJ)
        -@$(DEL) $(DLL_OBJ)
        -@$(DEL) $(X2P_OBJ)