integrate cfgperl changes into mainline

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

diff --git a/win32/makefile.mk b/win32/makefile.mk
index ffda9fd..23dde72 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -33,7 +33,7 @@ INST_TOP      *= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER       *= \5.00557
+INST_VER       *= \5.00561
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -196,9 +196,9 @@ PERL_MALLOC *= undef
 
 USE_THREADS    *= undef
 USE_MULTI      *= undef
+USE_OBJECT     *= undef
 
-
-.IF "$(USE_MULTI)$(USE_THREADS)$(USE_OBJECT)" != ""
+.IF "$(USE_MULTI)$(USE_THREADS)$(USE_OBJECT)" != "undefundefundef"
 BUILDOPT       += -DPERL_IMPLICIT_CONTEXT
 .ENDIF
 
@@ -453,6 +453,7 @@ GLOBBAT             = bin\perlglob.bat
 UTILS          =                       \
                ..\utils\h2ph           \
                ..\utils\splain         \
+               ..\utils\dprofpp        \
                ..\utils\perlbug        \
                ..\utils\pl2pm          \
                ..\utils\c2ph           \
@@ -501,8 +502,8 @@ PERL95EXE   = ..\perl95.exe
 .ENDIF
 
 .IF "$(USE_OBJECT)" == "define"
-PERLIMPLIB     *= ..\perlcore$(a)
-PERLDLL                = ..\perlcore.dll
+PERLIMPLIB     *= ..\perl56$(a)
+PERLDLL                = ..\perl56.dll
 .ELSE
 PERLIMPLIB     *= ..\perl$(a)
 PERLDLL                = ..\perl.dll
@@ -545,7 +546,8 @@ MICROCORE_SRC       =               \
                ..\toke.c       \
                ..\universal.c  \
                ..\utf8.c       \
-               ..\util.c
+               ..\util.c       \
+               ..\xsutils.c
 
 EXTRACORE_SRC  += perllib.c
 
@@ -649,7 +651,7 @@ SETARGV_OBJ = setargv$(o)
 .ENDIF
 
 DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
-               Data/Dumper Devel/Peek ByteLoader
+               Data/Dumper Devel/Peek ByteLoader Devel/DProf
 STATIC_EXT     = DynaLoader
 NONXS_EXT      = Errno
 
@@ -668,6 +670,7 @@ DUMPER              = $(EXTDIR)\Data\Dumper\Dumper
 ERRNO          = $(EXTDIR)\Errno\Errno
 PEEK           = $(EXTDIR)\Devel\Peek\Peek
 BYTELOADER     = $(EXTDIR)\ByteLoader\ByteLoader
+DPROF          = $(EXTDIR)\Devel\DProf\DProf
 
 SOCKET_DLL     = $(AUTODIR)\Socket\Socket.dll
 FCNTL_DLL      = $(AUTODIR)\Fcntl\Fcntl.dll
@@ -682,6 +685,7 @@ DUMPER_DLL  = $(AUTODIR)\Data\Dumper\Dumper.dll
 PEEK_DLL       = $(AUTODIR)\Devel\Peek\Peek.dll
 RE_DLL         = $(AUTODIR)\re\re.dll
 BYTELOADER_DLL = $(AUTODIR)\ByteLoader\ByteLoader.dll
+DPROF_DLL      = $(AUTODIR)\Devel\DProf\DProf.dll
 
 ERRNO_PM       = $(LIBDIR)\Errno.pm
 
@@ -698,7 +702,8 @@ EXTENSION_C =               \
                $(DUMPER).c     \
                $(PEEK).c       \
                $(B).c          \
-               $(BYTELOADER).c
+               $(BYTELOADER).c \
+               $(DPROF).c
 
 EXTENSION_DLL  =               \
                $(SOCKET_DLL)   \
@@ -713,7 +718,8 @@ EXTENSION_DLL       =               \
                $(B_DLL)        \
                $(RE_DLL)       \
                $(THREAD_DLL)   \
-               $(BYTELOADER_DLL)
+               $(BYTELOADER_DLL)       \
+               $(DPROF_DLL)
 
 EXTENSION_PM   =               \
                $(ERRNO_PM)
@@ -838,8 +844,8 @@ $(DLL_OBJ)  : $(CORE_H)
 $(PERL95_OBJ)  : $(CORE_H)
 $(X2P_OBJ)     : $(CORE_H)
 
-perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym makedef.pl
-       $(MINIPERL) -w makedef.pl $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \
+perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl
+       $(MINIPERL) -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \
            CCTYPE=$(CCTYPE) > perldll.def
 
 $(PERLDLL): perldll.def $(PERLDLL_OBJ)
@@ -967,6 +973,11 @@ $(DUMPER_DLL): $(PERLEXE) $(DUMPER).xs
        ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
        cd $(EXTDIR)\Data\$(*B) && $(MAKE)
 
+$(DPROF_DLL): $(PERLEXE) $(DPROF).xs
+       cd $(EXTDIR)\Devel\$(*B) && \
+       ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+       cd $(EXTDIR)\Devel\$(*B) && $(MAKE)
+
 $(PEEK_DLL): $(PERLEXE) $(PEEK).xs
        cd $(EXTDIR)\Devel\$(*B) && \
        ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
@@ -1056,7 +1067,7 @@ distclean: clean
        -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
-       -del /f $(LIBDIR)\Devel\Peek.pm
+       -del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm
        -rmdir /s /q $(LIBDIR)\IO || rmdir /s $(LIBDIR)\IO
        -rmdir /s /q $(LIBDIR)\Thread || rmdir /s $(LIBDIR)\Thread
        -rmdir /s /q $(LIBDIR)\B || rmdir /s $(LIBDIR)\B
@@ -1064,7 +1075,7 @@ distclean: clean
        -del /f $(PODDIR)\*.html
        -del /f $(PODDIR)\*.bat
        -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc \
-           pstruct *.bat
+           dprofpp pstruct *.bat
        -cd ..\x2p && del /f find2perl s2p *.bat
        -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new
        -del /f $(CONFIGPM)