diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-03-19 00:05:25 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-03-21 11:30:14 +0100 |
| commit | bb6b950e1c9ae118ba08458645589f815e3bcd90 (patch) | |
| tree | 1bdb57118b1a2bac3090fdfc1bdd43db15a73d36 /Configurations | |
| parent | acf1525966161dc5d0f875d92ae3def5df628245 (diff) | |
| download | openssl-bb6b950e1c9ae118ba08458645589f815e3bcd90.zip openssl-bb6b950e1c9ae118ba08458645589f815e3bcd90.tar.gz openssl-bb6b950e1c9ae118ba08458645589f815e3bcd90.tar.bz2 | |
Configurations/windows-makefile.tmpl: respect no-makedepend.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 89c9e49c..d2c5eb6 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -61,9 +61,11 @@ PROGRAMS={- join(" ", map { $_.$exeext } grep { !m|^test\\| } @{$unified_info{pr TESTPROGS={- join(" ", map { $_.$exeext } grep { m|^test\\| } @{$unified_info{programs}}) -} SCRIPTS={- join(" ", @{$unified_info{scripts}}) -} +{- output_off() if $disabled{makedepend}; "" -} DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; } grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ } keys %{$unified_info{sources}}); -} +{- output_on() if $disabled{makedepend}; "" -} # Do not edit these manually. Use Configure with --prefix or --openssldir # to change this! Short explanation in the top comment in Configure @@ -311,7 +313,7 @@ $obj$objext: $deps \$(AS) \$(ASFLAGS) \$(ASOUTFLAG)\$\@ $srcs EOF } - return <<"EOF"; + return <<"EOF" if (!$disabled{makedepend}); $obj$depext: $deps \$(CC) \$(CFLAGS) $ecflags$inc /Zs /showIncludes $srcs 2>&1 | \\ \$(PERL) -n << > $obj$depext @@ -325,6 +327,10 @@ $obj$objext: $obj$depext $srcs << EOF + return <<"EOF" if ($disabled{makedepend}); +$obj$objext: $deps + \$(CC) \$(CFLAGS) $ecflags$incs -c \$(COUTFLAG)\$\@ $srcs +EOF } # On Unix, we build shlibs from static libs, so we're ignoring the |