Windows: don't install __DECC_*.H

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

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 0fe6ca2a17810ff084100e7bf7ff6b6865ffec5c..11acdf00f6abf8ac910e76edebee9e569d17a86b 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -362,9 +362,10 @@ clean: libclean
        -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
+       -del /Q /S /F *.d *.obj *.pdb *.ilk *.manifest
+       -del /Q /S /F engines\*.lib engines\*.exp
+       -del /Q /S /F apps\*.lib apps\*.rc apps\*.res apps\*.exp
+       -del /Q /S /F test\*.exp
        -rmdir /Q /S test\test-runs
 
 distclean: clean
@@ -411,7 +412,8 @@ install_dev:
        @"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\ms\applink.c" \
                                       "$(INSTALLTOP)\include\openssl"
        @rem {- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" } @{$config{defines}}; "" -}
-       @"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\include\openssl\*.h" \
+       @"$(PERL)" "$(SRCDIR)\util\copy.pl" "-exclude_re=/__DECC_" \
+                                      "$(SRCDIR)\include\openssl\*.h" \
                                       "$(INSTALLTOP)\include\openssl"
        @"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BLDDIR)\include\openssl\*.h \
                                       "$(INSTALLTOP)\include\openssl"
@@ -626,6 +628,7 @@ EOF
      return <<"EOF"
 $target: $deps
        IF EXIST $shlib$shlibext.manifest DEL /F /Q $shlib$shlibext.manifest
+       IF EXIST \$@ DEL /F /Q \$@
        \$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) \\
                /implib:\$@ \$(LDOUTFLAG)$shlib$shlibext$shared_def @<< || (DEL /Q \$(\@B).* $shlib.* && EXIT 1)
 $objs