SERVER-59438 clean up db/catalog/SConscript LIBDEPS

1 files changed, 41 insertions, 34 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 294d0a376b0..44ac62e3540 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -593,7 +593,7 @@ env.Library(
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/bson/mutable/mutable_bson',
         '$BUILD_DIR/mongo/db/auth/authprivilege',
-        '$BUILD_DIR/mongo/db/catalog/collection_options_idl',
+        '$BUILD_DIR/mongo/db/catalog/collection_options',
         '$BUILD_DIR/mongo/db/commands/create_command',
         '$BUILD_DIR/mongo/db/query/common_query_enums_and_helpers',
         '$BUILD_DIR/mongo/idl/idl_parser',
@@ -987,6 +987,7 @@ env.Library(
         'catalog/database_holder',
         'db_raii',
         'index_build_entry_helpers',
+        'resumable_index_builds_idl',
         'server_options_core',
     ],
 )
@@ -1049,7 +1050,7 @@ env.Library(
         "introspect.cpp",
     ],
     LIBDEPS_PRIVATE=[
-        "$BUILD_DIR/mongo/db/catalog/collection_options_idl",
+        "$BUILD_DIR/mongo/db/catalog/collection_options",
         "$BUILD_DIR/mongo/db/concurrency/write_conflict_exception",
         "$BUILD_DIR/mongo/db/stats/resource_consumption_metrics",
         "db_raii",
@@ -1126,16 +1127,17 @@ env.Library(
         'vector_clock',
     ],
     LIBDEPS_PRIVATE=[
-        'catalog/collection_validation',
-        'catalog/database_holder',
-        'catalog/document_validation',
-        'catalog/index_key_validate',
-        'catalog/multi_index_block',
+        '$BUILD_DIR/mongo/db/catalog/collection_validation',
+        '$BUILD_DIR/mongo/db/catalog/database_holder',
+        '$BUILD_DIR/mongo/db/catalog/document_validation',
+        '$BUILD_DIR/mongo/db/catalog/index_key_validate',
+        '$BUILD_DIR/mongo/db/catalog/multi_index_block',
+        '$BUILD_DIR/mongo/db/catalog/validate_results',
+        '$BUILD_DIR/mongo/db/repl/oplog',
+        '$BUILD_DIR/mongo/db/storage/storage_repair_observer',
+        '$BUILD_DIR/mongo/db/storage/storage_util',
         'index_builds_coordinator_interface',
         'rebuild_indexes',
-        'repl/oplog',
-        'storage/storage_repair_observer',
-        'storage/storage_util',
     ],
 )
 
@@ -1331,15 +1333,17 @@ env.Library(
         "startup_recovery.cpp",
     ],
     LIBDEPS_PRIVATE=[
-        'catalog/catalog_helpers',
-        'catalog/database_holder',
-        'commands/mongod_fcv',
+        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
+        '$BUILD_DIR/mongo/db/catalog/database_holder',
+        '$BUILD_DIR/mongo/db/catalog/multi_index_block',
+        '$BUILD_DIR/mongo/db/commands/mongod_fcv',
+        '$BUILD_DIR/mongo/db/repl/repl_settings',
+        '$BUILD_DIR/mongo/db/storage/storage_repair_observer',
         'dbdirectclient',
         'dbhelpers',
+        'index_builds_coordinator_interface',
         'rebuild_indexes',
         'repair',
-        'repl/repl_settings',
-        'storage/storage_repair_observer',
     ],
 )
 
@@ -1436,7 +1440,7 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/auth/authprivilege',
-        '$BUILD_DIR/mongo/db/catalog/commit_quorum_idl',
+        '$BUILD_DIR/mongo/db/catalog/commit_quorum_options',
         '$BUILD_DIR/mongo/idl/idl_parser',
     ],
 )
@@ -1869,16 +1873,17 @@ env.Library(
         'service_context_test_fixture',
     ],
     LIBDEPS_PRIVATE=[
-        'catalog/catalog_impl',
-        'commands/mongod',
-        'index/index_access_methods',
+        '$BUILD_DIR/mongo/db/catalog/catalog_impl',
+        '$BUILD_DIR/mongo/db/commands/mongod',
+        '$BUILD_DIR/mongo/db/index/index_access_method_factory',
+        '$BUILD_DIR/mongo/db/index/index_access_methods',
+        '$BUILD_DIR/mongo/db/s/sharding_runtime_d',
+        '$BUILD_DIR/mongo/db/storage/devnull/storage_devnull',
+        '$BUILD_DIR/mongo/db/storage/ephemeral_for_test/storage_ephemeral_for_test',
+        '$BUILD_DIR/mongo/db/storage/storage_control',
+        '$BUILD_DIR/mongo/db/storage/storage_options',
         'index_builds_coordinator_mongod',
-        's/sharding_runtime_d',
         'service_context_d',
-        'storage/devnull/storage_devnull',
-        'storage/ephemeral_for_test/storage_ephemeral_for_test',
-        'storage/storage_control',
-        'storage/storage_options',
     ],
 )
 
@@ -2302,19 +2307,21 @@ env.Library(
         '$BUILD_DIR/mongo/transport/transport_layer_mock',
     ],
     LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/auth/auth',
+        '$BUILD_DIR/mongo/db/auth/authmocks',
+        '$BUILD_DIR/mongo/db/catalog/catalog_impl',
+        '$BUILD_DIR/mongo/db/catalog/database_holder',
+        '$BUILD_DIR/mongo/db/index/index_access_method_factory',
+        '$BUILD_DIR/mongo/db/index/index_access_methods',
+        '$BUILD_DIR/mongo/db/repl/replmocks',
+        '$BUILD_DIR/mongo/db/s/sharding_api_d',
+        '$BUILD_DIR/mongo/db/storage/ephemeral_for_test/storage_ephemeral_for_test',
+        '$BUILD_DIR/mongo/db/storage/storage_control',
+        '$BUILD_DIR/mongo/db/storage/storage_options',
         '$BUILD_DIR/mongo/rpc/rpc',
-        '$BUILD_DIR/mongo/transport/service_entry_point',
         '$BUILD_DIR/mongo/unittest/unittest',
-        'auth/auth',
-        'auth/authmocks',
-        'catalog/catalog_impl',
-        'index/index_access_methods',
-        'repl/replmocks',
-        's/sharding_api_d',
+        'op_observer',
         'service_context_d',
-        'storage/ephemeral_for_test/storage_ephemeral_for_test',
-        'storage/storage_control',
-        'storage/storage_options',
     ],
 )