2 files changed, 22 insertions, 4 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 670df83..4e8a05a 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -371,6 +371,9 @@ set(
         buffer/buf_err.c
         buffer/buf_str.c
         buffer/buffer.c
+        bytestring/bs_ber.c
+        bytestring/bs_cbb.c
+        bytestring/bs_cbs.c
         camellia/cmll_cfb.c
         camellia/cmll_ctr.c
         camellia/cmll_ecb.c
@@ -989,6 +992,7 @@ target_include_directories(crypto_obj
                 .
                 asn1
                 bn
+                bytestring
                 dsa
                 ec
                 ecdh
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 039ef68..f346274 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -1,9 +1,6 @@
 set(
         SSL_SRC
         bio_ssl.c
-        bs_ber.c
-        bs_cbb.c
-        bs_cbs.c
         d1_both.c
         d1_lib.c
         d1_pkt.c
@@ -54,6 +51,13 @@ set(
         tls13_server.c
 )
 
+set(
+        BS_SRC
+        bs_ber.c
+        bs_cbb.c
+        bs_cbs.c
+)
+
 add_library(ssl_obj OBJECT ${SSL_SRC})
 target_include_directories(ssl_obj
         PRIVATE
@@ -62,7 +66,17 @@ target_include_directories(ssl_obj
         PUBLIC
                 ../include)
 
-add_library(ssl $<TARGET_OBJECTS:ssl_obj>)
+add_library(bs_obj OBJECT ${BS_SRC})
+target_include_directories(bs_obj
+        PRIVATE
+                .
+                ../include/compat)
+
+if(BUILD_SHARED_LIBS)
+        add_library(ssl $<TARGET_OBJECTS:ssl_obj> $<TARGET_OBJECTS:bs_obj>)
+else()
+        add_library(ssl $<TARGET_OBJECTS:ssl_obj>)
+endif()
 
 export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym)
 target_link_libraries(ssl crypto ${PLATFORM_LIBS})