summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2015-07-12 16:49:19 -0400
committerAndrew Morrow <acm@mongodb.com>2015-07-21 11:25:20 -0400
commita54af46f5c420c18156b99293b88fd6661a5edcb (patch)
treef309ba2028cb5e2116945ab2b993f1799827b71f
parentc7e67d723514aa9b78b9af4fd3996d58704c8f99 (diff)
downloadmongo-a54af46f5c420c18156b99293b88fd6661a5edcb.tar.gz
SERVER-9666 Fold SSLManager library into network
-rw-r--r--src/mongo/util/net/SConscript23
1 files changed, 5 insertions, 18 deletions
diff --git a/src/mongo/util/net/SConscript b/src/mongo/util/net/SConscript
index 64465a7a642..f9f4d8d4daa 100644
--- a/src/mongo/util/net/SConscript
+++ b/src/mongo/util/net/SConscript
@@ -23,21 +23,6 @@ env.CppUnitTest(
)
env.Library(
- target='ssl_manager',
- source=[
- 'ssl_manager.cpp',
- 'ssl_options.cpp',
- 'ssl_expiration.cpp',
- ],
- LIBDEPS=[
- '$BUILD_DIR/mongo/util/foundation',
- '$BUILD_DIR/mongo/db/server_options_core',
- '$BUILD_DIR/mongo/util/background_job',
- '$BUILD_DIR/mongo/util/options_parser/options_parser',
- ],
-)
-
-env.Library(
target='network',
source=[
"httpclient.cpp",
@@ -46,16 +31,18 @@ env.Library(
"message_port.cpp",
"sock.cpp",
"socket_poll.cpp",
+ "ssl_expiration.cpp",
+ "ssl_manager.cpp",
+ "ssl_options.cpp",
],
LIBDEPS=[
- '$BUILD_DIR/mongo/util/background_job',
- '$BUILD_DIR/mongo/util/fail_point',
'$BUILD_DIR/mongo/db/server_options_core',
+ '$BUILD_DIR/mongo/util/background_job',
'$BUILD_DIR/mongo/util/concurrency/ticketholder',
+ '$BUILD_DIR/mongo/util/fail_point',
'$BUILD_DIR/mongo/util/foundation',
'$BUILD_DIR/mongo/util/options_parser/options_parser',
'hostandport',
- 'ssl_manager'
],
)