Re: new C3 MRO patch

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

diff --git a/win32/Makefile b/win32/Makefile
index 90570b9..d654fae 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -593,6 +593,9 @@ UTILS               =                       \
                ..\utils\prove          \
                ..\utils\ptar           \
                ..\utils\ptardiff       \
+               ..\utils\cpanp-run-perl \
+               ..\utils\cpanp  \
+               ..\utils\cpan2dist      \
                ..\utils\shasum         \
                ..\utils\instmodsh      \
                ..\pod\checkpods        \
@@ -644,6 +647,7 @@ MICROCORE_SRC       =               \
                ..\dump.c       \
                ..\globals.c    \
                ..\gv.c         \
+               ..\mro.c        \
                ..\hv.c         \
                ..\locale.c     \
                ..\mathoms.c    \
@@ -771,7 +775,7 @@ SETARGV_OBJ = setargv$(o)
 
 # specify static extensions here
 #STATIC_EXT    = Cwd Compress/Raw/Zlib
-STATIC_EXT     = 
+STATIC_EXT     = Win32CORE
 
 DYNALOADER     = $(EXTDIR)\DynaLoader\DynaLoader
 
@@ -1005,26 +1009,26 @@ MakePPPort_clean:
 Extensions: buildext.pl $(PERLDEP) $(CONFIGPM)
        $(XCOPY) ..\*.h $(COREDIR)\*.*
        $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --dynamic
-       $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic
+       -if exist ext $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic
 
 Extensions_reonly: buildext.pl $(PERLDEP) $(CONFIGPM)
        $(XCOPY) ..\*.h $(COREDIR)\*.*
        $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --dynamic +re
-       $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic +re
+       -if exist ext $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --dynamic +re
 
 Extensions_static : buildext.pl $(PERLDEP) $(CONFIGPM)
        $(XCOPY) ..\*.h $(COREDIR)\*.*
        $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) --static
-       $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --static
+       -if exist ext $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext --static
        $(MINIPERL) -I..\lib buildext.pl --list-static-libs > Extensions_static
 
 Extensions_clean: 
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean
-       -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext clean
+       -if exist $(MINIPERL) if exist ext $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext clean
 
 Extensions_realclean: 
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) realclean
-       -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext realclean
+       -if exist $(MINIPERL) if exist ext $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) ext realclean
 
 #-------------------------------------------------------------------------------
 
@@ -1124,6 +1128,7 @@ distclean: realclean
        -del /f $(LIBDIR)\Unicode\Normalize.pm
        -del /f $(LIBDIR)\Math\BigInt\FastCalc.pm
        -del /f $(LIBDIR)\Win32.pm
+       -del /f $(LIBDIR)\Win32CORE.pm
        -del /f $(LIBDIR)\Win32API\File.pm
        -del /f $(LIBDIR)\Win32API\File\cFile.pc
        -if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B
@@ -1159,7 +1164,7 @@ distclean: realclean
            podchecker podselect
        -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
            perldoc perlivp dprofpp libnetcfg enc2xs piconv cpan *.bat \
-           xsubpp instmodsh prove ptar ptardiff shasum corelist config_data
+           xsubpp instmodsh prove ptar ptardiff cpanp-run-perl cpanp cpan2dist shasum corelist config_data
        -cd ..\x2p && del /f find2perl s2p psed *.bat
        -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new \
                perlmainst.c
@@ -1167,7 +1172,11 @@ distclean: realclean
        -del /f bin\*.bat
        -del /f perllibst.h
        -del /f $(PERLEXE_ICO) perl.base
+       ren ..\lib\Net\Changes.libnet Changes.tenbil
+       ren ..\lib\Net\README.libnet  README.tenbil     
        -cd .. && del /s *.lib *.map *.pdb *.ilk *.bs *$(o) .exists pm_to_blib
+       ren ..\lib\Net\Changes.tenbil Changes.libnet
+       ren ..\lib\Net\README.tenbil  README.libnet     
        -cd $(EXTDIR) && del /s *.def Makefile Makefile.old
        -if exist $(AUTODIR) rmdir /s /q $(AUTODIR)
        -if exist $(COREDIR) rmdir /s /q $(COREDIR)
@@ -1272,7 +1281,11 @@ _clean :
        -@$(DEL) $(WIN32_OBJ)
        -@$(DEL) $(DLL_OBJ)
        -@$(DEL) $(X2P_OBJ)
+       ren ..\lib\Net\Changes.libnet Changes.tenbil
+       ren ..\lib\Net\README.libnet  README.tenbil     
        -@$(DEL) ..\*$(o) ..\*.lib ..\*.exp *$(o) *.lib *.exp *.res
+       ren ..\lib\Net\Changes.tenbil Changes.libnet
+       ren ..\lib\Net\README.tenbil  README.libnet     
        -@$(DEL) ..\t\*.exe ..\t\*.dll ..\t\*.bat
        -@$(DEL) ..\x2p\*.exe ..\x2p\*.bat
        -@$(DEL) *.ilk