diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-19 00:57:35 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-19 01:49:31 +0100 |
| commit | 769777b0a24c77377c612d84537c40a2b55abfa6 (patch) | |
| tree | 05991e8eae7fdde85812824bd865db010b89c5d9 /Configurations/unix-Makefile.tmpl | |
| parent | 91056e72693b4ee8cb5339d9091871ffc3b6f776 (diff) | |
Use the dependencies received in generatesrc()
generatesrc() did already receive dependency information, but never
used it, and never really needed to... until now.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index f60a11f6c3..77ba75b44a 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -802,10 +802,11 @@ configdata.pm: $(SRCDIR)/Configurations/unix-Makefile.tmpl $(SRCDIR)/Configurati my %args = @_; my $generator = join(" ", @{$args{generator}}); my $incs = join("", map { " -I".$_ } @{$args{incs}}); + my $deps = join(" ", @{$args{deps}}); if ($args{src} !~ /\.[sS]$/) { return <<"EOF"; -$args{src}: $args{generator}->[0] +$args{src}: $args{generator}->[0] $deps \$(PERL) $generator > \$@ EOF } else { @@ -825,7 +826,7 @@ EOF if ($args{src} =~ /\.S$/) { (my $target = $args{src}) =~ s|\.S$|.s|; return <<"EOF"; -$target: $args{generator}->[0] +$target: $args{generator}->[0] $deps ( trap "rm -f \$@.*" INT 0; \\ $generator \$@.S; \\ \$(CC) \$(CFLAGS) $incs -E -P \$@.S > \$@.i && mv -f \$@.i \$@ ) @@ -833,12 +834,12 @@ EOF } # Otherwise.... return <<"EOF"; -$args{src}: $args{generator}->[0] +$args{src}: $args{generator}->[0] $deps $generator \$@ EOF } return <<"EOF"; -$args{src}: $args{generator}->[0] +$args{src}: $args{generator}->[0] $deps \$(CC) \$(CFLAGS) $incs -E -P \$< > \$@ EOF } |