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/windows-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/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 177d277f74..f40404c021 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -243,10 +243,11 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure (my $target = $args{src}) =~ s/\.[sS]$/.asm/; my $generator = join(" ", @{$args{generator}}); my $incs = join("", map { " /I ".$_ } @{$args{incs}}); + my $deps = join(" ", @{$args{deps}}); if ($target !~ /\.asm$/) { return <<"EOF"; -$target: $args{generator}->[0] +$target: $args{generator}->[0] $deps \$(PERL) $generator > \$@ EOF } else { @@ -263,7 +264,7 @@ EOF # end up generating foo.s in two steps. if ($args{src} =~ /\.S$/) { return <<"EOF"; -$target: $args{generator}->[0] +$target: $args{generator}->[0] $deps set ASM=\$(AS) set CC=\$(CC) $generator \$@.S @@ -273,14 +274,14 @@ EOF } # Otherwise.... return <<"EOF"; -$target: $args{generator}->[0] +$target: $args{generator}->[0] $deps set ASM=\$(AS) set CC=\$(CC) $generator \$@ EOF } return <<"EOF"; -$target: $args{generator}->[0] +$target: $args{generator}->[0] $deps \$(CC) \$(CFLAGS) $incs /EP /C \$< > \$@ EOF } |