summaryrefslogtreecommitdiffstats
path: root/engines
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-01-31 00:06:50 +0100
committerRichard Levitte <levitte@openssl.org>2019-02-11 16:03:46 +0100
commit1842f369e5541d8ed9b2716cdd7d516005994733 (patch)
tree584cf9491c0801fc62d9ed3e9aa16e9ea93ff1fd /engines
parentUpdated test command line parsing to support commmon commands (diff)
downloadopenssl-1842f369e5541d8ed9b2716cdd7d516005994733.tar.xz
openssl-1842f369e5541d8ed9b2716cdd7d516005994733.zip
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 'engines')
-rw-r--r--engines/build.info8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/build.info b/engines/build.info
index a4a4d93062..27f1cecf26 100644
--- a/engines/build.info
+++ b/engines/build.info
@@ -11,7 +11,7 @@ IF[{- !$disabled{"engine"} -}]
SOURCE[../libcrypto]=e_afalg.c
ENDIF
ELSE
- ENGINES=padlock
+ MODULES{engine}=padlock
SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -}
DEPEND[padlock]=../libcrypto
INCLUDE[padlock]=../include
@@ -20,7 +20,7 @@ IF[{- !$disabled{"engine"} -}]
GENERATE[padlock.ld]=../util/engines.num
ENDIF
IF[{- !$disabled{capieng} -}]
- ENGINES=capi
+ MODULES{engine}=capi
SOURCE[capi]=e_capi.c
DEPEND[capi]=../libcrypto
INCLUDE[capi]=../include
@@ -30,7 +30,7 @@ IF[{- !$disabled{"engine"} -}]
ENDIF
ENDIF
IF[{- !$disabled{afalgeng} -}]
- ENGINES=afalg
+ MODULES{engine}=afalg
SOURCE[afalg]=e_afalg.c
DEPEND[afalg]=../libcrypto
INCLUDE[afalg]= ../include
@@ -40,7 +40,7 @@ IF[{- !$disabled{"engine"} -}]
ENDIF
ENDIF
- ENGINES{noinst}=ossltest dasync
+ MODULES{noinst,engine}=ossltest dasync
SOURCE[dasync]=e_dasync.c
DEPEND[dasync]=../libcrypto
INCLUDE[dasync]=../include