Add inclusion directory crypto/include for BN compilations

Some files in crypto/bn depend on internal/bn_conf.h, and so does
test/bntest.  Therefore, we add another inclusion directory.

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

diff --git a/crypto/bn/build.info b/crypto/bn/build.info
index 66f62dcac901132509af8ec0e45862e593f44fad..bb410f271e57d91f16560ba2d2165f1c8036f846 100644 (file)
--- a/crypto/bn/build.info
+++ b/crypto/bn/build.info
@@ -1,3 +1,4 @@
+{- 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 \
 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 \


@@ -6,6 +7,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
         {- $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")) -}

 
 BEGINRAW[Makefile]
 ##### BN assembler implementations
 
 BEGINRAW[Makefile]
 ##### BN assembler implementations

diff --git a/test/build.info b/test/build.info
index bf9feadf8cfa342ff801e1e1503c861ccd0cee42..a32169220a3521bd62c3584dc32dc31cf369b670 100644 (file)
--- a/test/build.info
+++ b/test/build.info
@@ -20,7 +20,7 @@ INCLUDE[nptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
 DEPEND[nptest]=../libcrypto
 
 SOURCE[bntest]=bntest.c
 DEPEND[nptest]=../libcrypto
 
 SOURCE[bntest]=bntest.c

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

 DEPEND[bntest]=../libcrypto
 
 SOURCE[ectest]=ectest.c
 DEPEND[bntest]=../libcrypto
 
 SOURCE[ectest]=ectest.c