diff options
author | Richard Levitte <levitte@openssl.org> | 2019-01-31 00:06:50 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-02-11 16:03:46 +0100 |
commit | 1842f369e5541d8ed9b2716cdd7d516005994733 (patch) | |
tree | 584cf9491c0801fc62d9ed3e9aa16e9ea93ff1fd /Configurations/common.tmpl | |
parent | a43ce58f5569a160272c492c680f2e42d38ec769 (diff) |
ENGINE modules aren't special, so call them MODULES
The only thing that makes an ENGINE module special is its entry
points. Other than that, it's a normal dynamically loadable module,
nothing special about it. This change has us stop pretending anything
else.
We retain using ENGINE as a term for installation, because it's
related to a specific installation directory, and we therefore also
mark ENGINE modules specifically as such with an attribute in the
build.info files.
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/8147)
Diffstat (limited to 'Configurations/common.tmpl')
-rw-r--r-- | Configurations/common.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl index a15971ef98..5ca0d56277 100644 --- a/Configurations/common.tmpl +++ b/Configurations/common.tmpl @@ -143,10 +143,10 @@ $cache{$lib} = 1; } - # doengine is responsible for building engines. It will call + # domodule is responsible for building modules. It will call # obj2dso, and also makes sure all object files for the library # are built. - sub doengine { + sub domodule { my $lib = shift; return "" if $cache{$lib}; $OUT .= obj2dso(lib => $lib, @@ -209,10 +209,10 @@ # Build mandatory generated headers foreach (@{$unified_info{depends}->{""}}) { dogenerate($_); } - # Build all known libraries, engines, programs and scripts. + # Build all known libraries, modules, programs and scripts. # Everything else will be handled as a consequence. foreach (@{$unified_info{libraries}}) { dolib($_); } - foreach (@{$unified_info{engines}}) { doengine($_); } + foreach (@{$unified_info{modules}}) { domodule($_); } foreach (@{$unified_info{programs}}) { dobin($_); } foreach (@{$unified_info{scripts}}) { doscript($_); } |