From c0a6b9751fa7a79a4879c1b7f6512d44058c236b Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 6 Mar 2019 16:57:32 +0300
Subject: Use new setup for unit tests

---
 openssl/buildfile | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/openssl/buildfile b/openssl/buildfile
index c888dc9..a0bd505 100644
--- a/openssl/buildfile
+++ b/openssl/buildfile
@@ -4,17 +4,25 @@
 
 import libs = libbutl%lib{butl}
 
-./: exe{openssl-client} exe{openssl-agent-pkcs11}
+./: exe{openssl-client}: client/cxx{client} client/libue{openssl}
 
-exe{openssl-client}: client/{hxx ixx txx cxx}{* -options}         \
-                     client/{hxx ixx cxx}{options} libue{openssl}
+client/
+{
+  libue{openssl}: {hxx ixx txx cxx}{* -client -options -*.test...} \
+                  {hxx ixx cxx}{options}                           \
+                  ../libue{openssl}
+}
+
+./: exe{openssl-agent-pkcs11}: agent/pkcs11/cxx{agent}     \
+                               agent/pkcs11/libue{openssl}
 
-exe{openssl-agent-pkcs11}: agent/pkcs11/cxx{agent} agent/pkcs11/libue{openssl}
 
 agent/pkcs11/
 {
-  libue{openssl}: {hxx ixx txx cxx}{* -agent -options -*.test...} \
-                  {hxx ixx cxx}{options} h{pkcs11} ../../libue{openssl}
+  libue{openssl}: {hxx ixx txx cxx}{* -agent -options -*.test...}   \
+                  {hxx ixx cxx}{options}                            \
+                  h{pkcs11}                                         \
+                  ../../libue{openssl}
 
   libue{openssl}: cxx.libs += -ldl
 }
-- 
cgit v1.1