Harmonise the two methods to generate dependency files

One of them didn't clean away .d.tmp files properly.
The other would overwrite the .d files unconditionally, thereby
causing a possibly unnecessary dependency rebuild, which touches the
date of Makefile, which causes a possibly unnecessary rebuild of
buildinf.h and everything that depends on that.

Reviewed-by: Andy Polyakov <appro@openssl.org>

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 20fc076d8f869b4558e598f7f4f4b76d5472904e..3718467fac5ed334f7833f2c21107bd98d94f077 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -886,8 +886,12 @@ $obj$depext: $deps
        rm -f \$\@.tmp; touch \$\@.tmp
        -\$(MAKEDEPEND) -f\$\@.tmp -o"|$obj$objext" -- \$(CFLAGS) $ecflags$incs -- $srcs \\
            2>/dev/null
-       sed -e 's/^.*|//' -e 's/ \\/\\(\\\\.\\|[^ ]\\)*//g' -e '/: *\$\$/d' -e '/^\\(#.*\\| *\\)\$\$/d' \$\@.tmp > \$\@
-       rm \$\@.tmp
+       sed -i -e 's/^.*|//' -e 's/ \\/\\(\\\\.\\|[^ ]\\)*//g' -e '/: *\$\$/d' -e '/^\\(#.*\\| *\\)\$\$/d' \$\@.tmp
+       \@if ! cmp \$\@.tmp \$\@ > /dev/null 2> /dev/null; then \\
+               mv \$\@.tmp \$\@; \\
+       else \\
+               rm -f \$\@.tmp; \\
+       fi
 EOF
           $deps = $obj.$depext;
       }
@@ -904,6 +908,8 @@ $obj$objext: $deps
        \@touch $obj$depext.tmp
        \@if ! cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\
                mv $obj$depext.tmp $obj$depext; \\
+       else \\
+               rm -f $obj$depext.tmp; \\
        fi
 EOF
       }