diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-10-21 11:11:04 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-10-31 15:47:56 +0100 |
| commit | 222b0a8e1a43e67c8d65fd325828d8860ed2d348 (patch) | |
| tree | 60738fb8a4c7058d19e777097419fd777b64956a /Configurations/unix-Makefile.tmpl | |
| parent | 3b1928fe64e36634e09482c721f4d3d0c10047a8 (diff) | |
Configuration: when building the dirinfo structure, include shared_sources
This makes sure that any resulting directory target in the build files
also depend on object files meant for shared libraries.
As a side effect, we move the production of the dirinfo structure from
common.tmpl to Configure, to make it easier to check the result.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7452)
(cherry picked from commit b6e660754c2e799cffe4906269fcace0e07c73bc)
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index b92dae2813..fe8a220004 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1242,6 +1242,10 @@ EOF lib => $libext, bin => $exeext ); + # We already have a 'test' target, and the top directory is just plain + # silly + return if $dir eq "test" || $dir eq "."; + foreach my $type (("dso", "lib", "bin", "script")) { next unless defined($unified_info{dirinfo}->{$dir}->{products}->{$type}); # For lib object files, we could update the library. However, it @@ -1262,7 +1266,7 @@ EOF my $deps = join(" ", @deps); my $actions = join("\n", "", @actions); return <<"EOF"; -$args{dir} $args{dir}/: $deps$actions +$dir $dir/: $deps$actions EOF } "" # Important! This becomes part of the template result. |