up patchlevel to 75 (Beta, Issue 1), add podpatch

[perl5.git] / win32 / Makefile

diff --git a/win32/Makefile b/win32/Makefile
index 99bd631..e72963a 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -25,7 +25,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.00470
+INST_VER       = \5.00475
 
 #
 # uncomment to enable threads-capabilities
@@ -56,9 +56,18 @@ INST_VER     = \5.00470
 #USE_PERLCRT   = define
 
 #
+# uncomment to enable linking with setargv.obj under the Visual C
+# compiler. Setting this options enables perl to expand wildcards in
+# arguments, but it may be harder to use alternate methods like
+# File::DosGlob that are more powerful.  This option is supported only with
+# Visual C.
+#
+#USE_SETARGV   = define
+
+#
 # if you have the source for des_fcrypt(), uncomment this and make sure the
-# file exists (see README.win32).  File should be located at the perl
-# top level directory.
+# file exists (see README.win32).  File should be located in the same
+# directory as this file.  Not (yet) supported with PERL_OBJECT.
 #
 #CRYPT_SRC     = des_fcrypt.c
 
@@ -130,11 +139,15 @@ USE_THREADS       = undef
 PROCESSOR_ARCHITECTURE = x86
 !ENDIF
 
+!IF "$(OBJECT)" != ""
+ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)-object
+!ELSE
 !IF "$(USE_THREADS)" == "define"
 ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)-thread
 !ELSE
 ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)
 !ENDIF
+!ENDIF
 
 ARCHDIR                = ..\lib\$(ARCHNAME)
 COREDIR                = ..\lib\CORE
@@ -153,9 +166,9 @@ LIB32               = $(LINK32) -lib
 #
 
 RUNTIME                = -MD
-INCLUDES       = -I.\include -I. -I..
+INCLUDES       = -I$(COREDIR) -I.\include -I. -I..
 #PCHFLAGS      = -Fpc:\temp\vcmoduls.pch -YX 
-DEFINES                = -DWIN32 -D_CONSOLE $(BUILDOPT) $(CRYPT_FLAG)
+DEFINES                = -DWIN32 -D_CONSOLE -DNO_STRICT $(BUILDOPT) $(CRYPT_FLAG)
 LOCDEFS                = -DPERLDLL -DPERL_CORE
 SUBSYS         = console
 CXX_FLAG       = -TP -GX
@@ -342,10 +355,6 @@ MICROCORE_SRC      =               \
                ..\universal.c  \
                ..\util.c
 
-!IF "$(CRYPT_SRC)" != ""
-MICROCORE_SRC  = $(MICROCORE_SRC) ..\$(CRYPT_SRC)
-!ENDIF
-
 !IF "$(PERL_MALLOC)" == "define"
 EXTRACORE_SRC  = $(EXTRACORE_SRC) ..\malloc.c
 !ENDIF
@@ -362,13 +371,17 @@ WIN32_SRC =               \
 WIN32_SRC      = $(WIN32_SRC) .\win32thread.c 
 !ENDIF
 
+!IF "$(CRYPT_SRC)" != ""
+WIN32_SRC      = $(WIN32_SRC) .\$(CRYPT_SRC)
+!ENDIF
+
 PERL95_SRC     =               \
                perl95.c        \
                win32mt.c       \
                win32sckmt.c
 
 !IF "$(CRYPT_SRC)" != ""
-PERL95_SRC     = $(PERL95_SRC) ..\$(CRYPT_SRC)
+PERL95_SRC     = $(PERL95_SRC) .\$(CRYPT_SRC)
 !ENDIF
 
 DLL_SRC                = $(DYNALOADER).c
@@ -448,7 +461,12 @@ PERLEXE_OBJ        = $(PERLEXE_OBJ) $(WIN32_OBJ) $(DLL_OBJ)
 PERL95_OBJ     = $(PERL95_OBJ) DynaLoadmt$(o)
 !ENDIF
 
-DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re
+!IF "$(USE_SETARGV)" != ""
+SETARGV_OBJ    = setargv$(o)
+!ENDIF
+
+DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
+               Data/Dumper
 STATIC_EXT     = DynaLoader
 NONXS_EXT      = Errno
 
@@ -462,7 +480,8 @@ POSIX               = $(EXTDIR)\POSIX\POSIX
 ATTRS          = $(EXTDIR)\attrs\attrs
 THREAD         = $(EXTDIR)\Thread\Thread
 B              = $(EXTDIR)\B\B
-RE             = $(EXTDIR)\RE\RE
+RE             = $(EXTDIR)\re\re
+DUMPER         = $(EXTDIR)\Data\Dumper\Dumper
 ERRNO          = $(EXTDIR)\Errno\Errno
 
 SOCKET_DLL     = $(AUTODIR)\Socket\Socket.dll
@@ -474,6 +493,7 @@ POSIX_DLL   = $(AUTODIR)\POSIX\POSIX.dll
 ATTRS_DLL      = $(AUTODIR)\attrs\attrs.dll
 THREAD_DLL     = $(AUTODIR)\Thread\Thread.dll
 B_DLL          = $(AUTODIR)\B\B.dll
+DUMPER_DLL     = $(AUTODIR)\Data\Dumper\Dumper.dll
 RE_DLL         = $(AUTODIR)\re\re.dll
 
 ERRNO_PM       = $(LIBDIR)\Errno.pm
@@ -488,6 +508,7 @@ EXTENSION_C =               \
                $(ATTRS).c      \
                $(THREAD).c     \
                $(RE).c         \
+               $(DUMPER).c     \
                $(B).c
 
 EXTENSION_DLL  =               \
@@ -498,6 +519,7 @@ EXTENSION_DLL       =               \
                $(IO_DLL)       \
                $(POSIX_DLL)    \
                $(ATTRS_DLL)    \
+               $(DUMPER_DLL)   \
                $(B_DLL)
 
 EXTENSION_PM   =               \
@@ -659,7 +681,7 @@ perlmain$(o) : perlmain.c
 
 $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ)
        $(LINK32) -subsystem:console -out:$@ $(LINK_FLAGS) $(LIBFILES) \
-           $(PERLEXE_OBJ) $(PERLIMPLIB) 
+           $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) 
        copy splittree.pl .. 
        $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR)
 
@@ -685,7 +707,8 @@ DynaLoadmt$(o) : $(DYNALOADER).c
 
 $(PERL95EXE): $(PERLDLL) $(CONFIGPM) $(PERL95_OBJ)
        $(LINK32) -subsystem:console -nodefaultlib -out:$@ $(LINK_FLAGS) \
-           $(LIBBASEFILES) $(PERL95_OBJ) $(PERLIMPLIB) libcmt.lib
+           $(LIBBASEFILES) $(PERL95_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) \
+           libcmt.lib
 
 !ENDIF
 
@@ -714,6 +737,12 @@ $(CAPILIB) : PerlCAPI.cpp PerlCAPI$(o)
 $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
        copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs
 
+$(DUMPER_DLL): $(PERLEXE) $(DUMPER).xs
+       cd $(EXTDIR)\Data\$(*B)
+       ..\..\..\miniperl -I..\..\..\lib Makefile.PL INSTALLDIRS=perl
+       $(MAKE)
+       cd ..\..\..\win32
+
 $(RE_DLL): $(PERLEXE) $(RE).xs
        cd $(EXTDIR)\$(*B)
        ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
@@ -806,9 +835,11 @@ distclean: clean
        -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm $(LIBDIR)\Thread.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
        -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
+       -rmdir /s /q $(LIBDIR)\Data || rmdir /s $(LIBDIR)\Data
        -del /f $(PODDIR)\*.html
        -del /f $(PODDIR)\*.bat
        cd ..\utils