From 7218ae513408a58e8f8f20ed49dc45505e00a5b2 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 8 Jul 2016 14:52:51 +0200 Subject: [PATCH 1/1] Use _NO_INST in some build.info files Reviewed-by: Rich Salz --- engines/build.info | 3 ++- fuzz/build.info | 4 ++-- test/build.info | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/engines/build.info b/engines/build.info index e42684f93a..25917ff034 100644 --- a/engines/build.info +++ b/engines/build.info @@ -8,7 +8,8 @@ IF[{- !$disabled{"engine"} -}] SOURCE[../libcrypto]=e_capi.c ENDIF ELSE - ENGINES=padlock dasync ossltest + ENGINES=padlock dasync + ENGINES_NO_INST=ossltest SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -} DEPEND[padlock]=../libcrypto INCLUDE[padlock]=../include diff --git a/fuzz/build.info b/fuzz/build.info index a3d38499ff..9d90bc74ce 100644 --- a/fuzz/build.info +++ b/fuzz/build.info @@ -9,7 +9,7 @@ -} IF[{- !$disabled{"fuzz-afl"} || !$disabled{"fuzz-libfuzzer"} -}] - PROGRAMS=asn1 asn1parse bignum bndiv cms conf crl ct server x509 + PROGRAMS_NO_INST=asn1 asn1parse bignum bndiv cms conf crl ct server x509 SOURCE[asn1]=asn1.c driver.c INCLUDE[asn1]=../include {- $ex_inc -} @@ -53,7 +53,7 @@ IF[{- !$disabled{"fuzz-afl"} || !$disabled{"fuzz-libfuzzer"} -}] ENDIF IF[{- !$disabled{tests} -}] - PROGRAMS=asn1-test asn1parse-test bignum-test bndiv-test cms-test conf-test crl-test ct-test server-test x509-test + PROGRAMS_NO_INST=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]=../include diff --git a/test/build.info b/test/build.info index 30f94a2385..4e1ec65bc5 100644 --- a/test/build.info +++ b/test/build.info @@ -1,5 +1,5 @@ IF[{- !$disabled{tests} -}] - PROGRAMS=\ + PROGRAMS_NO_INST=\ aborttest \ sanitytest bntest \ ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \ @@ -275,7 +275,7 @@ IF[{- !$disabled{tests} -}] next if grep { $_ eq lc("$name.h") } @nogo_headers; $OUT .= <<"_____"; - PROGRAMS=buildtest_$name + PROGRAMS_NO_INST=buildtest_$name GENERATE[buildtest_$name.c]=generate_buildtest.pl $name SOURCE[buildtest_$name]=buildtest_$name.c INCLUDE[buildtest_$name]=../include -- 2.34.1