Commit 0483f586 authored by Richard Levitte's avatar Richard Levitte
Browse files

Simplify INCLUDE statements in build.info files 

Now that INCLUDE considers both the source and build trees, no need
for the rel2abs perl fragment hacks any more.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 4748f890

apps/build.info

+2 −3
Changes for apps/build.info: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line 
{- use File::Spec::Functions qw/catdir rel2abs/;

   our $tsget_name = $config{target} =~ /^(VC|vms)-/ ? "tsget.pl" : "tsget";

{- our $tsget_name = $config{target} =~ /^(VC|vms)-/ ? "tsget.pl" : "tsget";

   "" -}

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

  PROGRAMS=openssl
@@ -14,7 +13,7 @@ IF[{- !$disabled{apps} -}] 
          apps.c opt.c s_cb.c s_socket.c \

          app_rand.c \

          {- $target{apps_aux_src} -}

  INCLUDE[openssl]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include

  INCLUDE[openssl]=.. ../include

  DEPEND[openssl]=../libssl



  SCRIPTS=CA.pl {- $tsget_name -}

build.info

+2 −3
Changes for build.info: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line 
{- use File::Spec::Functions qw/catdir rel2abs/; -}

LIBS=libcrypto libssl

ORDINALS[libcrypto]=crypto

ORDINALS[libssl]=ssl

INCLUDE[libcrypto]="{- rel2abs(catdir($builddir,"include")) -}" . crypto/include include

INCLUDE[libssl]="{- rel2abs(catdir($builddir,"include")) -}" . include

INCLUDE[libcrypto]=. crypto/include include

INCLUDE[libssl]=. include

DEPEND[libssl]=libcrypto



# Empty DEPEND "indices" means the dependencies are expected to be built

crypto/bn/build.info

+1 −2
Changes for crypto/bn/build.info: 1 added line, 2 removed lines.
Original line number Diff line number Diff line 
{- use File::Spec::Functions qw/catdir rel2abs/; -}

LIBS=../../libcrypto

SOURCE[../../libcrypto]=\

        bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c \
@@ -7,7 +6,7 @@ SOURCE[../../libcrypto]=\ 
        {- $target{bn_asm_src} -} \

        bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c \

        bn_depr.c bn_const.c bn_x931p.c bn_intern.c bn_dh.c bn_srp.c

INCLUDE[../../libcrypto]="{- rel2abs(catdir($builddir,"..","..","crypto","include")) -}"

INCLUDE[../../libcrypto]=../../crypto/include



INCLUDE[bn_exp.o]=..

engines/afalg/build.info

+1 −3
Changes for engines/afalg/build.info: 1 added line, 3 removed lines.
Original line number Diff line number Diff line 
{- use File::Spec::Functions qw/:DEFAULT rel2abs/; -}



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

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

    IF[{- $disabled{"dynamic-engine"} -}]
@@ -9,7 +7,7 @@ IF[{- !$disabled{"engine"} -}] 
      ENGINES=afalg

      SOURCE[afalg]=e_afalg.c e_afalg_err.c

      DEPEND[afalg]=../../libcrypto

      INCLUDE[afalg]= "{- rel2abs(catdir($builddir,"../../include")) -}" ../../include

      INCLUDE[afalg]= ../../include

    ENDIF

  ENDIF

ENDIF

engines/build.info

+4 −5
Changes for engines/build.info: 4 added lines, 5 removed lines.
Original line number Diff line number Diff line 
{- use File::Spec::Functions qw/:DEFAULT rel2abs/; -}

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

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

    LIBS=../libcrypto
@@ -12,19 +11,19 @@ IF[{- !$disabled{"engine"} -}] 
    ENGINES=padlock dasync ossltest

    SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -}

    DEPEND[padlock]=../libcrypto

    INCLUDE[padlock]="{- rel2abs(catdir($builddir,"../include")) -}" ../include

    INCLUDE[padlock]=../include

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

      ENGINES=capi

      SOURCE[capi]=e_capi.c

      DEPEND[capi]=../libcrypto

      INCLUDE[capi]="{- rel2abs(catdir($builddir,"../include")) -}" ../include

      INCLUDE[capi]=../include

    ENDIF

    SOURCE[dasync]=e_dasync.c

    DEPEND[dasync]=../libcrypto

    INCLUDE[dasync]="{- rel2abs(catdir($builddir,"../include")) -}" ../include

    INCLUDE[dasync]=../include

    SOURCE[ossltest]=e_ossltest.c

    DEPEND[ossltest]=../libcrypto

    INCLUDE[ossltest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include

    INCLUDE[ossltest]=../include

  ENDIF



  GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)