projects / p5sagit/p5-mst-13.2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
resync with mainline
[p5sagit/p5-mst-13.2.git] / win32 / makefile.mk
diff --git a/win32/makefile.mk b/win32/makefile.mk
index f69f04d..034ae3d 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
@@ -138,7 +138,7 @@ CCTYPE              *= BORLAND
 # so you may have to set CCHOME explicitly (spaces in the path name should
 # not be quoted)
 #
-CCHOME         *= C:\bc5
+CCHOME         *= d:\bc5
 #CCHOME                *= $(MSVCDIR)
 #CCHOME                *= D:\packages\mingw32
 CCINCDIR       *= $(CCHOME)\include
@@ -153,10 +153,7 @@ CCLIBDIR   *= $(CCHOME)\lib
 # We don't enable this by default because we want the modules to get fixed
 # instead of clinging to shortcuts like this one.
 #
-# Don't enable -DPERL_IMPLICIT_CONTEXT if you don't know what it is. :-)
-#
 #BUILDOPT      += -DPERL_POLLUTE
-#BUILDOPT      += -DPERL_IMPLICIT_CONTEXT
 
 #
 # specify semicolon-separated list of extra directories that modules will
@@ -174,7 +171,7 @@ EXTRALIBDIRS        *=
 # set this to your email address (perl will guess a value from
 # from your loginname and your hostname, which may not be right)
 #
-EMAIL          *= support@activestate.com
+#EMAIL         *=
 
 ##
 ## Build configuration ends.
@@ -199,6 +196,12 @@ PERL_MALLOC        *= undef
 
 USE_THREADS    *= undef
 USE_MULTI      *= undef
+USE_OBJECT     *= undef
+
+.IF "$(USE_MULTI)$(USE_THREADS)$(USE_OBJECT)" != "undefundefundef"
+BUILDOPT       += -DPERL_IMPLICIT_CONTEXT
+.ENDIF
+
 
 .IMPORT .IGNORE : PROCESSOR_ARCHITECTURE
 
@@ -226,8 +229,22 @@ DELAYLOAD  *= -DELAYLOAD:wsock32.dll delayimp.lib
 CFG            *= Optimize
 .ENDIF
 
+ARCHDIR                = ..\lib\$(ARCHNAME)
 COREDIR                = ..\lib\CORE
 AUTODIR                = ..\lib\auto
+LIBDIR         = ..\lib
+EXTDIR         = ..\ext
+PODDIR         = ..\pod
+EXTUTILSDIR    = $(LIBDIR)\ExtUtils
+
+#
+INST_SCRIPT    = $(INST_TOP)$(INST_VER)\bin
+INST_BIN       = $(INST_SCRIPT)$(INST_ARCH)
+INST_LIB       = $(INST_TOP)$(INST_VER)\lib
+INST_ARCHLIB   = $(INST_LIB)$(INST_ARCH)
+INST_COREDIR   = $(INST_ARCHLIB)\CORE
+INST_POD       = $(INST_LIB)\pod
+INST_HTML      = $(INST_POD)\html
 
 #
 # Programs to compile, build .lib files and link
@@ -264,9 +281,9 @@ OPTIMIZE    = -O2 $(RUNTIME)
 LINK_DBG       = 
 .ENDIF
 
-CFLAGS         = -w -g0 -tWM -tWD $(INCLUDES) $(LOCDEFS) \
+CFLAGS         = -w -g0 -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \
                $(PCHFLAGS) $(OPTIMIZE)
-LINK_FLAGS     = $(LINK_DBG) -L"$(CCLIBDIR)"
+LINK_FLAGS     = $(LINK_DBG) -L"$(INST_COREDIR)" -L"$(CCLIBDIR)"
 OBJOUT_FLAG    = -o
 EXEOUT_FLAG    = -e
 LIBOUT_FLAG    = 
@@ -304,15 +321,15 @@ LINK_DBG  =
 .ENDIF
 
 CFLAGS         = $(INCLUDES) $(DEFINES) $(LOCDEFS) $(OPTIMIZE)
-LINK_FLAGS     = $(LINK_DBG) -L"$(CCLIBDIR)"
+LINK_FLAGS     = $(LINK_DBG) -L"$(INST_COREDIR)" -L"$(CCLIBDIR)"
 OBJOUT_FLAG    = -o
 EXEOUT_FLAG    = -o
 LIBOUT_FLAG    = 
 
 .ELSE
 
-CC             = cl.exe
-LINK32         = link.exe
+CC             = cl
+LINK32         = link
 LIB32          = $(LINK32) -lib
 
 #
@@ -376,7 +393,9 @@ LIBFILES    = $(LIBBASEFILES) $(LIBC)
 
 CFLAGS         = -nologo -Gf -W3 $(INCLUDES) $(DEFINES) $(LOCDEFS) \
                $(PCHFLAGS) $(OPTIMIZE)
-LINK_FLAGS     = -nologo -nodefaultlib $(LINK_DBG) -machine:$(PROCESSOR_ARCHITECTURE)
+LINK_FLAGS     = -nologo -nodefaultlib $(LINK_DBG) \
+               -libpath:"$(INST_COREDIR)" \
+               -machine:$(PROCESSOR_ARCHITECTURE)
 OBJOUT_FLAG    = -Fo
 EXEOUT_FLAG    = -Fe
 LIBOUT_FLAG    = /out:
@@ -424,17 +443,6 @@ $(o).dll:
 .ENDIF
 
 #
-INST_BIN       = $(INST_TOP)$(INST_VER)\bin$(INST_ARCH)
-INST_SCRIPT    = $(INST_TOP)$(INST_VER)\bin
-INST_LIB       = $(INST_TOP)$(INST_VER)\lib
-INST_POD       = $(INST_LIB)\pod
-INST_HTML      = $(INST_POD)\html
-LIBDIR         = ..\lib
-EXTDIR         = ..\ext
-PODDIR         = ..\pod
-EXTUTILSDIR    = $(LIBDIR)\extutils
-
-#
 # various targets
 MINIPERL       = ..\miniperl.exe
 MINIDIR                = .\mini
@@ -450,6 +458,7 @@ GLOBBAT             = bin\perlglob.bat
 UTILS          =                       \
                ..\utils\h2ph           \
                ..\utils\splain         \
+               ..\utils\dprofpp        \
                ..\utils\perlbug        \
                ..\utils\pl2pm          \
                ..\utils\c2ph           \
@@ -498,8 +507,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
@@ -542,7 +551,8 @@ MICROCORE_SRC       =               \
                ..\toke.c       \
                ..\universal.c  \
                ..\utf8.c       \
-               ..\util.c
+               ..\util.c       \
+               ..\xsutils.c
 
 EXTRACORE_SRC  += perllib.c
 
@@ -613,7 +623,7 @@ CORE_NOCFG_H        =               \
                ..\unixish.h    \
                ..\utf8.h       \
                ..\util.h       \
-               ..\warning.h    \
+               ..\warnings.h   \
                ..\XSUB.h       \
                ..\EXTERN.h     \
                ..\perlvars.h   \
@@ -639,19 +649,14 @@ X2P_OBJ           = $(X2P_SRC:db:+$(o))
 PERLDLL_OBJ    = $(CORE_OBJ)
 PERLEXE_OBJ    = perlmain$(o)
 
-.IF "$(USE_OBJECT)" != "define"
 PERLDLL_OBJ    += $(WIN32_OBJ) $(DLL_OBJ)
-.ELSE
-PERLEXE_OBJ    += $(WIN32_OBJ) $(DLL_OBJ)
-PERL95_OBJ     += DynaLoadmt$(o)
-.ENDIF
 
 .IF "$(USE_SETARGV)" != ""
 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
 
@@ -670,6 +675,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
@@ -684,6 +690,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
 
@@ -700,7 +707,8 @@ EXTENSION_C =               \
                $(DUMPER).c     \
                $(PEEK).c       \
                $(B).c          \
-               $(BYTELOADER).c
+               $(BYTELOADER).c \
+               $(DPROF).c
 
 EXTENSION_DLL  =               \
                $(SOCKET_DLL)   \
@@ -715,7 +723,8 @@ EXTENSION_DLL       =               \
                $(B_DLL)        \
                $(RE_DLL)       \
                $(THREAD_DLL)   \
-               $(BYTELOADER_DLL)
+               $(BYTELOADER_DLL)       \
+               $(DPROF_DLL)
 
 EXTENSION_PM   =               \
                $(ERRNO_PM)
@@ -840,8 +849,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)
@@ -969,6 +978,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
@@ -1058,7 +1072,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
@@ -1066,7 +1080,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)
Unnamed repository; edit this file to name it for gitweb.