keep paths consistently slashed on windows

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

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 35a9eb3..1eb7613 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -49,26 +49,30 @@ 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.
+# 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
 
 #
@@ -112,7 +116,7 @@ CCTYPE              *= MSVC60
 # 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.
@@ -589,11 +593,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        \
@@ -603,6 +610,7 @@ UTILS               =                       \
                ..\pod\podchecker       \
                ..\pod\podselect        \
                ..\x2p\find2perl        \
+               ..\x2p\psed             \
                ..\x2p\s2p              \
                ..\lib\ExtUtils\xsubpp  \
                bin\exetype.pl          \
@@ -697,9 +705,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)
@@ -1179,14 +1189,14 @@ distclean: clean
            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 \
-           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 *.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
+       -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) || rmdir /s $(AUTODIR)
        -if exist $(COREDIR) rmdir /s /q $(COREDIR) || rmdir /s $(COREDIR)