tweak for change#7173

[perl5.git] / win32 / makefile.mk

diff --git a/win32/makefile.mk b/win32/makefile.mk
index e956588..86a2bf4 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -6,7 +6,7 @@
 #      Mingw32 with gcc-2.95.2 or better  **experimental**
 #
 # This is set up to build a perl.exe that runs off a shared library
-# (perl.dll).  Also makes individual DLLs for the XS extensions.
+# (perl56.dll).  Also makes individual DLLs for the XS extensions.
 #
 
 ##
@@ -712,7 +712,7 @@ 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
+               Sys/Hostname Storable
 STATIC_EXT     = DynaLoader
 NONXS_EXT      = Errno
 
@@ -734,6 +734,7 @@ BYTELOADER  = $(EXTDIR)\ByteLoader\ByteLoader
 DPROF          = $(EXTDIR)\Devel\DProf\DProf
 GLOB           = $(EXTDIR)\File\Glob\Glob
 HOSTNAME       = $(EXTDIR)\Sys\Hostname\Hostname
+STORABLE       = $(EXTDIR)\Storable\Storable
 
 SOCKET_DLL     = $(AUTODIR)\Socket\Socket.dll
 FCNTL_DLL      = $(AUTODIR)\Fcntl\Fcntl.dll
@@ -751,6 +752,7 @@ BYTELOADER_DLL      = $(AUTODIR)\ByteLoader\ByteLoader.dll
 DPROF_DLL      = $(AUTODIR)\Devel\DProf\DProf.dll
 GLOB_DLL       = $(AUTODIR)\File\Glob\Glob.dll
 HOSTNAME_DLL   = $(AUTODIR)\Sys\Hostname\Hostname.dll
+STORABLE_DLL   = $(AUTODIR)\Storable\Storable.dll
 
 ERRNO_PM       = $(LIBDIR)\Errno.pm
 
@@ -770,7 +772,8 @@ EXTENSION_C =               \
                $(BYTELOADER).c \
                $(DPROF).c      \
                $(GLOB).c       \
-               $(HOSTNAME).c
+               $(HOSTNAME).c   \
+               $(STORABLE).c
 
 EXTENSION_DLL  =               \
                $(SOCKET_DLL)   \
@@ -788,7 +791,8 @@ EXTENSION_DLL       =               \
                $(BYTELOADER_DLL)       \
                $(DPROF_DLL)    \
                $(GLOB_DLL)     \
-               $(HOSTNAME_DLL)
+               $(HOSTNAME_DLL) \
+               $(STORABLE_DLL)
 
 EXTENSION_PM   =               \
                $(ERRNO_PM)
@@ -804,7 +808,7 @@ POD2TEXT    = $(PODDIR)\pod2text
 #      -- BKS 10-17-1999
 CFG_VARS       =                                       \
                INST_DRV=$(INST_DRV)            ~       \
-               INST_TOP=$(INST_TOP)            ~       \
+               INST_TOP=$(INST_TOP:s/\/\\/)    ~       \
                INST_VER=$(INST_VER:s/\/\\/)    ~       \
                INST_ARCH=$(INST_ARCH)          ~       \
                archname=$(ARCHNAME)            ~       \
@@ -1070,7 +1074,7 @@ $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES)
        $(LINK32) -mconsole -o $@ $(BLINK_FLAGS)  \
            $(PERLEXE_OBJ) $(PERLIMPLIB) $(LIBFILES)
 .ELSE
-       $(LINK32) -subsystem:console -out:$@ -stack:0x8000000 $(BLINK_FLAGS) \
+       $(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(BLINK_FLAGS) \
            $(LIBFILES) $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) $(PERLEXE_RES)
 .ENDIF
        copy $(PERLEXE) $(WPERLEXE)
@@ -1170,6 +1174,11 @@ $(BYTELOADER_DLL): $(PERLEXE) $(BYTELOADER).xs
        ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
        cd $(EXTDIR)\$(*B) && $(MAKE)
 
+$(STORABLE_DLL): $(PERLEXE) $(STORABLE).xs
+       cd $(EXTDIR)\$(*B) && \
+       ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
+       cd $(EXTDIR)\$(*B) && $(MAKE)
+
 $(ERRNO_PM): $(PERLEXE) $(ERRNO)_pm.PL
        cd $(EXTDIR)\$(*B) && \
        ..\..\miniperl -I..\..\lib Makefile.PL INSTALLDIRS=perl
@@ -1182,8 +1191,16 @@ doc: $(PERLEXE)
 
 utils: $(PERLEXE) $(X2P)
        cd ..\utils && $(MAKE) PERL=$(MINIPERL)
-       copy ..\README.win32 ..\pod\perlwin32.pod
+       copy ..\README.amiga ..\pod\perlamiga.pod
+       copy ..\README.cygwin ..\pod\perlcygwin.pod
+       copy ..\README.dos ..\pod\perldos.pod
+       copy ..\README.hpux ..\pod\perlhpux.pod
+       copy ..\README.machten ..\pod\perlmachten.pod
+       copy ..\README.os2 ..\pod\perlos2.pod
+       copy ..\README.os2 ..\pod\perlos2.pod
+       copy ..\vms\perlvms.pod ..\pod\perlvms.pod
        cd ..\pod && $(MAKE) -f ..\win32\pod.mak converters
+       cd ..\lib && $(PERLEXE) lib_pm.PL
        $(PERLEXE) $(PL2BAT) $(UTILS)
 
 distclean: clean
@@ -1202,10 +1219,11 @@ distclean: clean
        -del /f $(LIBDIR)\Data\Dumper.pm $(LIBDIR)\ByteLoader.pm
        -del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm
        -del /f $(LIBDIR)\File\Glob.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 $(LIBDIR)\Storable.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
+       -if exist $(LIBDIR)\Data rmdir /s /q $(LIBDIR)\Data || rmdir /s $(LIBDIR)\Data
        -del /f $(PODDIR)\*.html
        -del /f $(PODDIR)\*.bat
        -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph h2xs perldoc \
@@ -1216,8 +1234,8 @@ distclean: clean
        -del /f bin\*.bat
        -cd $(EXTDIR) && del /s *$(a) *.def *.map *.pdb *.bs Makefile *$(o) \
            pm_to_blib
-       -rmdir /s /q $(AUTODIR) || rmdir /s $(AUTODIR)
-       -rmdir /s /q $(COREDIR) || rmdir /s $(COREDIR)
+       -if exist $(AUTODIR) rmdir /s /q $(AUTODIR) || rmdir /s $(AUTODIR)
+       -if exist $(COREDIR) rmdir /s /q $(COREDIR) || rmdir /s $(COREDIR)
 
 install : all installbare installhtml
 
@@ -1284,7 +1302,7 @@ clean :
        -@erase $(WPERLEXE)
        -@erase $(PERLDLL)
        -@erase $(CORE_OBJ)
-       -rmdir /s /q $(MINIDIR) || rmdir /s $(MINIDIR)
+       -if exist $(MINIDIR) rmdir /s /q $(MINIDIR) || rmdir /s $(MINIDIR)
        -@erase $(WIN32_OBJ)
        -@erase $(DLL_OBJ)
        -@erase $(X2P_OBJ)
@@ -1293,3 +1311,19 @@ clean :
        -@erase ..\x2p\*.exe ..\x2p\*.bat
        -@erase *.ilk
        -@erase *.pdb
+
+# Handy way to run perlbug -ok without having to install and run the
+# installed perlbug. We don't re-run the tests here - we trust the user.
+# Please *don't* use this unless all tests pass.
+# If you want to report test failures, use "dmake nok" instead.
+ok: utils
+       $(PERLEXE) -I..\lib ..\utils\perlbug -ok -s "(UNINSTALLED)"
+
+okfile: utils
+       $(PERLEXE) -I..\lib ..\utils\perlbug -ok -s "(UNINSTALLED)" -F perl.ok
+ 
+nok: utils
+       $(PERLEXE) -I..\lib ..\utils\perlbug -nok -s "(UNINSTALLED)"
+ 
+nokfile: utils
+       $(PERLEXE) -I..\lib ..\utils\perlbug -nok -s "(UNINSTALLED)" -F perl.nok