diff options
| author | Andrew Morrow <acm@mongodb.com> | 2015-04-27 17:48:20 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2015-04-29 17:18:11 -0400 |
| commit | a6ccfd6ded36ebe0a87ccdd8a0de02be1f87db12 (patch) | |
| tree | 50a70308aac302068077d241446a997c681b4d85 /src/mongo/SConscript | |
| parent | 13eb802f3a5379373a71ce6711da76ee169dc917 (diff) | |
| download | mongo-a6ccfd6ded36ebe0a87ccdd8a0de02be1f87db12.tar.gz | |
SERVER-9666 Push mongodandmongos and mongodwebserver into db directory
Diffstat (limited to 'src/mongo/SConscript')
| -rw-r--r-- | src/mongo/SConscript | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript index 3f0fbb22579..9d452cab507 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -533,26 +533,6 @@ if wiredtiger: serveronlyEnv.Library("serveronly", serverOnlyFiles, LIBDEPS=serveronlyLibdeps ) -# These files go into mongos and mongod only, not into the shell or any tools. -mongodAndMongosFiles = [ - "db/initialize_server_global_state.cpp", - "db/server_extra_log_context.cpp", - "db/dbwebserver.cpp", - ] -env.Library("mongodandmongos", mongodAndMongosFiles, - LIBDEPS=["util/net/message_server_port", "util/signal_handlers"]) - -env.Library("mongodwebserver", - [ - "db/clientlistplugin.cpp", - "db/repl/replset_web_handler.cpp", - "db/restapi.cpp", - "db/stats/snapshots_webplugins.cpp", - ], - LIBDEPS=["coredb", - "mongodandmongos", - "$BUILD_DIR/mongo/db/repl/repl_coordinator_global"]) - mongodOnlyFiles = [ "db/db.cpp", "db/mongod_options_init.cpp" ] # ----- TARGETS ------ @@ -589,8 +569,8 @@ mongod = env.Install( LIBDEPS=[ "coredb", "coreserver", - "mongodandmongos", - "mongodwebserver", + "db/mongodandmongos", + "db/mongodwebserver", "util/ntservice", "serveronly", "mongod_options", @@ -651,7 +631,7 @@ env.Install( "mongocommon", "s/coreshard", "util/ntservice", - "mongodandmongos", + "db/mongodandmongos", '$BUILD_DIR/mongo/util/options_parser/options_parser_init', ])) |