SERVER-23494 Cleanup sharding library dependencies

7 files changed, 6 insertions, 26 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 5a50e6e527a..2bb03f107d2 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -292,10 +292,8 @@ env.Install(
         target='mongos',
         source=[
             's/client/sharding_connection_hook_for_mongos.cpp',
-            's/mongos_options.cpp',
             's/mongos_options_init.cpp',
             's/server.cpp',
-            's/version_mongos.cpp',
         ],
         LIBDEPS=[
             'db/conn_pool_options',
diff --git a/src/mongo/client/SConscript b/src/mongo/client/SConscript
index e44fb4c2ca5..2d35ec68c40 100644
--- a/src/mongo/client/SConscript
+++ b/src/mongo/client/SConscript
@@ -241,7 +241,6 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/s/catalog/catalog_cache',
         '$BUILD_DIR/mongo/s/coreshard',
         '$BUILD_DIR/mongo/util/net/network',
         'clientdriver',
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index 44e02235ece..ab6540019e1 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -153,6 +153,7 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/executor/network_test_env',
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor_test_fixture',
         '$BUILD_DIR/mongo/s/catalog/catalog_manager_mock',
+        '$BUILD_DIR/mongo/s/coreshard',
         '$BUILD_DIR/mongo/util/clock_source_mock',
         '$BUILD_DIR/mongo/util/net/message_port_mock',
         '$BUILD_DIR/mongo/util/ntservice_mock',
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index 868ee2d6e96..02f45fd0876 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -23,7 +23,6 @@ env.Library(
         '$BUILD_DIR/mongo/executor/network_interface_factory',
         '$BUILD_DIR/mongo/executor/network_interface_thread_pool',
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
-        '$BUILD_DIR/mongo/s/catalog/catalog_cache',
         '$BUILD_DIR/mongo/s/catalog/replset/catalog_manager_replica_set',
         '$BUILD_DIR/mongo/s/catalog/replset/dist_lock_catalog_impl',
         '$BUILD_DIR/mongo/s/catalog/replset/replset_dist_lock_manager',
@@ -166,6 +165,7 @@ env.Library(
         'balancer/balancer_configuration.cpp',
         'balancer/cluster_statistics.cpp',
         'balancer/cluster_statistics_impl.cpp',
+        'catalog/catalog_cache.cpp',
         'chunk.cpp',
         'chunk_manager.cpp',
         'config.cpp',
@@ -208,8 +208,10 @@ env.Library(
     target='mongoscore',
     source=[
         'cluster_cursor_stats.cpp',
+        'mongos_options.cpp',
         's_only.cpp',
         's_sharding_server_status.cpp',
+        'version_mongos.cpp',
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/auth/authmongos',
diff --git a/src/mongo/s/catalog/SConscript b/src/mongo/s/catalog/SConscript
index 3f44dfe439e..c79fff0d7ab 100644
--- a/src/mongo/s/catalog/SConscript
+++ b/src/mongo/s/catalog/SConscript
@@ -11,6 +11,7 @@ env.SConscript(
 env.Library(
     target='catalog_types',
     source=[
+        'mongo_version_range.cpp',
         'type_changelog.cpp',
         'type_chunk.cpp',
         'type_collection.cpp',
@@ -24,7 +25,6 @@ env.Library(
         'type_tags.cpp',
     ],
     LIBDEPS=[
-        'mongo_version_range',
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/bson/util/bson_extract',
         '$BUILD_DIR/mongo/db/common',
@@ -32,26 +32,6 @@ env.Library(
 )
 
 env.Library(
-    target='mongo_version_range',
-    source=[
-        'mongo_version_range.cpp',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-    ]
-)
-
-env.Library(
-    target='catalog_cache',
-    source=[
-        'catalog_cache.cpp',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/s/coreshard',
-    ],
-)
-
-env.Library(
     target='catalog_manager_mock',
     source=[
         'catalog_manager_mock.cpp',
diff --git a/src/mongo/s/commands/SConscript b/src/mongo/s/commands/SConscript
index 995d38a4fa7..24750e28ff9 100644
--- a/src/mongo/s/commands/SConscript
+++ b/src/mongo/s/commands/SConscript
@@ -71,6 +71,7 @@ env.Library(
         '$BUILD_DIR/mongo/client/parallel',
         '$BUILD_DIR/mongo/db/pipeline/pipeline',
         '$BUILD_DIR/mongo/db/commands/killcursors_common',
+        '$BUILD_DIR/mongo/s/cluster_ops_impl',
         '$BUILD_DIR/mongo/s/coreshard',
         '$BUILD_DIR/mongo/s/mongoscore',
     ]
diff --git a/src/mongo/s/query/SConscript b/src/mongo/s/query/SConscript
index 4e67289179d..ae3d0c3e786 100644
--- a/src/mongo/s/query/SConscript
+++ b/src/mongo/s/query/SConscript
@@ -10,7 +10,6 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/commands',
         '$BUILD_DIR/mongo/db/query/query_common',
-        '$BUILD_DIR/mongo/s/catalog/catalog_cache',
         "cluster_client_cursor",
         "cluster_cursor_cleanup_job",
         "store_possible_cursor",