[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Fri Jul 1 16:36:54 UTC 2016
The branch master has been updated
via 0483f5865267bb479d667dda84a7c8bbfadfbdeb (commit)
via 4748f8902271bafd2bb015eb283830e84496199d (commit)
from 352dbbaf4ca361c076f1437690607caf02965d7f (commit)
- Log -----------------------------------------------------------------
commit 0483f5865267bb479d667dda84a7c8bbfadfbdeb
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Jun 29 22:59:50 2016 +0200
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: Rich Salz <rsalz at openssl.org>
commit 4748f8902271bafd2bb015eb283830e84496199d
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Jun 29 22:51:42 2016 +0200
Make build.info INCLUDE stmts be both source and build tree relative
INCLUDE statements in build.info files were source tree centric. That
meant that to get include directory specs in the build tree, we had to
resort to perl fragments that specified the build tree include paths
as absolute ones.
This change has the INCLUDE statement consider both the source and
build tree for any include directory. It means that there may be some
extra unnecessary include paths, but it also makes life simpler for
anyone who makes changes in the build.info files.
Reviewed-by: Rich Salz <rsalz at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configure | 29 +++++++++--
apps/build.info | 5 +-
build.info | 5 +-
crypto/bn/build.info | 3 +-
engines/afalg/build.info | 4 +-
engines/build.info | 9 ++--
fuzz/build.info | 20 +++----
fuzz/build.info.fuzz | 20 +++----
test/build.info | 132 +++++++++++++++++++++++------------------------
9 files changed, 119 insertions(+), 108 deletions(-)
diff --git a/Configure b/Configure
index 17d7063..f8a6ec2 100755
--- a/Configure
+++ b/Configure
@@ -1713,8 +1713,8 @@ EOF
# sure it can get included
if ($dest ne "" && $d =~ /\.(h|pm)$/) {
my $i = dirname($d);
- push @{$unified_info{includes}->{$ddest}}, $i
- unless grep { $_ eq $i } @{$unified_info{includes}->{$ddest}};
+ push @{$unified_info{includes}->{$ddest}->{source}}, $i
+ unless grep { $_ eq $i } @{$unified_info{includes}->{$ddest}->{source}};
}
}
}
@@ -1732,9 +1732,12 @@ EOF
}
}
foreach (@{$includes{$dest}}) {
- my $i = cleandir($sourced, $_, $blddir);
- push @{$unified_info{includes}->{$ddest}}, $i
- unless grep { $_ eq $i } @{$unified_info{includes}->{$ddest}};
+ my $is = cleandir($sourced, $_, $blddir);
+ my $ib = cleandir($buildd, $_, $blddir);
+ push @{$unified_info{includes}->{$ddest}->{source}}, $is
+ unless grep { $_ eq $is } @{$unified_info{includes}->{$ddest}->{source}};
+ push @{$unified_info{includes}->{$ddest}->{build}}, $ib
+ unless grep { $_ eq $ib } @{$unified_info{includes}->{$ddest}->{build}};
}
}
}
@@ -1751,6 +1754,22 @@ EOF
[ sort keys %{$unified_info{$l1}->{$l2}} ];
}
}
+ # Includes
+ foreach my $dest (sort keys %{$unified_info{includes}}) {
+ if (defined($unified_info{includes}->{$dest}->{build})) {
+ my @source_includes =
+ ( @{$unified_info{includes}->{$dest}->{source}} );
+ $unified_info{includes}->{$dest} =
+ [ @{$unified_info{includes}->{$dest}->{build}} ];
+ foreach my $inc (@source_includes) {
+ push @{$unified_info{includes}->{$dest}}, $inc
+ unless grep { $_ eq $inc } @{$unified_info{includes}->{$dest}};
+ }
+ } else {
+ $unified_info{includes}->{$dest} =
+ [ @{$unified_info{includes}->{$dest}->{source}} ];
+ }
+ }
}
# For the schemes that need it, we provide the old *_obj configs
diff --git a/apps/build.info b/apps/build.info
index c7dc19f..ae64861 100644
--- a/apps/build.info
+++ b/apps/build.info
@@ -1,5 +1,4 @@
-{- 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 -}
diff --git a/build.info b/build.info
index 6f057cd..cfaa712 100644
--- a/build.info
+++ b/build.info
@@ -1,9 +1,8 @@
-{- 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
diff --git a/crypto/bn/build.info b/crypto/bn/build.info
index edceb73..c608ecc 100644
--- a/crypto/bn/build.info
+++ b/crypto/bn/build.info
@@ -1,4 +1,3 @@
-{- 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]=..
diff --git a/engines/afalg/build.info b/engines/afalg/build.info
index d096279..8601b1a 100644
--- a/engines/afalg/build.info
+++ b/engines/afalg/build.info
@@ -1,5 +1,3 @@
-{- 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
diff --git a/engines/build.info b/engines/build.info
index 850ecac..e42684f 100644
--- a/engines/build.info
+++ b/engines/build.info
@@ -1,4 +1,3 @@
-{- 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)
diff --git a/fuzz/build.info b/fuzz/build.info
index c920e95..82569a2 100644
--- a/fuzz/build.info
+++ b/fuzz/build.info
@@ -2,41 +2,41 @@
PROGRAMS=asn1-test asn1parse-test bignum-test bndiv-test cms-test conf-test crl-test ct-test server-test x509-test
SOURCE[asn1-test]=asn1.c test-corpus.c
-INCLUDE[asn1-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+INCLUDE[asn1-test]=../include
DEPEND[asn1-test]=../libcrypto
SOURCE[asn1parse-test]=asn1parse.c test-corpus.c
-INCLUDE[asn1parse-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+INCLUDE[asn1parse-test]=../include
DEPEND[asn1parse-test]=../libcrypto
SOURCE[bignum-test]=bignum.c test-corpus.c
-INCLUDE[bignum-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+INCLUDE[bignum-test]=../include
DEPEND[bignum-test]=../libcrypto
SOURCE[bndiv-test]=bndiv.c test-corpus.c
-INCLUDE[bndiv-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+INCLUDE[bndiv-test]=../include
DEPEND[bndiv-test]=../libcrypto
SOURCE[cms-test]=cms.c test-corpus.c
-INCLUDE[cms-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+INCLUDE[cms-test]=../include
DEPEND[cms-test]=../libcrypto
SOURCE[conf-test]=conf.c test-corpus.c
-INCLUDE[conf-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+INCLUDE[conf-test]=../include
DEPEND[conf-test]=../libcrypto
SOURCE[crl-test]=crl.c test-corpus.c
-INCLUDE[crl-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+INCLUDE[crl-test]=../include
DEPEND[crl-test]=../libcrypto
SOURCE[ct-test]=ct.c test-corpus.c
-INCLUDE[ct-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+INCLUDE[ct-test]=../include
DEPEND[ct-test]=../libcrypto
SOURCE[server-test]=server.c test-corpus.c
-INCLUDE[server-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+INCLUDE[server-test]=../include
DEPEND[server-test]=../libcrypto ../libssl
SOURCE[x509-test]=x509.c test-corpus.c
-INCLUDE[x509-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+INCLUDE[x509-test]=../include
DEPEND[x509-test]=../libcrypto
diff --git a/fuzz/build.info.fuzz b/fuzz/build.info.fuzz
index 1c0506b..44cac86 100644
--- a/fuzz/build.info.fuzz
+++ b/fuzz/build.info.fuzz
@@ -11,41 +11,41 @@
PROGRAMS=asn1 asn1parse bignum bndiv cms conf crl ct server x509
SOURCE[asn1]=asn1.c driver.c
-INCLUDE[asn1]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
+INCLUDE[asn1]=../include {- $ex_inc -}
DEPEND[asn1]=../libcrypto {- $ex_lib -}
SOURCE[asn1parse]=asn1parse.c driver.c
-INCLUDE[asn1parse]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
+INCLUDE[asn1parse]=../include {- $ex_inc -}
DEPEND[asn1parse]=../libcrypto {- $ex_lib -}
SOURCE[bignum]=bignum.c driver.c
-INCLUDE[bignum]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
+INCLUDE[bignum]=../include {- $ex_inc -}
DEPEND[bignum]=../libcrypto {- $ex_lib -}
SOURCE[bndiv]=bndiv.c driver.c
-INCLUDE[bndiv]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
+INCLUDE[bndiv]=../include {- $ex_inc -}
DEPEND[bndiv]=../libcrypto {- $ex_lib -}
SOURCE[cms]=cms.c driver.c
-INCLUDE[cms]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
+INCLUDE[cms]=../include {- $ex_inc -}
DEPEND[cms]=../libcrypto {- $ex_lib -}
SOURCE[conf]=conf.c driver.c
-INCLUDE[conf]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
+INCLUDE[conf]=../include {- $ex_inc -}
DEPEND[conf]=../libcrypto {- $ex_lib -}
SOURCE[crl]=crl.c driver.c
-INCLUDE[crl]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
+INCLUDE[crl]=../include {- $ex_inc -}
DEPEND[crl]=../libcrypto {- $ex_lib -}
SOURCE[ct]=ct.c driver.c
-INCLUDE[ct]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
+INCLUDE[ct]=../include {- $ex_inc -}
DEPEND[ct]=../libcrypto {- $ex_lib -}
SOURCE[server]=server.c driver.c
-INCLUDE[server]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
+INCLUDE[server]=../include {- $ex_inc -}
DEPEND[server]=../libcrypto ../libssl {- $ex_lib -}
SOURCE[x509]=x509.c driver.c
-INCLUDE[x509]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
+INCLUDE[x509]=../include {- $ex_inc -}
DEPEND[x509]=../libcrypto {- $ex_lib -}
diff --git a/test/build.info b/test/build.info
index c37e6e0..aac8693 100644
--- a/test/build.info
+++ b/test/build.info
@@ -1,4 +1,3 @@
-{- use File::Spec::Functions qw/catdir catfile rel2abs abs2rel updir/; -}
IF[{- !$disabled{tests} -}]
PROGRAMS=\
aborttest \
@@ -20,251 +19,250 @@ IF[{- !$disabled{tests} -}]
bioprinttest sslapitest
SOURCE[aborttest]=aborttest.c
- INCLUDE[aborttest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[aborttest]=../include
DEPEND[aborttest]=../libcrypto
SOURCE[nptest]=nptest.c
- INCLUDE[nptest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[nptest]=../include
DEPEND[nptest]=../libcrypto
SOURCE[bntest]=bntest.c
- INCLUDE[bntest]="{- rel2abs(catdir($builddir,"../crypto/include")) -}" "{- rel2abs(catdir($builddir,"../include")) -}" .. ../crypto/include ../include
+ INCLUDE[bntest]=.. ../crypto/include ../include
DEPEND[bntest]=../libcrypto
SOURCE[ectest]=ectest.c
- INCLUDE[ectest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[ectest]=../include
DEPEND[ectest]=../libcrypto
SOURCE[ecdsatest]=ecdsatest.c
- INCLUDE[ecdsatest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[ecdsatest]=../include
DEPEND[ecdsatest]=../libcrypto
SOURCE[ecdhtest]=ecdhtest.c
- INCLUDE[ecdhtest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[ecdhtest]=../include
DEPEND[ecdhtest]=../libcrypto
SOURCE[gmdifftest]=gmdifftest.c
- INCLUDE[gmdifftest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[gmdifftest]=../include
DEPEND[gmdifftest]=../libcrypto
SOURCE[pbelutest]=pbelutest.c
- INCLUDE[pbelutest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[pbelutest]=../include
DEPEND[pbelutest]=../libcrypto
SOURCE[ideatest]=ideatest.c
- INCLUDE[ideatest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[ideatest]=../include
DEPEND[ideatest]=../libcrypto
SOURCE[md2test]=md2test.c
- INCLUDE[md2test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[md2test]=../include
DEPEND[md2test]=../libcrypto
SOURCE[md4test]=md4test.c
- INCLUDE[md4test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[md4test]=../include
DEPEND[md4test]=../libcrypto
SOURCE[md5test]=md5test.c
- INCLUDE[md5test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[md5test]=../include
DEPEND[md5test]=../libcrypto
SOURCE[hmactest]=hmactest.c
- INCLUDE[hmactest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[hmactest]=../include
DEPEND[hmactest]=../libcrypto
SOURCE[wp_test]=wp_test.c
- INCLUDE[wp_test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[wp_test]=../include
DEPEND[wp_test]=../libcrypto
SOURCE[rc2test]=rc2test.c
- INCLUDE[rc2test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[rc2test]=../include
DEPEND[rc2test]=../libcrypto
SOURCE[rc4test]=rc4test.c
- INCLUDE[rc4test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[rc4test]=../include
DEPEND[rc4test]=../libcrypto
SOURCE[rc5test]=rc5test.c
- INCLUDE[rc5test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[rc5test]=../include
DEPEND[rc5test]=../libcrypto
SOURCE[destest]=destest.c
- INCLUDE[destest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[destest]=../include
DEPEND[destest]=../libcrypto
SOURCE[sha1test]=sha1test.c
- INCLUDE[sha1test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[sha1test]=../include
DEPEND[sha1test]=../libcrypto
SOURCE[sha256t]=sha256t.c
- INCLUDE[sha256t]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[sha256t]=../include
DEPEND[sha256t]=../libcrypto
SOURCE[sha512t]=sha512t.c
- INCLUDE[sha512t]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[sha512t]=../include
DEPEND[sha512t]=../libcrypto
SOURCE[mdc2test]=mdc2test.c
- INCLUDE[mdc2test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[mdc2test]=../include
DEPEND[mdc2test]=../libcrypto
SOURCE[rmdtest]=rmdtest.c
- INCLUDE[rmdtest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[rmdtest]=../include
DEPEND[rmdtest]=../libcrypto
SOURCE[randtest]=randtest.c
- INCLUDE[randtest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[randtest]=../include
DEPEND[randtest]=../libcrypto
SOURCE[dhtest]=dhtest.c
- INCLUDE[dhtest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[dhtest]=../include
DEPEND[dhtest]=../libcrypto
SOURCE[enginetest]=enginetest.c
- INCLUDE[enginetest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[enginetest]=../include
DEPEND[enginetest]=../libcrypto
SOURCE[casttest]=casttest.c
- INCLUDE[casttest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[casttest]=../include
DEPEND[casttest]=../libcrypto
SOURCE[bftest]=bftest.c
- INCLUDE[bftest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[bftest]=../include
DEPEND[bftest]=../libcrypto
SOURCE[ssltest_old]=ssltest_old.c
- INCLUDE[ssltest_old]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include
+ INCLUDE[ssltest_old]=.. ../include
DEPEND[ssltest_old]=../libcrypto ../libssl
SOURCE[dsatest]=dsatest.c
- INCLUDE[dsatest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[dsatest]=../include
DEPEND[dsatest]=../libcrypto
SOURCE[exptest]=exptest.c
- INCLUDE[exptest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[exptest]=../include
DEPEND[exptest]=../libcrypto
SOURCE[rsa_test]=rsa_test.c
- INCLUDE[rsa_test]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include
+ INCLUDE[rsa_test]=.. ../include
DEPEND[rsa_test]=../libcrypto
SOURCE[evp_test]=evp_test.c
- INCLUDE[evp_test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[evp_test]=../include
DEPEND[evp_test]=../libcrypto
SOURCE[evp_extra_test]=evp_extra_test.c
- INCLUDE[evp_extra_test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[evp_extra_test]=../include
DEPEND[evp_extra_test]=../libcrypto
SOURCE[igetest]=igetest.c
- INCLUDE[igetest]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include
+ INCLUDE[igetest]=.. ../include
DEPEND[igetest]=../libcrypto
SOURCE[v3nametest]=v3nametest.c
- INCLUDE[v3nametest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[v3nametest]=../include
DEPEND[v3nametest]=../libcrypto
SOURCE[v3ext]=v3ext.c
- INCLUDE[v3ext]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[v3ext]=../include
DEPEND[v3ext]=../libcrypto
SOURCE[danetest]=danetest.c
- INCLUDE[danetest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[danetest]=../include
DEPEND[danetest]=../libcrypto ../libssl
SOURCE[heartbeat_test]=heartbeat_test.c testutil.c
- INCLUDE[heartbeat_test]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include
+ INCLUDE[heartbeat_test]=.. ../include
DEPEND[heartbeat_test]=../libcrypto ../libssl
SOURCE[p5_crpt2_test]=p5_crpt2_test.c
- INCLUDE[p5_crpt2_test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[p5_crpt2_test]=../include
DEPEND[p5_crpt2_test]=../libcrypto
SOURCE[constant_time_test]=constant_time_test.c
- INCLUDE[constant_time_test]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include
+ INCLUDE[constant_time_test]=.. ../include
DEPEND[constant_time_test]=../libcrypto
SOURCE[verify_extra_test]=verify_extra_test.c
- INCLUDE[verify_extra_test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[verify_extra_test]=../include
DEPEND[verify_extra_test]=../libcrypto
SOURCE[clienthellotest]=clienthellotest.c
- INCLUDE[clienthellotest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[clienthellotest]=../include
DEPEND[clienthellotest]=../libcrypto ../libssl
SOURCE[packettest]=packettest.c
- INCLUDE[packettest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[packettest]=../include
DEPEND[packettest]=../libcrypto
SOURCE[asynctest]=asynctest.c
- INCLUDE[asynctest]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include
+ INCLUDE[asynctest]=.. ../include
DEPEND[asynctest]=../libcrypto
SOURCE[secmemtest]=secmemtest.c
- INCLUDE[secmemtest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[secmemtest]=../include
DEPEND[secmemtest]=../libcrypto
SOURCE[srptest]=srptest.c
- INCLUDE[srptest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[srptest]=../include
DEPEND[srptest]=../libcrypto
SOURCE[memleaktest]=memleaktest.c
- INCLUDE[memleaktest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[memleaktest]=../include
DEPEND[memleaktest]=../libcrypto
SOURCE[dtlsv1listentest]=dtlsv1listentest.c
- INCLUDE[dtlsv1listentest]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include
+ INCLUDE[dtlsv1listentest]=.. ../include
DEPEND[dtlsv1listentest]=../libssl
SOURCE[ct_test]=ct_test.c testutil.c
- INCLUDE[ct_test]="{- rel2abs(catdir($builddir,"../include")) -}" ../crypto/include ../include
+ INCLUDE[ct_test]=../crypto/include ../include
DEPEND[ct_test]=../libcrypto
SOURCE[threadstest]=threadstest.c
- INCLUDE[threadstest]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include
+ INCLUDE[threadstest]=.. ../include
DEPEND[threadstest]=../libcrypto
SOURCE[afalgtest]=afalgtest.c
- INCLUDE[afalgtest]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include
+ INCLUDE[afalgtest]=.. ../include
DEPEND[afalgtest]=../libcrypto
SOURCE[d2i_test]=d2i_test.c testutil.c
- INCLUDE[d2i_test]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include
+ INCLUDE[d2i_test]=.. ../include
DEPEND[d2i_test]=../libcrypto
SOURCE[ssl_test_ctx_test]=ssl_test_ctx_test.c ssl_test_ctx.c testutil.c
- INCLUDE[ssl_test_ctx_test]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include
+ INCLUDE[ssl_test_ctx_test]=.. ../include
DEPEND[ssl_test_ctx_test]=../libcrypto
SOURCE[ssl_test]=ssl_test.c ssl_test_ctx.c testutil.c handshake_helper.c
- INCLUDE[ssl_test]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include
+ INCLUDE[ssl_test]=.. ../include
DEPEND[ssl_test]=../libcrypto ../libssl
SOURCE[cipherlist_test]=cipherlist_test.c testutil.c
- INCLUDE[cipherlist_test]="{- rel2abs(catdir($builddir,"../include")) -}" .. ../include
+ INCLUDE[cipherlist_test]=.. ../include
DEPEND[cipherlist_test]=../libcrypto ../libssl
INCLUDE[testutil.o]=..
- INCLUDE[ssl_test_ctx.o]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
- INCLUDE[handshake_helper.o]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
- INCLUDE[ssltestlib.o]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[ssl_test_ctx.o]=../include
+ INCLUDE[handshake_helper.o]=../include
+ INCLUDE[ssltestlib.o]=../include
SOURCE[x509aux]=x509aux.c
- INCLUDE[x509aux]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[x509aux]=../include
DEPEND[x509aux]=../libcrypto
SOURCE[asynciotest]=asynciotest.c ssltestlib.c
- INCLUDE[asynciotest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[asynciotest]=../include
DEPEND[asynciotest]=../libcrypto ../libssl
SOURCE[bioprinttest]=bioprinttest.c
- INCLUDE[bioprinttest]={- rel2abs(catdir($builddir,"../include")) -} ../include
+ INCLUDE[bioprinttest]=../include
DEPEND[bioprinttest]=../libcrypto
{-
+ use File::Spec::Functions;
use File::Basename;
use if $^O ne "VMS", 'File::Glob' => qw/glob/;
- my $includes = join(" ",
- rel2abs(catdir($builddir,"../include")), "../include");
my @nogo_headers = ( "asn1_mac.h",
"__decc_include_prologue.h",
"__decc_include_epilogue.h" );
@@ -280,13 +278,13 @@ IF[{- !$disabled{tests} -}]
PROGRAMS=buildtest_$name
GENERATE[buildtest_$name.c]=generate_buildtest.pl $name
SOURCE[buildtest_$name]=buildtest_$name.c
- INCLUDE[buildtest_$name]=$includes
+ INCLUDE[buildtest_$name]=../include
DEPEND[buildtest_$name]=../libssl ../libcrypto
_____
}
-}
SOURCE[sslapitest]=sslapitest.c ssltestlib.c testutil.c
- INCLUDE[sslapitest]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+ INCLUDE[sslapitest]=../include
DEPEND[sslapitest]=../libcrypto ../libssl
ENDIF
More information about the openssl-commits
mailing list