Proper pluggable Method Resolution Orders. 'c3' is now implemented outside the

[p5sagit/p5-mst-13.2.git] / win32 / Makefile

diff --git a/win32/Makefile b/win32/Makefile
index 35aa452..1f1120c 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -388,10 +388,10 @@ DELAYLOAD = -DELAYLOAD:ws2_32.dll delayimp.lib
 # installed too.
 !IF "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" || \
     "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE"
-EMBED_EXE_MANI = mt -nologo -manifest $@.manifest -outputresource:$@;1 && \
-                 del $@.manifest
-EMBED_DLL_MANI = mt -nologo -manifest $@.manifest -outputresource:$@;2 && \
-                 del $@.manifest
+EMBED_EXE_MANI = if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1 && \
+                 if exist $@.manifest del $@.manifest
+EMBED_DLL_MANI = if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2 && \
+                 if exist $@.manifest del $@.manifest
 !ENDIF
 
 ARCHDIR                = ..\lib\$(ARCHNAME)
@@ -616,7 +616,6 @@ UTILS               =                       \
                ..\utils\cpan2dist      \
                ..\utils\shasum         \
                ..\utils\instmodsh      \
-               ..\pod\checkpods        \
                ..\pod\pod2html         \
                ..\pod\pod2latex        \
                ..\pod\pod2man          \
@@ -1104,6 +1103,7 @@ utils: $(PERLEXE) $(X2P)
        copy ..\README.dos      ..\pod\perldos.pod
        copy ..\README.epoc     ..\pod\perlepoc.pod
        copy ..\README.freebsd  ..\pod\perlfreebsd.pod
+       copy ..\README.haiku    ..\pod\perlhaiku.pod
        copy ..\README.hpux     ..\pod\perlhpux.pod
        copy ..\README.hurd     ..\pod\perlhurd.pod
        copy ..\README.irix     ..\pod\perlirix.pod
@@ -1183,6 +1183,10 @@ 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)\mro rmdir /s /q $(LIBDIR)\mro
        -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
@@ -1194,18 +1198,18 @@ distclean: realclean
        -if exist $(LIBDIR)\threads rmdir /s /q $(LIBDIR)\threads
        -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS
        -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API
-       -cd $(PODDIR) && del /f *.html *.bat checkpods \
+       -cd $(PODDIR) && del /f *.html *.bat podchecker \
            perlaix.pod perlamiga.pod perlapollo.pod perlbeos.pod \
            perlbs2000.pod perlce.pod perlcn.pod perlcygwin.pod \
            perldelta.pod perldgux.pod perldos.pod perlepoc.pod \
-           perlfreebsd.pod perlhpux.pod perlhurd.pod perlirix.pod \
-           perljp.pod perlko.pod perllinux.pod perlmachten.pod \
-           perlmacos.pod perlmacosx.pod perlmint.pod perlmpeix.pod \
-           perlnetware.pod perlopenbsd.pod perlos2.pod perlos390.pod \
-           perlos400.pod perlplan9.pod perlqnx.pod perlriscos.pod \
-           perlsolaris.pod perlsymbian.pod perltru64.pod perltw.pod \
-           perluts.pod perlvmesa.pod perlvms.pod perlvms.pod perlvos.pod \
-           perlwin32.pod \
+           perlfreebsd.pod perlhaiku.pod perlhpux.pod perlhurd.pod \
+           perlirix.pod perljp.pod perlko.pod perllinux.pod \
+           perlmachten.pod perlmacos.pod perlmacosx.pod perlmint.pod \
+           perlmpeix.pod perlnetware.pod perlopenbsd.pod perlos2.pod \
+           perlos390.pod perlos400.pod perlplan9.pod perlqnx.pod \
+           perlriscos.pod perlsolaris.pod perlsymbian.pod perltru64.pod \
+           perltw.pod perluts.pod perlvmesa.pod perlvms.pod perlvms.pod \
+           perlvos.pod perlwin32.pod \
            pod2html pod2latex pod2man pod2text pod2usage \
            podchecker podselect
        -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
@@ -1225,6 +1229,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