Re: [PATCH] More "distclean" tidy ups on Win32

Message-ID: <404EF4C7.9090107@uk.radan.com>

p4raw-id: //depot/perl@22481

diff --git a/win32/Makefile b/win32/Makefile
index b9f9589..d84b4a8 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -965,6 +965,9 @@ Extensions: buildext.pl $(PERLDEP) $(CONFIGPM)
 Extensions_clean: 
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean
 
+Extensions_realclean: 
+       -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) realclean
+
 #----------------------------------------------------------------------------------
 
 doc: $(PERLEXE)
@@ -1028,7 +1031,7 @@ utils: $(PERLEXE) $(X2P)
 
 # the doubled rmdir calls are needed because older cmd shells
 # don't understand /q
-distclean: clean
+distclean: realclean
        -del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \
                $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD)
        -del /f *.def *.map
@@ -1040,7 +1043,7 @@ distclean: clean
        -del /f $(LIBDIR)\Encode.pm $(LIBDIR)\encoding.pm $(LIBDIR)\Errno.pm
        -del /f $(LIBDIR)\Config.pod $(LIBDIR)\POSIX.pod $(LIBDIR)\threads.pm
        -del /f $(LIBDIR)\.exists $(LIBDIR)\attrs.pm $(LIBDIR)\DynaLoader.pm
-       -del /f $(LIBDIR)\XSLoader.pm
+       -del /f $(LIBDIR)\XSLoader.pm $(LIBDIR)\lib.pm
        -del /f $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm
        -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm
        -del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm
@@ -1153,7 +1156,7 @@ _test :
        $(PERLEXE) -I..\lib harness
        cd ..\win32
 
-clean : Extensions_clean
+_clean :
        -@$(DEL) miniperlmain$(o)
        -@$(DEL) $(MINIPERL)
        -@$(DEL) perlglob$(o)
@@ -1176,6 +1179,10 @@ clean : Extensions_clean
        -@$(DEL) *.ilk
        -@$(DEL) *.pdb
 
+clean : Extensions_clean _clean
+
+realclean : Extensions_realclean _clean
+
 # 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.

diff --git a/win32/makefile.mk b/win32/makefile.mk
index df63195..2147995 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1105,6 +1105,9 @@ Extensions : buildext.pl $(PERLDEP) $(CONFIGPM)
 Extensions_clean :
        -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) clean
 
+Extensions_realclean :
+       -if exist $(MINIPERL) $(MINIPERL) -I..\lib buildext.pl $(MAKE) $(PERLDEP) $(EXTDIR) realclean
+
 #----------------------------------------------------------------------------------
 
 
@@ -1162,7 +1165,7 @@ utils: $(PERLEXE) $(X2P)
 # Note that the pod cleanup in this next section is parsed (and regenerated
 # by pod/buildtoc so please check that script before making changes here
 
-distclean: clean
+distclean: realclean
        -del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \
                $(PERLIMPLIB) ..\miniperl$(a) $(MINIMOD)
        -del /f *.def *.map
@@ -1173,7 +1176,7 @@ distclean: clean
        -del /f $(LIBDIR)\Encode.pm $(LIBDIR)\encoding.pm $(LIBDIR)\Errno.pm
        -del /f $(LIBDIR)\Config.pod $(LIBDIR)\POSIX.pod $(LIBDIR)\threads.pm
        -del /f $(LIBDIR)\.exists $(LIBDIR)\attrs.pm $(LIBDIR)\DynaLoader.pm
-       -del /f $(LIBDIR)\XSLoader.pm
+       -del /f $(LIBDIR)\XSLoader.pm $(LIBDIR)\lib.pm
        -del /f $(LIBDIR)\Fcntl.pm $(LIBDIR)\IO.pm $(LIBDIR)\Opcode.pm
        -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm
        -del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm
@@ -1291,7 +1294,7 @@ _test : $(RIGHTMAKE)
 .ENDIF
        cd ..\t && $(PERLEXE) -I..\lib harness
 
-clean : Extensions_clean
+_clean :
        -@erase miniperlmain$(o)
        -@erase $(MINIPERL)
        -@erase perlglob$(o)
@@ -1314,6 +1317,10 @@ clean : Extensions_clean
        -@erase *.ilk
        -@erase *.pdb
 
+clean : Extensions_clean _clean
+
+realclean : Extensions_realclean _clean
+
 # 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.