Commit 9ee3a5bb authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarMatt Caswell <matt@openssl.org>
parent 707059a9

engines/build.info

+30 −23
Original line number Diff line number Diff line 
{- use File::Spec::Functions qw/:DEFAULT rel2abs/; -}

IF[{- !$disabled{"engine"} -}]

  IF[{- $disabled{"dynamic-engine"} -}]

    LIBS=../libcrypto

    SOURCE[../libcrypto]=\

            e_padlock.c {- $target{padlock_asm_src} -} \

        e_capi.c \

            e_dasync.c

    IF[{- !$disabled{capieng} -}]

      SOURCE[../libcrypto]=e_capi.c

    ENDIF

  ELSE

 ENGINES=padlock capi dasync ossltest

    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
@@ -23,3 +29,4 @@ 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)

ENDIF