SERVER-9666 Push serveronly library into db directory

10 files changed, 217 insertions, 210 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index f4ef26c0ce4..79e757099a0 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -15,7 +15,6 @@ Import("has_option")
 Import("get_option")
 Import("usev8")
 Import("use_system_version_of_library")
-Import("wiredtiger")
 
 # Boost we need everywhere. 's2' is spammed in all over the place by
 # db/geo unfortunately. pcre is also used many places.
@@ -191,198 +190,6 @@ env.CppUnitTest(
     LIBDEPS=["mongocommon"]
 )
 
-# mongod files - also files used in tools. present in dbtests, but not in mongos and not in client
-# libs.
-serverOnlyFiles = [ "db/background.cpp",
-                    "db/catalog/apply_ops.cpp",
-                    "db/catalog/create_collection.cpp",
-                    "db/catalog/coll_mod.cpp",
-                    "db/catalog/collection.cpp",
-                    "db/catalog/collection_compact.cpp",
-                    "db/catalog/collection_info_cache.cpp",
-                    "db/catalog/capped_utils.cpp",
-                    "db/catalog/cursor_manager.cpp",
-                    "db/catalog/database.cpp",
-                    "db/catalog/database_holder.cpp",
-                    "db/catalog/drop_collection.cpp",
-                    "db/catalog/drop_database.cpp",
-                    "db/catalog/drop_indexes.cpp",
-                    "db/catalog/rename_collection.cpp",
-                    "db/catalog/index_catalog.cpp",
-                    "db/catalog/index_catalog_entry.cpp",
-                    "db/catalog/index_create.cpp",
-                    "db/db_raii.cpp",
-                    "db/clientcursor.cpp",
-                    "db/cloner.cpp",
-                    "db/commands/apply_ops.cpp",
-                    "db/commands/cleanup_orphaned_cmd.cpp",
-                    "db/commands/clone.cpp",
-                    "db/commands/clone_collection.cpp",
-                    "db/commands/collection_to_capped.cpp",
-                    "db/commands/compact.cpp",
-                    "db/commands/copydb.cpp",
-                    "db/commands/copydb_start_commands.cpp",
-                    "db/commands/count.cpp",
-                    "db/commands/create_indexes.cpp",
-                    "db/commands/current_op.cpp",
-                    "db/commands/cursor_responses.cpp",
-                    "db/commands/dbhash.cpp",
-                    "db/commands/distinct.cpp",
-                    "db/commands/drop_indexes.cpp",
-                    "db/commands/explain_cmd.cpp",
-                    "db/commands/find_and_modify.cpp",
-                    "db/commands/find_cmd.cpp",
-                    "db/commands/fsync.cpp",
-                    "db/commands/geo_near_cmd.cpp",
-                    "db/commands/get_last_error.cpp",
-                    "db/commands/getmore_cmd.cpp",
-                    "db/commands/group.cpp",
-                    "db/commands/index_filter_commands.cpp",
-                    "db/commands/kill_op.cpp",
-                    "db/commands/list_collections.cpp",
-                    "db/commands/list_databases.cpp",
-                    "db/commands/list_indexes.cpp",
-                    "db/commands/merge_chunks_cmd.cpp",
-                    "db/commands/mr.cpp",
-                    "db/commands/oplog_note.cpp",
-                    "db/commands/parallel_collection_scan.cpp",
-                    "db/commands/pipeline_command.cpp",
-                    "db/commands/plan_cache_commands.cpp",
-                    "db/commands/rename_collection.cpp",
-                    "db/commands/repair_cursor.cpp",
-                    "db/commands/test_commands.cpp",
-                    'db/commands/top_command.cpp',
-                    "db/commands/touch.cpp",
-                    "db/commands/validate.cpp",
-                    "db/commands/write_commands/batch_executor.cpp",
-                    "db/commands/write_commands/write_commands.cpp",
-                    "db/commands/writeback_compatibility_shim.cpp",
-                    "db/dbcommands.cpp",
-                    "db/dbdirectclient.cpp",
-                    "db/dbeval.cpp",
-                    "db/dbhelpers.cpp",
-                    "db/driverHelpers.cpp",
-                    "db/geo/haystack.cpp",
-                    "db/service_context_d.cpp",
-                    "db/index/2d_access_method.cpp",
-                    "db/index/btree_access_method.cpp",
-                    "db/index/fts_access_method.cpp",
-                    "db/index/hash_access_method.cpp",
-                    "db/index/haystack_access_method.cpp",
-                    "db/index/index_access_method.cpp",
-                    "db/index/s2_access_method.cpp",
-                    "db/index_builder.cpp",
-                    "db/index_legacy.cpp",
-                    "db/index_rebuilder.cpp",
-                    "db/instance.cpp",
-                    "db/introspect.cpp",
-                    "db/matcher/expression_where.cpp",
-                    "db/operation_context_impl.cpp",
-                    "db/op_observer.cpp",
-                    "db/ops/delete.cpp",
-                    "db/ops/insert.cpp",
-                    "db/ops/parsed_delete.cpp",
-                    "db/ops/parsed_update.cpp",
-                    "db/ops/update.cpp",
-                    "db/ops/update_lifecycle_impl.cpp",
-                    "db/ops/update_result.cpp",
-                    "db/pipeline/document_source_cursor.cpp",
-                    "db/pipeline/pipeline_d.cpp",
-                    "db/prefetch.cpp",
-                    "db/range_deleter_db_env.cpp",
-                    "db/range_deleter_service.cpp",
-                    "db/repair_database.cpp",
-                    "db/repl/bgsync.cpp",
-                    "db/repl/initial_sync.cpp",
-                    "db/repl/master_slave.cpp",
-                    "db/repl/minvalid.cpp",
-                    "db/repl/oplog.cpp",
-                    "db/repl/oplogreader.cpp",
-                    "db/repl/replication_coordinator_external_state_impl.cpp",
-                    "db/repl/replication_info.cpp",
-                    "db/repl/resync.cpp",
-                    "db/repl/rs_initialsync.cpp",
-                    "db/repl/rs_rollback.cpp",
-                    "db/repl/rs_sync.cpp",
-                    "db/repl/sync.cpp",
-                    "db/repl/sync_source_feedback.cpp",
-                    "db/repl/sync_tail.cpp",
-                    "db/stats/fill_locker_info.cpp",
-                    "db/stats/lock_server_status_section.cpp",
-                    "db/stats/range_deleter_server_status.cpp",
-                    "db/stats/snapshots.cpp",
-                    "db/storage/storage_init.cpp",
-                    "db/storage_options.cpp",
-                    "db/ttl.cpp",
-                    "db/write_concern.cpp",
-                ]
-
-if has_option( 'use-cpu-profiler' ):
-    serverOnlyFiles.append( 'db/commands/cpuprofile.cpp' )
-    env.Append(LIBS=['unwind'])
-    # If we are building with our internal gperftools, add the necessary include path.
-    #
-    # NOTE: This is pretty bad because it will spam this include path into many files that
-    # don't require it, but because of the way things are currently set up, it is not easy to
-    # scope it more narrowly. Better would be if the commands were a library, and could be
-    # conditionally made to depend on this file, as a library and then we could easily scope
-    # just to this file.
-    env.InjectThirdPartyIncludePaths('tcmalloc')
-
-serveronlyEnv = env.Clone()
-serveronlyEnv.InjectThirdPartyIncludePaths(libraries=['snappy'])
-serveronlyLibdeps = ["s/coreshard",
-                     'db/curop',
-                     "db/auth/authmongod",
-                     "db/fts/ftsmongod",
-                     "db/common",
-                     "db/concurrency/lock_manager",
-                     "db/concurrency/write_conflict_exception",
-                     "db/ops/update_driver",
-                     "db/global_timestamp",
-                     "db/catalog/index_key_validate",
-                     'db/range_deleter',
-                     'scripting/scripting_server',
-                     "db/update_index_data",
-                     's/metadata',
-                     's/batch_write_types',
-                     's/catalog/legacy/catalog_manager_legacy',
-                     's/client/sharding_connection_hook',
-                     "db/catalog/collection_options",
-                     "db/exec/working_set",
-                     "db/exec/exec",
-                     "db/index/index_descriptor",
-                     "db/query/query",
-                     "db/repl/repl_settings",
-                     "db/repl/network_interface_impl",
-                     "db/repl/replication_executor",
-                     "db/repl/repl_coordinator_impl",
-                     "db/repl/topology_coordinator_impl",
-                     "db/repl/replset_commands",
-                     "db/repl/repl_coordinator_global",
-                     "db/repl/replication_executor",
-                     "db/repl/rslog",
-                     'db/startup_warnings_mongod',
-                     'db/stats/top',
-                     'db/storage/devnull/storage_devnull',
-                     'db/storage/in_memory/storage_in_memory',
-                     'db/storage/mmap_v1/storage_mmapv1',
-                     'db/storage/storage_engine_lock_file',
-                     'db/storage/storage_engine_metadata',
-                     'util/mmap',
-                     'util/elapsed_tracker',
-                     '$BUILD_DIR/third_party/shim_snappy',
-                     'client/parallel',
-                     's/serveronly',
-                 ]
-
-if wiredtiger:
-    serveronlyLibdeps.append( 'db/storage/wiredtiger/storage_wiredtiger' )
-    serveronlyLibdeps.append( '$BUILD_DIR/third_party/shim_wiredtiger')
-
-serveronlyEnv.Library("serveronly", serverOnlyFiles,
-                      LIBDEPS=serveronlyLibdeps )
-
 env.Library(
     target='coreserver',
     source=[
@@ -409,7 +216,7 @@ mongod = env.Program(
         "db/mongod_options",
         "db/mongodandmongos",
         "db/mongodwebserver",
-        "serveronly",
+        "db/serveronly",
         "util/ntservice",
     ],
 )
@@ -429,7 +236,7 @@ env.Install(
                     ],
                     LIBDEPS=[
                         "util/ntservice_mock",
-                        "serveronly",
+                        "db/serveronly",
                         "coreserver",
                         "db/coredb",
                         "util/signal_handlers_synchronous",
@@ -474,7 +281,7 @@ if env.TargetOSIs('osx') or env["_HAVEPCAP"]:
 
     sniffEnv.Install( '#/', sniffEnv.Program( "mongosniff", "tools/sniffer.cpp",
                                               LIBDEPS = [
-                                                 "serveronly",
+                                                 "db/serveronly",
                                                  "coreserver",
                                                  "db/coredb",
                                                  "util/signal_handlers_synchronous",
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 918307c1ae2..f2b76b32215 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -1,6 +1,8 @@
 # -*- mode: python -*-
 
 Import("env")
+Import("has_option")
+Import("wiredtiger")
 
 env.SConscript(
     dirs=[
@@ -374,7 +376,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/coredb',
         '$BUILD_DIR/mongo/coreserver',
         '$BUILD_DIR/mongo/mongocommon',
-        '$BUILD_DIR/mongo/serveronly',
+        '$BUILD_DIR/mongo/db/serveronly',
         '$BUILD_DIR/mongo/util/options_parser/options_parser_init',
         'server_options',
     ],
@@ -477,3 +479,201 @@ coredbEnv.Library(
         'startup_warnings_common',
     ],
 )
+
+
+# mongod files - also files used in tools. present in dbtests, but not in mongos and not in client
+# libs.
+serverOnlyFiles = [
+    "background.cpp",
+    "catalog/apply_ops.cpp",
+    "catalog/capped_utils.cpp",
+    "catalog/coll_mod.cpp",
+    "catalog/collection.cpp",
+    "catalog/collection_compact.cpp",
+    "catalog/collection_info_cache.cpp",
+    "catalog/create_collection.cpp",
+    "catalog/cursor_manager.cpp",
+    "catalog/database.cpp",
+    "catalog/database_holder.cpp",
+    "catalog/drop_collection.cpp",
+    "catalog/drop_database.cpp",
+    "catalog/drop_indexes.cpp",
+    "catalog/index_catalog.cpp",
+    "catalog/index_catalog_entry.cpp",
+    "catalog/index_create.cpp",
+    "catalog/rename_collection.cpp",
+    "clientcursor.cpp",
+    "cloner.cpp",
+    "commands/apply_ops.cpp",
+    "commands/cleanup_orphaned_cmd.cpp",
+    "commands/clone.cpp",
+    "commands/clone_collection.cpp",
+    "commands/collection_to_capped.cpp",
+    "commands/compact.cpp",
+    "commands/copydb.cpp",
+    "commands/copydb_start_commands.cpp",
+    "commands/count.cpp",
+    "commands/create_indexes.cpp",
+    "commands/current_op.cpp",
+    "commands/cursor_responses.cpp",
+    "commands/dbhash.cpp",
+    "commands/distinct.cpp",
+    "commands/drop_indexes.cpp",
+    "commands/explain_cmd.cpp",
+    "commands/find_and_modify.cpp",
+    "commands/find_cmd.cpp",
+    "commands/fsync.cpp",
+    "commands/geo_near_cmd.cpp",
+    "commands/get_last_error.cpp",
+    "commands/getmore_cmd.cpp",
+    "commands/group.cpp",
+    "commands/index_filter_commands.cpp",
+    "commands/kill_op.cpp",
+    "commands/list_collections.cpp",
+    "commands/list_databases.cpp",
+    "commands/list_indexes.cpp",
+    "commands/merge_chunks_cmd.cpp",
+    "commands/mr.cpp",
+    "commands/oplog_note.cpp",
+    "commands/parallel_collection_scan.cpp",
+    "commands/pipeline_command.cpp",
+    "commands/plan_cache_commands.cpp",
+    "commands/rename_collection.cpp",
+    "commands/repair_cursor.cpp",
+    "commands/test_commands.cpp",
+    "commands/top_command.cpp",
+    "commands/touch.cpp",
+    "commands/validate.cpp",
+    "commands/write_commands/batch_executor.cpp",
+    "commands/write_commands/write_commands.cpp",
+    "commands/writeback_compatibility_shim.cpp",
+    "db_raii.cpp",
+    "dbcommands.cpp",
+    "dbdirectclient.cpp",
+    "dbeval.cpp",
+    "dbhelpers.cpp",
+    "driverHelpers.cpp",
+    "geo/haystack.cpp",
+    "index/2d_access_method.cpp",
+    "index/btree_access_method.cpp",
+    "index/fts_access_method.cpp",
+    "index/hash_access_method.cpp",
+    "index/haystack_access_method.cpp",
+    "index/index_access_method.cpp",
+    "index/s2_access_method.cpp",
+    "index_builder.cpp",
+    "index_legacy.cpp",
+    "index_rebuilder.cpp",
+    "instance.cpp",
+    "introspect.cpp",
+    "matcher/expression_where.cpp",
+    "op_observer.cpp",
+    "operation_context_impl.cpp",
+    "ops/delete.cpp",
+    "ops/insert.cpp",
+    "ops/parsed_delete.cpp",
+    "ops/parsed_update.cpp",
+    "ops/update.cpp",
+    "ops/update_lifecycle_impl.cpp",
+    "ops/update_result.cpp",
+    "pipeline/document_source_cursor.cpp",
+    "pipeline/pipeline_d.cpp",
+    "prefetch.cpp",
+    "range_deleter_db_env.cpp",
+    "range_deleter_service.cpp",
+    "repair_database.cpp",
+    "repl/bgsync.cpp",
+    "repl/initial_sync.cpp",
+    "repl/master_slave.cpp",
+    "repl/minvalid.cpp",
+    "repl/oplog.cpp",
+    "repl/oplogreader.cpp",
+    "repl/replication_coordinator_external_state_impl.cpp",
+    "repl/replication_info.cpp",
+    "repl/resync.cpp",
+    "repl/rs_initialsync.cpp",
+    "repl/rs_rollback.cpp",
+    "repl/rs_sync.cpp",
+    "repl/sync.cpp",
+    "repl/sync_source_feedback.cpp",
+    "repl/sync_tail.cpp",
+    "service_context_d.cpp",
+    "stats/fill_locker_info.cpp",
+    "stats/lock_server_status_section.cpp",
+    "stats/range_deleter_server_status.cpp",
+    "stats/snapshots.cpp",
+    "storage/storage_init.cpp",
+    "storage_options.cpp",
+    "ttl.cpp",
+    "write_concern.cpp",
+]
+
+if has_option('use-cpu-profiler'):
+    serverOnlyFiles.append('db/commands/cpuprofile.cpp')
+    env.Append(LIBS=['unwind'])
+    # If we are building with our internal gperftools, add the necessary include path.
+    #
+    # NOTE: This is pretty bad because it will spam this include path into many files that
+    # don't require it, but because of the way things are currently set up, it is not easy to
+    # scope it more narrowly. Better would be if the commands were a library, and could be
+    # conditionally made to depend on this file, as a library and then we could easily scope
+    # just to this file.
+    env.InjectThirdPartyIncludePaths('tcmalloc')
+
+serveronlyEnv = env.Clone()
+serveronlyEnv.InjectThirdPartyIncludePaths(libraries=['snappy'])
+serveronlyLibdeps = [
+    "$BUILD_DIR/mongo/client/parallel",
+    "$BUILD_DIR/mongo/s/batch_write_types",
+    "$BUILD_DIR/mongo/s/catalog/legacy/catalog_manager_legacy",
+    "$BUILD_DIR/mongo/s/client/sharding_connection_hook",
+    "$BUILD_DIR/mongo/s/coreshard",
+    "$BUILD_DIR/mongo/s/metadata",
+    "$BUILD_DIR/mongo/s/serveronly",
+    "$BUILD_DIR/mongo/scripting/scripting_server",
+    "$BUILD_DIR/mongo/util/elapsed_tracker",
+    "$BUILD_DIR/mongo/util/mmap",
+    "$BUILD_DIR/third_party/shim_snappy",
+    "auth/authmongod",
+    "catalog/collection_options",
+    "catalog/index_key_validate",
+    "common",
+    "concurrency/lock_manager",
+    "concurrency/write_conflict_exception",
+    "curop",
+    "exec/exec",
+    "exec/working_set",
+    "fts/ftsmongod",
+    "global_timestamp",
+    "index/index_descriptor",
+    "ops/update_driver",
+    "query/query",
+    "range_deleter",
+    "repl/network_interface_impl",
+    "repl/repl_coordinator_global",
+    "repl/repl_coordinator_impl",
+    "repl/repl_settings",
+    "repl/replication_executor",
+    "repl/replication_executor",
+    "repl/replset_commands",
+    "repl/rslog",
+    "repl/topology_coordinator_impl",
+    "startup_warnings_mongod",
+    "stats/top",
+    "storage/devnull/storage_devnull",
+    "storage/in_memory/storage_in_memory",
+    "storage/mmap_v1/storage_mmapv1",
+    "storage/storage_engine_lock_file",
+    "storage/storage_engine_metadata",
+    "update_index_data",
+]
+
+if wiredtiger:
+    serveronlyLibdeps.append('storage/wiredtiger/storage_wiredtiger')
+    serveronlyLibdeps.append('$BUILD_DIR/third_party/shim_wiredtiger')
+
+serveronlyEnv.Library(
+    target="serveronly",
+    source=serverOnlyFiles,
+    LIBDEPS=serveronlyLibdeps,
+)
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index 15a49e2cefb..8d8c99a4c84 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -21,7 +21,7 @@ env.CppUnitTest(
     LIBDEPS=[
         "$BUILD_DIR/mongo/db/coredb",
         "$BUILD_DIR/mongo/coreserver",
-        "$BUILD_DIR/mongo/serveronly",
+        "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/util/ntservice_mock",
     ],
     NO_CRUTCH = True,
@@ -35,7 +35,7 @@ env.CppUnitTest(
     LIBDEPS=[
         "$BUILD_DIR/mongo/db/coredb",
         "$BUILD_DIR/mongo/coreserver",
-        "$BUILD_DIR/mongo/serveronly",
+        "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/util/ntservice_mock",
     ],
     NO_CRUTCH = True,
@@ -49,7 +49,7 @@ env.CppUnitTest(
     LIBDEPS=[
         "$BUILD_DIR/mongo/db/coredb",
         "$BUILD_DIR/mongo/coreserver",
-        "$BUILD_DIR/mongo/serveronly",
+        "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/util/ntservice_mock",
     ],
     NO_CRUTCH = True,
diff --git a/src/mongo/db/exec/SConscript b/src/mongo/db/exec/SConscript
index 3ad15c141a6..8f7b330a86b 100644
--- a/src/mongo/db/exec/SConscript
+++ b/src/mongo/db/exec/SConscript
@@ -83,7 +83,7 @@ env.CppUnitTest(
     ],
     LIBDEPS = [
         "exec",
-        "$BUILD_DIR/mongo/serveronly",
+        "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/coreserver",
         "$BUILD_DIR/mongo/db/coredb",
         "$BUILD_DIR/mongo/dbtests/mocklib",
@@ -99,7 +99,7 @@ env.CppUnitTest(
     ],
     LIBDEPS = [
         "exec",
-        "$BUILD_DIR/mongo/serveronly",
+        "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/coreserver",
         "$BUILD_DIR/mongo/db/coredb",
         "$BUILD_DIR/mongo/dbtests/mocklib",
@@ -115,7 +115,7 @@ env.CppUnitTest(
     ],
     LIBDEPS = [
         "exec",
-        "$BUILD_DIR/mongo/serveronly",
+        "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/coreserver",
         "$BUILD_DIR/mongo/db/coredb",
         "$BUILD_DIR/mongo/util/ntservice_mock",
diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript
index 5e0e466653a..9a789d9b78a 100644
--- a/src/mongo/db/query/SConscript
+++ b/src/mongo/db/query/SConscript
@@ -60,7 +60,7 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         "query",
-        "$BUILD_DIR/mongo/serveronly",
+        "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/coreserver",
         "$BUILD_DIR/mongo/db/coredb",
         "$BUILD_DIR/mongo/dbtests/mocklib",
@@ -296,7 +296,7 @@ env.CppUnitTest(
     LIBDEPS=[
         "query",
         "query_planner_test_fixture",
-        "$BUILD_DIR/mongo/serveronly",
+        "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/coreserver",
         "$BUILD_DIR/mongo/db/coredb",
         "$BUILD_DIR/mongo/dbtests/mocklib",
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index 1bd8f450456..d1a2eb64129 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -289,7 +289,7 @@ env.CppUnitTest('isself_test',
                     'isself_test.cpp',
                 ],
                 LIBDEPS=[
-                    '$BUILD_DIR/mongo/serveronly',
+                    '$BUILD_DIR/mongo/db/serveronly',
                     '$BUILD_DIR/mongo/coreserver',
                     '$BUILD_DIR/mongo/db/coredb',
                     "$BUILD_DIR/mongo/util/ntservice_mock",
diff --git a/src/mongo/db/storage/mmap_v1/SConscript b/src/mongo/db/storage/mmap_v1/SConscript
index 5bf9df68e07..19efd623f5f 100644
--- a/src/mongo/db/storage/mmap_v1/SConscript
+++ b/src/mongo/db/storage/mmap_v1/SConscript
@@ -89,7 +89,7 @@ env.CppUnitTest(
     source=['mmap_v1_init_test.cpp',
             ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/serveronly',
+        '$BUILD_DIR/mongo/db/serveronly',
         '$BUILD_DIR/mongo/coreserver',
         '$BUILD_DIR/mongo/db/coredb',
         '$BUILD_DIR/mongo/util/ntservice_mock',
diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript
index 895d58e7ad7..d0fe8e1e893 100644
--- a/src/mongo/db/storage/wiredtiger/SConscript
+++ b/src/mongo/db/storage/wiredtiger/SConscript
@@ -85,7 +85,7 @@ if wiredtiger:
         source=['wiredtiger_init_test.cpp',
                 ],
         LIBDEPS=[
-            '$BUILD_DIR/mongo/serveronly',
+            '$BUILD_DIR/mongo/db/serveronly',
             '$BUILD_DIR/mongo/coreserver',
             '$BUILD_DIR/mongo/db/coredb',
             '$BUILD_DIR/mongo/util/ntservice_mock',
diff --git a/src/mongo/dbtests/SConscript b/src/mongo/dbtests/SConscript
index 8731ce1933a..9a7faf3ffe3 100644
--- a/src/mongo/dbtests/SConscript
+++ b/src/mongo/dbtests/SConscript
@@ -112,7 +112,7 @@ dbtest = env.Program(
         "$BUILD_DIR/mongo/bson/mutable/mutable_bson_test_utils",
         "$BUILD_DIR/mongo/s/cluster_ops",
         "$BUILD_DIR/mongo/s/cluster_ops_impl",
-        "$BUILD_DIR/mongo/serveronly",
+        "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/util/signal_handlers_synchronous",
         "mocklib",
         "testframework",
diff --git a/src/mongo/tools/SConscript b/src/mongo/tools/SConscript
index fe5492416be..df4976ce629 100644
--- a/src/mongo/tools/SConscript
+++ b/src/mongo/tools/SConscript
@@ -12,7 +12,7 @@ mongobridge = env.Program(
     LIBDEPS=[
         "$BUILD_DIR/mongo/db/coredb",
         "$BUILD_DIR/mongo/coreserver",
-        "$BUILD_DIR/mongo/serveronly",
+        "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/util/ntservice_mock",
         "$BUILD_DIR/mongo/util/options_parser/options_parser_init",
         "$BUILD_DIR/mongo/util/signal_handlers_synchronous",