提交 c3ad47f5 编写于 作者: A Andy Polyakov

windows-makefile.tmpl: minor adjustments.

- some Perl versions are allergic to missing ';';
- don't stop if del fails;
- omit unused environment variable;
Reviewed-by: NStephen Henson <steve@openssl.org>
上级 6d8b3dce
...@@ -163,19 +163,19 @@ install: install_sw install_ssldirs install_docs ...@@ -163,19 +163,19 @@ install: install_sw install_ssldirs install_docs
uninstall: uninstall_docs uninstall_sw uninstall: uninstall_docs uninstall_sw
libclean: libclean:
$(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*""" } @ARGV" $(SHLIBS) $(PERL) -e "map { m/(.*)\.dll$$/; unlink glob """$$1.*"""; } @ARGV" $(SHLIBS)
del /Q /F $(LIBS) -del /Q /F $(LIBS)
del lib.pdb -del lib.pdb
clean: libclean clean: libclean
del /Q /F $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS) -del /Q /F $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS)
del /Q /S /F *.asm -del /Q /S /F *.asm
del /Q /S /F *.d -del /Q /S /F *.d
del /Q /S /F *.obj -del /Q /S /F *.obj
del /Q /S /F *.pdb -del /Q /S /F *.pdb
del /Q /S /F *.exp -del /Q /S /F *.exp
del /Q /S /F engines\*.ilk -del /Q /S /F engines\*.ilk
del /Q /S /F engines\*.lib -del /Q /S /F engines\*.lib
depend: depend:
...@@ -281,7 +281,6 @@ EOF ...@@ -281,7 +281,6 @@ EOF
return <<"EOF"; return <<"EOF";
$target: $args{generator}->[0] $deps $target: $args{generator}->[0] $deps
set ASM=\$(AS) set ASM=\$(AS)
set CC=\$(CC)
$generator \$@.S $generator \$@.S
\$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@.i && move /Y \$@.i \$@ \$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@.i && move /Y \$@.i \$@
del /Q \$@.S del /Q \$@.S
...@@ -291,7 +290,6 @@ EOF ...@@ -291,7 +290,6 @@ EOF
return <<"EOF"; return <<"EOF";
$target: $args{generator}->[0] $deps $target: $args{generator}->[0] $deps
set ASM=\$(AS) set ASM=\$(AS)
set CC=\$(CC)
$generator \$@ $generator \$@
EOF EOF
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册