aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-03-05 11:43:52 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2019-03-05 11:43:52 (GMT)
commite4c8b0e95b50e933ce32d2851a5bade8a0fd41a1 (patch)
tree7569e945deb92570efbf5a1c35f1592416914adc
parentd05ee18d8d3a13f7f22529985db7ad67a4bc8473 (diff)
Align with latest bdep-new
-rw-r--r--openssl/buildfile26
1 files changed, 15 insertions, 11 deletions
diff --git a/openssl/buildfile b/openssl/buildfile
index 0deb988..c888dc9 100644
--- a/openssl/buildfile
+++ b/openssl/buildfile
@@ -1,4 +1,4 @@
-# file : openssl/buildfile -*- C++ -*-
+# file : openssl/buildfile
# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
@@ -13,13 +13,12 @@ exe{openssl-agent-pkcs11}: agent/pkcs11/cxx{agent} agent/pkcs11/libue{openssl}
agent/pkcs11/
{
- libue{openssl}: bin.whole = false
- libue{openssl}: cxx.libs += -ldl
libue{openssl}: {hxx ixx txx cxx}{* -agent -options -*.test...} \
{hxx ixx cxx}{options} h{pkcs11} ../../libue{openssl}
+
+ libue{openssl}: cxx.libs += -ldl
}
-libue{openssl}: bin.whole = false
libue{openssl}: {hxx ixx txx cxx}{* -options -version -*.test...} \
{hxx ixx cxx}{options} {hxx}{version} $libs
@@ -27,17 +26,19 @@ hxx{version}: in{version} $src_root/manifest
# Unit tests.
#
-exe{*.test}: test = true
-exe{*.test}: install = false
+exe{*.test}:
+{
+ test = true
+ install = false
+}
for t: cxx{**.test...}
{
d = $directory($t)
n = $name($t)...
- ./: $d/exe{$n}
- $d/exe{$n}: $t $d/{hxx ixx txx}{+$n} $d/testscript{+$n}
- $d/exe{$n}: $d/libue{openssl}
+ ./: $d/exe{$n}: $t $d/{hxx ixx txx}{+$n} $d/testscript{+$n}
+ $d/exe{$n}: $d/libue{openssl}: bin.whole = false
}
# Generated options parser.
@@ -70,6 +71,9 @@ if $cli.configured
# them when cleaning in src (so that clean results in a state identical to
# distributed).
#
- cli.cxx{*}: dist = true
- cli.cxx{*}: clean = ($src_root != $out_root)
+ cli.cxx{*}:
+ {
+ dist = true
+ clean = ($src_root != $out_root)
+ }
}