32 files changed, 2 insertions, 2 deletions
diff --git a/configure.py b/configure.py
index 0874220e4..eb2b64824 100755
--- a/configure.py
+++ b/configure.py
@@ -1023,8 +1023,8 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
         for src in sources:
             (dir,file) = os.path.split(os.path.normpath(src))
 
-            if dir.startswith('lib/'):
-                parts = dir.split(os.sep)[1:]
+            parts = dir.split(os.sep)[1:]
+            if parts != []:
 
                 # Handle src/X/X.cpp -> X.o
                 if file == parts[-1] + '.cpp':
diff --git a/src/tests/test_aead.cpp b/src/tests/kat_aead.cpp
index 0bc4a47c5..0bc4a47c5 100644
--- a/src/tests/test_aead.cpp
+++ b/src/tests/kat_aead.cpp
diff --git a/src/tests/test_bigint.cpp b/src/tests/kat_bigint.cpp
index c19b6cc23..c19b6cc23 100644
--- a/src/tests/test_bigint.cpp
+++ b/src/tests/kat_bigint.cpp
diff --git a/src/tests/test_block.cpp b/src/tests/kat_block.cpp
index 9da33ef0e..9da33ef0e 100644
--- a/src/tests/test_block.cpp
+++ b/src/tests/kat_block.cpp
diff --git a/src/tests/test_cryptobox.cpp b/src/tests/kat_cryptobox.cpp
index 9a53da74c..9a53da74c 100644
--- a/src/tests/test_cryptobox.cpp
+++ b/src/tests/kat_cryptobox.cpp
diff --git a/src/tests/test_cvc.cpp b/src/tests/kat_cvc.cpp
index 9519f0926..9519f0926 100644
--- a/src/tests/test_cvc.cpp
+++ b/src/tests/kat_cvc.cpp
diff --git a/src/tests/test_dh.cpp b/src/tests/kat_dh.cpp
index 33a0e1ec6..33a0e1ec6 100644
--- a/src/tests/test_dh.cpp
+++ b/src/tests/kat_dh.cpp
diff --git a/src/tests/test_dlies.cpp b/src/tests/kat_dlies.cpp
index cd931fd35..cd931fd35 100644
--- a/src/tests/test_dlies.cpp
+++ b/src/tests/kat_dlies.cpp
diff --git a/src/tests/test_dsa.cpp b/src/tests/kat_dsa.cpp
index 316967232..316967232 100644
--- a/src/tests/test_dsa.cpp
+++ b/src/tests/kat_dsa.cpp
diff --git a/src/tests/test_eax.cpp b/src/tests/kat_eax.cpp
index 2a6c42269..2a6c42269 100644
--- a/src/tests/test_eax.cpp
+++ b/src/tests/kat_eax.cpp
diff --git a/src/tests/test_ecdsa.cpp b/src/tests/kat_ecdsa.cpp
index 3bb15739c..3bb15739c 100644
--- a/src/tests/test_ecdsa.cpp
+++ b/src/tests/kat_ecdsa.cpp
diff --git a/src/tests/test_elg.cpp b/src/tests/kat_elg.cpp
index 65e01d4ac..65e01d4ac 100644
--- a/src/tests/test_elg.cpp
+++ b/src/tests/kat_elg.cpp
diff --git a/src/tests/test_gost.cpp b/src/tests/kat_gost.cpp
index 5aaf7807a..5aaf7807a 100644
--- a/src/tests/test_gost.cpp
+++ b/src/tests/kat_gost.cpp
diff --git a/src/tests/test_hash.cpp b/src/tests/kat_hash.cpp
index 55510b9f4..55510b9f4 100644
--- a/src/tests/test_hash.cpp
+++ b/src/tests/kat_hash.cpp
diff --git a/src/tests/test_hkdf.cpp b/src/tests/kat_hkdf.cpp
index 52c43d7ce..52c43d7ce 100644
--- a/src/tests/test_hkdf.cpp
+++ b/src/tests/kat_hkdf.cpp
diff --git a/src/tests/test_kdf.cpp b/src/tests/kat_kdf.cpp
index 86b3ea5c4..86b3ea5c4 100644
--- a/src/tests/test_kdf.cpp
+++ b/src/tests/kat_kdf.cpp
diff --git a/src/tests/test_keywrap.cpp b/src/tests/kat_keywrap.cpp
index a7dcbfe75..a7dcbfe75 100644
--- a/src/tests/test_keywrap.cpp
+++ b/src/tests/kat_keywrap.cpp
diff --git a/src/tests/test_mac.cpp b/src/tests/kat_mac.cpp
index f6aaa5348..f6aaa5348 100644
--- a/src/tests/test_mac.cpp
+++ b/src/tests/kat_mac.cpp
diff --git a/src/tests/test_modes.cpp b/src/tests/kat_modes.cpp
index 30c3c92db..30c3c92db 100644
--- a/src/tests/test_modes.cpp
+++ b/src/tests/kat_modes.cpp
diff --git a/src/tests/test_nr.cpp b/src/tests/kat_nr.cpp
index 7e038542d..7e038542d 100644
--- a/src/tests/test_nr.cpp
+++ b/src/tests/kat_nr.cpp
diff --git a/src/tests/test_ocb.cpp b/src/tests/kat_ocb.cpp
index b2bd296e0..b2bd296e0 100644
--- a/src/tests/test_ocb.cpp
+++ b/src/tests/kat_ocb.cpp
diff --git a/src/tests/test_passhash.cpp b/src/tests/kat_passhash.cpp
index 6f66743c5..6f66743c5 100644
--- a/src/tests/test_passhash.cpp
+++ b/src/tests/kat_passhash.cpp
diff --git a/src/tests/test_pbkdf.cpp b/src/tests/kat_pbkdf.cpp
index 2bbd98769..2bbd98769 100644
--- a/src/tests/test_pbkdf.cpp
+++ b/src/tests/kat_pbkdf.cpp
diff --git a/src/tests/test_pubkey.cpp b/src/tests/kat_pubkey.cpp
index 7148423cf..7148423cf 100644
--- a/src/tests/test_pubkey.cpp
+++ b/src/tests/kat_pubkey.cpp
diff --git a/src/tests/test_rng.cpp b/src/tests/kat_rng.cpp
index 88e21f62c..88e21f62c 100644
--- a/src/tests/test_rng.cpp
+++ b/src/tests/kat_rng.cpp
diff --git a/src/tests/test_rsa.cpp b/src/tests/kat_rsa.cpp
index 2d24c6073..2d24c6073 100644
--- a/src/tests/test_rsa.cpp
+++ b/src/tests/kat_rsa.cpp
diff --git a/src/tests/test_rw.cpp b/src/tests/kat_rw.cpp
index 99768961b..99768961b 100644
--- a/src/tests/test_rw.cpp
+++ b/src/tests/kat_rw.cpp
diff --git a/src/tests/test_stream.cpp b/src/tests/kat_stream.cpp
index 6492ffee5..6492ffee5 100644
--- a/src/tests/test_stream.cpp
+++ b/src/tests/kat_stream.cpp
diff --git a/src/tests/test_transform.cpp b/src/tests/kat_transform.cpp
index e53b5b800..e53b5b800 100644
--- a/src/tests/test_transform.cpp
+++ b/src/tests/kat_transform.cpp
diff --git a/src/tests/test_tss.cpp b/src/tests/kat_tss.cpp
index f9caddb6f..f9caddb6f 100644
--- a/src/tests/test_tss.cpp
+++ b/src/tests/kat_tss.cpp
diff --git a/src/tests/test_tls.cpp b/src/tests/unit_tls.cpp
index af3627217..af3627217 100644
--- a/src/tests/test_tls.cpp
+++ b/src/tests/unit_tls.cpp
diff --git a/src/tests/test_x509.cpp b/src/tests/unit_x509.cpp
index cd0beec5b..cd0beec5b 100644
--- a/src/tests/test_x509.cpp
+++ b/src/tests/unit_x509.cpp