From 9ee3a5bb249434167e7ef02a68d3a94944ce66bf Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 9 Mar 2016 09:05:43 +0100 Subject: [PATCH] Don't add engines if configured "no-engine" Similarly, don't add e_capi if configured "no-capieng" Also, indent a little deeper, for clarity. Reviewed-by: Matt Caswell --- engines/build.info | 53 ++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/engines/build.info b/engines/build.info index c8fba26296..28fce1a5f4 100644 --- a/engines/build.info +++ b/engines/build.info @@ -1,25 +1,32 @@ {- use File::Spec::Functions qw/:DEFAULT rel2abs/; -} -IF[{- $disabled{"dynamic-engine"} -}] - LIBS=../libcrypto - SOURCE[../libcrypto]=\ - e_padlock.c {- $target{padlock_asm_src} -} \ - e_capi.c \ - e_dasync.c -ELSE - ENGINES=padlock capi dasync ossltest - SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -} - DEPEND[padlock]=../libcrypto - INCLUDE[padlock]={- rel2abs(catdir($builddir,"../include")) -} ../include - SOURCE[capi]=e_capi.c - DEPEND[capi]=../libcrypto - INCLUDE[capi]={- rel2abs(catdir($builddir,"../include")) -} ../include - SOURCE[dasync]=e_dasync.c - DEPEND[dasync]=../libcrypto - INCLUDE[dasync]={- rel2abs(catdir($builddir,"../include")) -} ../include - SOURCE[ossltest]=e_ossltest.c - DEPEND[ossltest]=../libcrypto - INCLUDE[ossltest]={- rel2abs(catdir($builddir,"../include")) -} ../include -ENDIF +IF[{- !$disabled{"engine"} -}] + IF[{- $disabled{"dynamic-engine"} -}] + LIBS=../libcrypto + SOURCE[../libcrypto]=\ + e_padlock.c {- $target{padlock_asm_src} -} \ + e_dasync.c + IF[{- !$disabled{capieng} -}] + SOURCE[../libcrypto]=e_capi.c + ENDIF + ELSE + ENGINES=padlock dasync ossltest + SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -} + DEPEND[padlock]=../libcrypto + INCLUDE[padlock]={- rel2abs(catdir($builddir,"../include")) -} ../include + IF[{- !$disabled{capieng} -}] + ENGINES=capi + SOURCE[capi]=e_capi.c + DEPEND[capi]=../libcrypto + INCLUDE[capi]={- rel2abs(catdir($builddir,"../include")) -} ../include + ENDIF + SOURCE[dasync]=e_dasync.c + DEPEND[dasync]=../libcrypto + INCLUDE[dasync]={- rel2abs(catdir($builddir,"../include")) -} ../include + SOURCE[ossltest]=e_ossltest.c + DEPEND[ossltest]=../libcrypto + INCLUDE[ossltest]={- rel2abs(catdir($builddir,"../include")) -} ../include + ENDIF -GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) -GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) + GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) + GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) +ENDIF -- 2.25.1