From c3ad47f501303f86a7ae9bf957f5d05615ec84ff Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Tue, 10 May 2016 00:06:11 +0200 Subject: [PATCH] windows-makefile.tmpl: minor adjustments. - some Perl versions are allergic to missing ';'; - don't stop if del fails; - omit unused environment variable; Reviewed-by: Stephen Henson --- Configurations/windows-makefile.tmpl | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 887b7a2bea..3be7f768ab 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -163,19 +163,19 @@ install: install_sw install_ssldirs install_docs uninstall: uninstall_docs uninstall_sw libclean: - $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*""" } @ARGV" $(SHLIBS) - del /Q /F $(LIBS) - del lib.pdb + $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*"""; } @ARGV" $(SHLIBS) + -del /Q /F $(LIBS) + -del lib.pdb clean: libclean - del /Q /F $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS) - del /Q /S /F *.asm - del /Q /S /F *.d - del /Q /S /F *.obj - del /Q /S /F *.pdb - del /Q /S /F *.exp - del /Q /S /F engines\*.ilk - del /Q /S /F engines\*.lib + -del /Q /F $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS) + -del /Q /S /F *.asm + -del /Q /S /F *.d + -del /Q /S /F *.obj + -del /Q /S /F *.pdb + -del /Q /S /F *.exp + -del /Q /S /F engines\*.ilk + -del /Q /S /F engines\*.lib depend: @@ -281,7 +281,6 @@ EOF return <<"EOF"; $target: $args{generator}->[0] $deps set ASM=\$(AS) - set CC=\$(CC) $generator \$@.S \$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@.i && move /Y \$@.i \$@ del /Q \$@.S @@ -291,7 +290,6 @@ EOF return <<"EOF"; $target: $args{generator}->[0] $deps set ASM=\$(AS) - set CC=\$(CC) $generator \$@ EOF } -- 2.25.1