diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-05-10 00:06:11 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-05-10 20:20:40 +0200 |
| commit | c3ad47f501303f86a7ae9bf957f5d05615ec84ff (patch) | |
| tree | a9b6aa8b2ec4a4ff3bfed189ff694c2a2c6cde27 /Configurations/windows-makefile.tmpl | |
| parent | 6d8b3dce7c8feee8aa9107e2ffcc588c782a6113 (diff) | |
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 <steve@openssl.org>
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 24 |
1 files 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 } |