Small cleanups in Configure

- Small rearrangement of the TABLE and HASH printouts, and adding
  printout of the "build_scheme" item
- Renamed "engines_obj" to "padlock_obj"
- Moved the runs of dofile down...  it didn't quite make sense to have
  that in the middle of a printout

Reviewed-by: Rich Salz <rsalz@openssl.org>

3 files changed, 6 insertions, 6 deletions

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index c5ff592e33..2ff2c2a3e9 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -15,7 +15,7 @@
 	wp_obj		=> "wp_block.o",
 	cmll_obj	=> "camellia.o cmll_misc.o cmll_cbc.o",
 	modes_obj	=> "",
-	engines_obj	=> "",
+	padlock_obj	=> "",
 	chacha_obj	=> "chacha_enc.o",
 	poly1305_obj	=> "",
 
@@ -43,7 +43,7 @@
 	wp_obj		=> "wp_block.o wp-mmx.o",
 	cmll_obj	=> "cmll-x86.o",
 	modes_obj	=> "ghash-x86.o",
-	engines_obj	=> "e_padlock-x86.o"
+	padlock_obj	=> "e_padlock-x86.o"
     },
     x86_elf_asm => {
 	template	=> 1,
@@ -62,7 +62,7 @@
 	wp_obj          => "wp-x86_64.o",
 	cmll_obj        => "cmll-x86_64.o cmll_misc.o",
 	modes_obj       => "ghash-x86_64.o aesni-gcm-x86_64.o",
-	engines_obj     => "e_padlock-x86_64.o"
+	padlock_obj     => "e_padlock-x86_64.o"
     },
     ia64_asm => {
 	template	=> 1,
diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf
index 76dd1b7329..bf27587da0 100644
--- a/Configurations/90-team.conf
+++ b/Configurations/90-team.conf
@@ -82,7 +82,7 @@
         rc5_obj          => "rc5-586.o",
         wp_obj           => "wp_block.o wp-mmx.o",
         modes_obj        => "ghash-x86.o",
-        engines_obj      => "e_padlock-x86.o",
+        padlock_obj      => "e_padlock-x86.o",
         perlasm_scheme   => "elf",
         dso_scheme       => "dlfcn",
         shared_target    => "linux-shared",
diff --git a/Configurations/README b/Configurations/README
index 2faf89630b..c4a741361e 100644
--- a/Configurations/README
+++ b/Configurations/README
@@ -225,7 +225,7 @@ In each table entry, the following keys are significant:
                            Defaults to 'camellia.o cmll_misc.o cmll_cbc.o'
         modes_obj       => assembler implementation of the
                            functions gcm_gmult_4bit and gcm_ghash_4bit.
-        engines_obj     => assembler implementation of core parts of
+        padlock_obj     => assembler implementation of core parts of
                            the padlock engine.  This is mandatory on
                            any platform where the padlock engine might
                            actually be built.
@@ -293,4 +293,4 @@ Historically, the target configurations came in form of a string with
 values separated by colons.  This use is deprecated.  The string form
 looked like this:
 
-   "target" => "{cc}:{cflags}:{unistd}:{thread_cflag}:{sys_id}:{lflags}:{bn_ops}:{cpuid_obj}:{bn_obj}:{ec_obj}:{des_obj}:{aes_obj}:{bf_obj}:{md5_obj}:{sha1_obj}:{cast_obj}:{rc4_obj}:{rmd160_obj}:{rc5_obj}:{wp_obj}:{cmll_obj}:{modes_obj}:{engines_obj}:{perlasm_scheme}:{dso_scheme}:{shared_target}:{shared_cflag}:{shared_ldflag}:{shared_extension}:{ranlib}:{arflags}:{multilib}"
+   "target" => "{cc}:{cflags}:{unistd}:{thread_cflag}:{sys_id}:{lflags}:{bn_ops}:{cpuid_obj}:{bn_obj}:{ec_obj}:{des_obj}:{aes_obj}:{bf_obj}:{md5_obj}:{sha1_obj}:{cast_obj}:{rc4_obj}:{rmd160_obj}:{rc5_obj}:{wp_obj}:{cmll_obj}:{modes_obj}:{padlock_obj}:{perlasm_scheme}:{dso_scheme}:{shared_target}:{shared_cflag}:{shared_ldflag}:{shared_extension}:{ranlib}:{arflags}:{multilib}"