diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-18 11:02:42 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-18 23:41:29 +0100 |
| commit | 7d1037661afedc008f0abbd050c492e23905b431 (patch) | |
| tree | 5f78929a9507a8e1b45eac7940ed94353dbcb7ff /Configurations | |
| parent | d1776fdecd6a8677a281a85498a74a8480739689 (diff) | |
Fix the makedepend constructor in unix-Makefile.tmpl
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 9cbab4390a..bae16fd4fd 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -126,6 +126,7 @@ NM= $(CROSS_COMPILE){- $target{nm} || "nm" -} RM= rm -f TAR= {- $target{tar} || "tar" -} TARFLAGS= {- $target{tarflags} -} +MAKEDEPEND=$(CROSS_COMPILE){- $config{makedepprog} -} BASENAME= openssl NAME= $(BASENAME)-$(VERSION) @@ -180,7 +181,7 @@ clean: libclean -rm -f `find $(BLDDIR) -type l` rm -f $(TARFILE) -DCLEAN_CMD=sed -e '/^DO NOT DELETE.*/,$$d' +DCLEAN_CMD=sed -e '/^. DO NOT DELETE.*/,$$d' dclean: $(DCLEAN_CMD) < Makefile >Makefile.new mv -f Makefile.new Makefile @@ -743,10 +744,11 @@ Makefile: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/confi return <<"EOF"; $dep : $deps rm -f \$\@.tmp; touch \$\@.tmp - \$(MAKEDEPEND) -f\$\@.tmp -o"|$obj"\ - -- -DOPENSSL_DOING_MAKEDEPEND \$(DEPFLAGS)$incs \ - -- $srcs - sed -e 's/^.*|//' -e 's/ \\/\\(\\\\.\\|[^ ]\\)*//g' -e '/: *\$/d' -e '/^\\(#.*\\| *\\)\$/d' \$\@.tmp > \$\@ + \$(MAKEDEPEND) -f\$\@.tmp -o"|$obj" \\ + -- -DOPENSSL_DOING_MAKEDEPEND \$(DEPFLAGS)$incs \\ + -- $srcs \\ + 2>/dev/null + sed -e 's/^.*|//' -e 's/ \\/\\(\\\\.\\|[^ ]\\)*//g' -e '/: *\$\$/d' -e '/^\\(#.*\\| *\\)\$\$/d' \$\@.tmp > \$\@ rm \$\@.tmp EOF } |