[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  90b3a620f56da8d8ef9c4c76919d0dca51150685 (commit)
       via  cf54d00aa82302d2570531b4bd7841230ced0555 (commit)
      from  54f007af94b8924a46786b34665223c127c19081 (commit)


- Log -----------------------------------------------------------------
commit 90b3a620f56da8d8ef9c4c76919d0dca51150685
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sun Apr 15 15:51:07 2018 +0200

    Remove mandatory generated files on VMS too
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5958)

commit cf54d00aa82302d2570531b4bd7841230ced0555
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sun Apr 15 12:07:17 2018 +0200

    Remove mandatory generated files on windows too
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5958)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/descrip.mms.tmpl      | 1 +
 Configurations/windows-makefile.tmpl | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index bbd9b0e..70e566e 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -491,6 +491,7 @@ clean : libclean
         {- join("\n\t", map { "- DELETE $_.EXE;*,$_.OPT;*" } @{$unified_info{programs}}) || "@ !" -}
         {- join("\n\t", map { "- DELETE $_.EXE;*,$_.OPT;*" } @{$unified_info{engines}}) || "@ !" -}
         {- join("\n\t", map { "- DELETE $_;*" } @{$unified_info{scripts}}) || "@ !" -}
+        {- join("\n\t", map { "- DELETE $_;*" } @{$unified_info{depends}->{""}}) || "@ !" -}
         {- join("\n\t", map { "- DELETE $_;*" } @generated) || "@ !" -}
         - DELETE [...]*.MAP;*
         - DELETE [...]*.D;*
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index c51e4c7..0fe6ca2 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -360,10 +360,12 @@ clean: libclean
 	{- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) -}
 	-del /Q /F $(ENGINES)
 	-del /Q /F $(SCRIPTS)
+	-del /Q /F $(GENERATED_MANDATORY)
 	-del /Q /F $(GENERATED)
 	-del /Q /S /F *.d *.obj *.pdb *.exp *.ilk *.manifest
 	-del /Q /S /F engines\*.lib
 	-del /Q /S /F apps\*.lib apps\*.rc apps\*.res
+	-rmdir /Q /S test\test-runs
 
 distclean: clean
 	-del /Q /F configdata.pm