00-base-templates.conf: wire keccak1600-armv8 module.

[openssl.git] / Configurations / windows-makefile.tmpl

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 1c6ce516c5d95405a9d04dfb3c31d1e307148574..0fe6ca2a17810ff084100e7bf7ff6b6865ffec5c 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -319,6 +319,11 @@ build_apps build_tests: build_programs
 # Convenience target to prebuild all generated files, not just the mandatory
 # ones
 build_all_generated: $(GENERATED_MANDATORY) $(GENERATED)
+       @rem {- output_off() if $disabled{makedepend}; "" -}
+       @echo "Warning: consider configuring with no-makedepend, because if"
+       @echo "         target system doesn't have $(PERL),"
+       @echo "         then make will fail..."
+       @rem {- output_on() if $disabled{makedepend}; "" -}
 
 test: tests
 {- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep
@@ -355,10 +360,12 @@ clean: libclean
        {- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) -}
        -del /Q /F $(ENGINES)
        -del /Q /F $(SCRIPTS)
+       -del /Q /F $(GENERATED_MANDATORY)
        -del /Q /F $(GENERATED)
        -del /Q /S /F *.d *.obj *.pdb *.exp *.ilk *.manifest
        -del /Q /S /F engines\*.lib
        -del /Q /S /F apps\*.lib apps\*.rc apps\*.res
+       -rmdir /Q /S test\test-runs
 
 distclean: clean
        -del /Q /F configdata.pm
@@ -579,6 +586,11 @@ EOF
          return <<"EOF";
 $obj$objext: $deps
        \$(AS) $asflags \$(ASOUTFLAG)\$\@ $srcs
+EOF
+     } elsif ($srcs[0] =~ /.S$/) {
+         return <<"EOF";
+$obj$objext: $deps
+       \$(CC) /EP /D__ASSEMBLER__ $cflags $srcs > \$@.asm && \$(AS) $asflags \$(ASOUTFLAG)\$\@ \$@.asm
 EOF
      }
      return <<"EOF"    if (!$disabled{makedepend});