From f3e5948af6a9b27aad9cd3224f67b6231da2f89f Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 20 Mar 2016 02:13:40 +0100 Subject: [PATCH] Have makedepend output to stdout and redirect it This gives us better control of what files are produced. Reviewed-by: Andy Polyakov --- Configurations/unix-Makefile.tmpl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 48cea07d2c..4dced5d9cc 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -858,9 +858,8 @@ EOF if (!$disabled{makedepend} && $makedepprog =~ /\/makedepend/) { $recipe .= <<"EOF"; $obj$depext: $deps - rm -f \$\@.tmp; touch \$\@.tmp - -\$(MAKEDEPEND) -f\$\@.tmp -o"|$obj$objext" -- \$(CFLAGS) $ecflags$incs -- $srcs \\ - 2>/dev/null + -\$(MAKEDEPEND) -f- -o"|$obj$objext" -- \$(CFLAGS) $ecflags$incs -- $srcs \\ + >\$\@.tmp 2>/dev/null -\$(PERL) -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//; \$\$_ = undef if (/: *\$\$/ || /^(#.*| *)\$\$/); \$\$_.="\\n" unless !defined(\$\$_) or /\\R\$\$/g;' \$\@.tmp \@if cmp \$\@.tmp \$\@ > /dev/null 2> /dev/null; then \\ rm -f \$\@.tmp; \\