wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify the specification of include dirs in the build dir

Browse source 
In build.info files, make the include directory in the build directory
absolute, or Configure will think it should be added to the source
directory top.  Configure will turn it into a relative path if
possible.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-10 02:18:38 +01:00
parent 2e963849b7
commit e8461ee1d1
4 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/build.info
View file

@ -1,4 +1,4 @@
{- use File::Spec::Functions qw/catdir abs2rel/; -}
{- use File::Spec::Functions qw/catdir rel2abs/; -}
PROGRAMS=openssl
SOURCE[openssl]=\
openssl.c \
@ -10,7 +10,7 @@ SOURCE[openssl]=\
srp.c ts.c verify.c version.c x509.c rehash.c \
apps.c opt.c s_cb.c s_socket.c \
app_rand.c
INCLUDE[openssl]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
INCLUDE[openssl]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[openssl]=../libssl
SCRIPTS=CA.pl

6
build.info
View file

@ -1,7 +1,7 @@
{- use File::Spec::Functions qw/catdir abs2rel/; -}
{- use File::Spec::Functions qw/catdir rel2abs/; -}
LIBS=libcrypto libssl
ORDINALS[libcrypto]=crypto
ORDINALS[libssl]=ssl
INCLUDE[libcrypto]={- catdir(abs2rel($builddir,$sourcedir),"include") -} . crypto/include include
INCLUDE[libssl]={- catdir(abs2rel($builddir,$sourcedir),"include") -} . include
INCLUDE[libcrypto]={- rel2abs(catdir($builddir,"include")) -} . crypto/include include
INCLUDE[libssl]={- rel2abs(catdir($builddir,"include")) -} . include
DEPEND[libssl]=libcrypto

10
engines/build.info
View file

@ -1,4 +1,4 @@
{- use File::Spec::Functions qw/:DEFAULT abs2rel/; -}
{- use File::Spec::Functions qw/:DEFAULT rel2abs/; -}
IF[{- $config{no_shared} -}]
LIBS=../libcrypto
SOURCE[../libcrypto]=\
@ -9,14 +9,14 @@ ELSE
ENGINES=libpadlock libcapi libdasync libossltest
SOURCE[libpadlock]=e_padlock.c {- $target{padlock_asm_src} -}
DEPEND[libpadlock]=../libcrypto
INCLUDE[libpadlock]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[libpadlock]={- rel2abs(catdir($builddir,"../include")) -} ../include
SOURCE[libcapi]=e_capi.c
DEPEND[libcapi]=../libcrypto
INCLUDE[libcapi]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[libcapi]={- rel2abs(catdir($builddir,"../include")) -} ../include
SOURCE[libdasync]=e_dasync.c
DEPEND[libdasync]=../libcrypto
INCLUDE[libdasync]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[libdasync]={- rel2abs(catdir($builddir,"../include")) -} ../include
SOURCE[libossltest]=e_ossltest.c
DEPEND[libossltest]=../libcrypto
INCLUDE[libossltest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[libossltest]={- rel2abs(catdir($builddir,"../include")) -} ../include
ENDIF

98
test/build.info
View file

@ -1,4 +1,4 @@
{- use File::Spec::Functions qw/catdir abs2rel/; -}
{- use File::Spec::Functions qw/catdir rel2abs/; -}
PROGRAMS=\
nptest bntest \
ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \
@ -16,193 +16,193 @@ PROGRAMS=\
dtlsv1listentest
SOURCE[nptest]=nptest.c
INCLUDE[nptest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[nptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[nptest]=../libcrypto
SOURCE[bntest]=bntest.c
INCLUDE[bntest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../crypto/include ../include
INCLUDE[bntest]={- rel2abs(catdir($builddir,"../include")) -} .. ../crypto/include ../include
DEPEND[bntest]=../libcrypto
SOURCE[ectest]=ectest.c
INCLUDE[ectest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[ectest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[ectest]=../libcrypto
SOURCE[ecdsatest]=ecdsatest.c
INCLUDE[ecdsatest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[ecdsatest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[ecdsatest]=../libcrypto
SOURCE[ecdhtest]=ecdhtest.c
INCLUDE[ecdhtest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[ecdhtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[ecdhtest]=../libcrypto
SOURCE[gmdifftest]=gmdifftest.c
INCLUDE[gmdifftest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[gmdifftest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[gmdifftest]=../libcrypto
SOURCE[pbelutest]=pbelutest.c
INCLUDE[pbelutest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[pbelutest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[pbelutest]=../libcrypto
SOURCE[ideatest]=ideatest.c
INCLUDE[ideatest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[ideatest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[ideatest]=../libcrypto
SOURCE[md2test]=md2test.c
INCLUDE[md2test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[md2test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[md2test]=../libcrypto
SOURCE[md4test]=md4test.c
INCLUDE[md4test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[md4test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[md4test]=../libcrypto
SOURCE[md5test]=md5test.c
INCLUDE[md5test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[md5test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[md5test]=../libcrypto
SOURCE[hmactest]=hmactest.c
INCLUDE[hmactest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[hmactest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[hmactest]=../libcrypto
SOURCE[wp_test]=wp_test.c
INCLUDE[wp_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[wp_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[wp_test]=../libcrypto
SOURCE[rc2test]=rc2test.c
INCLUDE[rc2test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[rc2test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[rc2test]=../libcrypto
SOURCE[rc4test]=rc4test.c
INCLUDE[rc4test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[rc4test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[rc4test]=../libcrypto
SOURCE[rc5test]=rc5test.c
INCLUDE[rc5test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[rc5test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[rc5test]=../libcrypto
SOURCE[destest]=destest.c
INCLUDE[destest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[destest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[destest]=../libcrypto
SOURCE[sha1test]=sha1test.c
INCLUDE[sha1test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[sha1test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[sha1test]=../libcrypto
SOURCE[sha256t]=sha256t.c
INCLUDE[sha256t]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[sha256t]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[sha256t]=../libcrypto
SOURCE[sha512t]=sha512t.c
INCLUDE[sha512t]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[sha512t]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[sha512t]=../libcrypto
SOURCE[mdc2test]=mdc2test.c
INCLUDE[mdc2test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[mdc2test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[mdc2test]=../libcrypto
SOURCE[rmdtest]=rmdtest.c
INCLUDE[rmdtest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[rmdtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[rmdtest]=../libcrypto
SOURCE[randtest]=randtest.c
INCLUDE[randtest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[randtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[randtest]=../libcrypto
SOURCE[dhtest]=dhtest.c
INCLUDE[dhtest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[dhtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[dhtest]=../libcrypto
SOURCE[enginetest]=enginetest.c
INCLUDE[enginetest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[enginetest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[enginetest]=../libcrypto
SOURCE[casttest]=casttest.c
INCLUDE[casttest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[casttest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[casttest]=../libcrypto
SOURCE[bftest]=bftest.c
INCLUDE[bftest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[bftest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[bftest]=../libcrypto
SOURCE[ssltest]=ssltest.c
INCLUDE[ssltest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
INCLUDE[ssltest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[ssltest]=../libcrypto ../libssl
SOURCE[dsatest]=dsatest.c
INCLUDE[dsatest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[dsatest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[dsatest]=../libcrypto
SOURCE[exptest]=exptest.c
INCLUDE[exptest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[exptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[exptest]=../libcrypto
SOURCE[rsa_test]=rsa_test.c
INCLUDE[rsa_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
INCLUDE[rsa_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[rsa_test]=../libcrypto
SOURCE[evp_test]=evp_test.c
INCLUDE[evp_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[evp_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[evp_test]=../libcrypto
SOURCE[evp_extra_test]=evp_extra_test.c
INCLUDE[evp_extra_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[evp_extra_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[evp_extra_test]=../libcrypto
SOURCE[igetest]=igetest.c
INCLUDE[igetest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
INCLUDE[igetest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[igetest]=../libcrypto
SOURCE[jpaketest]=jpaketest.c
INCLUDE[jpaketest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[jpaketest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[jpaketest]=../libcrypto
SOURCE[v3nametest]=v3nametest.c
INCLUDE[v3nametest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[v3nametest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[v3nametest]=../libcrypto
SOURCE[danetest]=danetest.c
INCLUDE[danetest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[danetest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[danetest]=../libcrypto ../libssl
SOURCE[heartbeat_test]=heartbeat_test.c testutil.c
INCLUDE[heartbeat_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
INCLUDE[heartbeat_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[heartbeat_test]=../libcrypto ../libssl
SOURCE[p5_crpt2_test]=p5_crpt2_test.c
INCLUDE[p5_crpt2_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[p5_crpt2_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[p5_crpt2_test]=../libcrypto
SOURCE[constant_time_test]=constant_time_test.c
INCLUDE[constant_time_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
INCLUDE[constant_time_test]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[constant_time_test]=../libcrypto
SOURCE[verify_extra_test]=verify_extra_test.c
INCLUDE[verify_extra_test]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[verify_extra_test]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[verify_extra_test]=../libcrypto
SOURCE[clienthellotest]=clienthellotest.c
INCLUDE[clienthellotest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[clienthellotest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[clienthellotest]=../libcrypto ../libssl
SOURCE[packettest]=packettest.c
INCLUDE[packettest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[packettest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[packettest]=../libcrypto
SOURCE[asynctest]=asynctest.c
INCLUDE[asynctest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
INCLUDE[asynctest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[asynctest]=../libcrypto
SOURCE[secmemtest]=secmemtest.c
INCLUDE[secmemtest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[secmemtest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[secmemtest]=../libcrypto
SOURCE[srptest]=srptest.c
INCLUDE[srptest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[srptest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[srptest]=../libcrypto
SOURCE[memleaktest]=memleaktest.c
INCLUDE[memleaktest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} ../include
INCLUDE[memleaktest]={- rel2abs(catdir($builddir,"../include")) -} ../include
DEPEND[memleaktest]=../libcrypto
SOURCE[dtlsv1listentest]=dtlsv1listentest.c
INCLUDE[dtlsv1listentest]={- catdir(abs2rel($builddir,$sourcedir),"../include") -} .. ../include
INCLUDE[dtlsv1listentest]={- rel2abs(catdir($builddir,"../include")) -} .. ../include
DEPEND[dtlsv1listentest]=../libssl