Commit edef840f authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3636)
parent 3dce1099

Configurations/windows-makefile.tmpl

+4 −2
Original line number Diff line number Diff line
@@ -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