From edef840f23b31066df4333995f544ae0f32d3e09 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 8 Jun 2017 08:02:26 +0200 Subject: [PATCH] Windows: rearrange programs cleanup The list of programs hit nmake's maximum line length, so we split up the line in smaller chunks. Fixes #3634 Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3636) --- Configurations/windows-makefile.tmpl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 87ad3896d4..dcee51954e 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -78,7 +78,7 @@ SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{libraries}}) -} SHLIBPDBS={- join(" ", map { local $shlibext = ".pdb"; shlib($_) } @{$unified_info{libraries}}) -} ENGINES={- join(" ", map { dso($_) } @{$unified_info{engines}}) -} ENGINEPDBS={- join(" ", map { local $dsoext = ".pdb"; dso($_) } @{$unified_info{engines}}) -} -PROGRAMS={- join(" ", map { $_.$exeext } @{$unified_info{programs}}) -} +PROGRAMS={- our @PROGRAMS = map { $_.$exeext } @{$unified_info{programs}}; join(" ", @PROGRAMS) -} PROGRAMPDBS={- join(" ", map { $_.".pdb" } @{$unified_info{programs}}) -} SCRIPTS={- join(" ", @{$unified_info{scripts}}) -} {- output_off() if $disabled{makedepend}; "" -} @@ -235,7 +235,9 @@ libclean: -del /Q ossl_static.pdb clean: libclean - -del /Q /F $(PROGRAMS) $(ENGINES) $(SCRIPTS) + {- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) -} + -del /Q /F $(ENGINES) + -del /Q /F $(SCRIPTS) -del /Q /F $(GENERATED) -del /Q /S /F *.d -del /Q /S /F *.obj -- 2.34.1