Integrate mainline (a while ago)

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

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 63db476..a4cf314 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -96,7 +96,7 @@ CCTYPE                *= MSVC60
 
 #
 # uncomment this if your Borland compiler is older than v5.4.
-BCCOLD = define
+#BCCOLD = define
 #
 # uncomment this if you want to use Borland's VCL as your CRT
 #BCCVCL = define
@@ -117,7 +117,7 @@ CFG         *= Debug
 # 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.
@@ -163,9 +163,13 @@ CFG                *= Debug
 # so you may have to set CCHOME explicitly (spaces in the path name should
 # not be quoted)
 #
-#CCHOME                *= F:\borland\bc5
+.IF "$(CCTYPE)" == "BORLAND"
+CCHOME         *= C:\borland\bcc55
+.ELIF "$(CCTYPE)" == "GCC"
+CCHOME         *= C:\MinGW
+.ELSE
 CCHOME         *= $(MSVCDIR)
-#CCHOME                *= c:\gcc-2.95.2
+.ENDIF
 CCINCDIR       *= $(CCHOME)\include
 CCLIBDIR       *= $(CCHOME)\lib
 
@@ -335,7 +339,7 @@ RSC         = rc
 # Options
 #
 INCLUDES       = -I$(COREDIR) -I.\include -I. -I.. -I"$(CCINCDIR)"
-#PCHFLAGS      = -H -Hc -H=c:\temp\bcmoduls.pch 
+#PCHFLAGS      = -H -Hc -H=c:\temp\bcmoduls.pch
 DEFINES                = -DWIN32 $(CRYPT_FLAG)
 LOCDEFS                = -DPERLDLL -DPERL_CORE
 SUBSYS         = console
@@ -640,13 +644,13 @@ MICROCORE_SRC     =               \
                ..\pp_ctl.c     \
                ..\pp_hot.c     \
                ..\pp_pack.c    \
+               ..\pp_sort.c    \
                ..\pp_sys.c     \
                ..\regcomp.c    \
                ..\regexec.c    \
                ..\run.c        \
                ..\scope.c      \
                ..\sv.c         \
-               ..\sharedsv.c   \
                ..\taint.c      \
                ..\toke.c       \
                ..\universal.c  \
@@ -708,7 +712,6 @@ CORE_NOCFG_H        =               \
                ..\proto.h      \
                ..\regexp.h     \
                ..\scope.h      \
-               ..\sharedsv.h   \
                ..\sv.h         \
                ..\thread.h     \
                ..\unixish.h    \
@@ -731,7 +734,7 @@ MICROCORE_OBJ       = $(MICROCORE_SRC:db:+$(o))
 CORE_OBJ       = $(MICROCORE_OBJ) $(EXTRACORE_SRC:db:+$(o))
 WIN32_OBJ      = $(WIN32_SRC:db:+$(o))
 MINICORE_OBJ   = $(MINIDIR)\{$(MICROCORE_OBJ:f) miniperlmain$(o) perlio$(o)}
-MINIWIN32_OBJ  = $(MINIDIR)\{$(WIN32_OBJ:f)} $(MINIDIR)\win32io$(o)
+MINIWIN32_OBJ  = $(MINIDIR)\{$(WIN32_OBJ:f)}
 MINI_OBJ       = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
 DLL_OBJ                = $(DLL_SRC:db:+$(o))
 X2P_OBJ                = $(X2P_SRC:db:+$(o))
@@ -748,7 +751,8 @@ 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
+               Digest/MD5 PerlIO/Scalar MIME/Base64 Time/HiRes \
+               Unicode/Normalize
 STATIC_EXT     = DynaLoader
 NONXS_EXT      = Errno
 
@@ -811,7 +815,7 @@ RIGHTMAKE   =
 
 all : .\config.h $(GLOBEXE) $(MINIPERL) $(MK2)         \
        $(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(PERLEXE)  \
-       $(X2P) Extensions 
+       $(X2P) Extensions
 
 $(DYNALOADER)$(o) : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c
 
@@ -895,10 +899,11 @@ regen_config_h:
        perl config_sh.PL --cfgsh-option-file $(mktmp $(CFG_VARS)) \
            $(CFGSH_TMPL) > ..\config.sh
        -cd .. && del /f perl.exe
+       -cd .. && del /f perl*.dll
        cd .. && perl configpm
        -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
@@ -1052,10 +1057,10 @@ $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
        copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs
 
 #----------------------------------------------------------------------------------
-Extensions : buildext.pl $(PERLDEP) $(CONFIGPM) 
+Extensions : buildext.pl $(PERLDEP) $(CONFIGPM)
        $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR)
 
-Extensions_clean : 
+Extensions_clean :
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean
 
 #----------------------------------------------------------------------------------
@@ -1108,7 +1113,7 @@ distclean: clean
        -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
@@ -1123,6 +1128,7 @@ distclean: clean
        -del /f $(LIBDIR)\Time\HiRes.pm
        -del /f $(LIBDIR)\List\Util.pm
        -del /f $(LIBDIR)\Scalar\Util.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