Add various files generated by a Win32 build to .gitignore.

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

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 3f145b8..e67458f 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -522,7 +522,7 @@ LIBOUT_FLAG =
 
 # NOTE: we assume that GCC uses MSVCRT.DLL
 # See comments about PERL_MSVCRT_READFIX in the "cl" compiler section below.
-BUILDOPT       += -fno-strict-aliasing -DPERL_MSVCRT_READFIX
+BUILDOPT       += -fno-strict-aliasing -mms-bitfields -DPERL_MSVCRT_READFIX
 
 .ELSE
 
@@ -1130,18 +1130,20 @@ config.w32 : $(CFGSH_TMPL)
        $(MINIPERL) -I..\lib config_sh.PL --cfgsh-option-file \
            $(mktmp $(CFG_VARS)) config.w32 > ..\config.sh
 
-# this target is for when changes to the main config.sh happen
-# edit config.{b,v,g}c and make this target once for each supported
-# compiler (e.g. `dmake CCTYPE=BORLAND regen_config_h`)
+# this target is for when changes to the main config.sh happen.
+# edit config.gc, then make perl using GCC in a minimal configuration (i.e.
+# with MULTI, ITHREADS, IMP_SYS, LARGE_FILES, PERLIO and CRYPT off), then make
+# this target to regenerate config_H.gc.
+# unfortunately, some further manual editing is also then required to restore all
+# the special _MSC_VER handling that is otherwise lost.
+# repeat for config.bc and config_H.bc (using BORLAND), except that there is no
+# _MSC_VER stuff in that case.
 regen_config_h:
-       perl config_sh.PL --cfgsh-option-file $(mktmp $(CFG_VARS)) \
+       $(MINIPERL) -I..\lib 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
+       cd .. && miniperl configpm
        -del /f $(CFGH_TMPL)
-       -mkdir $(COREDIR)
-       -perl config_h.PL "INST_VER=$(INST_VER)"
+       -$(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)"
        rename config.h $(CFGH_TMPL)
 
 $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl
@@ -1505,6 +1507,9 @@ distclean: realclean
        -if exist $(LIBDIR)\Encode rmdir /s /q $(LIBDIR)\Encode
        -if exist $(LIBDIR)\Filter\Util rmdir /s /q $(LIBDIR)\Filter\Util
        -if exist $(LIBDIR)\Hash rmdir /s /q $(LIBDIR)\Hash
+       -if exist $(LIBDIR)\App rmdir /s /q $(LIBDIR)\App
+       -if exist $(LIBDIR)\Module\Pluggable rmdir /s /q $(LIBDIR)\Module\Pluggable
+       -if exist $(LIBDIR)\TAP rmdir /s /q $(LIBDIR)\TAP
        -if exist $(LIBDIR)\IO\Compress rmdir /s /q $(LIBDIR)\IO\Compress
        -if exist $(LIBDIR)\IO\Socket rmdir /s /q $(LIBDIR)\IO\Socket
        -if exist $(LIBDIR)\IO\Uncompress rmdir /s /q $(LIBDIR)\IO\Uncompress
@@ -1547,6 +1552,7 @@ distclean: realclean
        -if exist pod2htmd.tmp del pod2htmd.tmp
        -if exist pod2htmi.tmp del pod2htmi.tmp
        -if exist $(HTMLDIR) rmdir /s /q $(HTMLDIR)
+       -del /f ..\t\test_state
 
 install : all installbare installhtml