Initial patch from Will.

src/platform/cryptohome/SConstruct

 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import sys
 
 env = Environment()
 
 # define generic dbus server/client bindings builders
 dbus_server_builder = Builder(action = 'dbus-binding-tool --mode=glib-server --prefix=`basename $SOURCE .xml` $SOURCE > $TARGET')
 dbus_client_builder = Builder(action = 'dbus-binding-tool --mode=glib-client --prefix=`basename $SOURCE .xml` $SOURCE > $TARGET')
 env.Append(BUILDERS = { 'DbusServerBindings' : dbus_server_builder,
                         'DbusClientBindings' : dbus_client_builder})
 # setup sources
-serverlib_sources = env.Split("""authenticator.cc
-                                 interface.cc
-                                 service.cc
-                                 username_passhash.cc
+serverlib_sources = env.Split("""interface.cc
+                                 mount.cc
+                                 secure_blob.cc
+                                 service.cc
+                                 username_passkey.cc
+                                 vault_keyset.cc
                               """)
 server_sources = env.Split("""cryptohomed.cc""")
-example_sources = env.Split("""example_client.cc
+client_sources = env.Split("""cryptohome.cc
+                              secure_blob.cc
+                              username_passkey.cc
                             """)
-test_sources = env.Split("""authenticator_unittest.cc
-                            service_unittest.cc
-                            username_passhash_unittest.cc
+test_sources = env.Split("""service_unittest.cc
+                            mount_unittest.cc
+                            username_passkey_unittest.cc
                             cryptohome_testrunner.cc
                          """)
 
 
 
 env.Append(
     CPPPATH=['.', '..'],
     CPPFLAGS=['-pie', '-fstack-protector-all',
               '-fno-exceptions', '-O2', '-Wall', '-Werror'],
-    LIBS = ['base', 'chromeos', 'rt', 'crypto'],
+    LIBS = ['base', 'chromeos', 'rt', 'crypto', 'ecryptfs', 'keyutils'],
 )
 for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'):
   value = os.environ.get(key)
   if value != None:
     env[key] = value
 
 # Fix issue with scons not passing some vars through the environment.
 for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'):
   if os.environ.has_key(key):
     env['ENV'][key] = os.environ[key]
 
 env.Append(LIBPATH = ['.'])
 env.ParseConfig('pkg-config --cflags --libs gobject-2.0 dbus-1 dbus-glib-1')
 
 env_serverlib = env.Clone()
 env_serverlib.DbusServerBindings('bindings/server.h', 'cryptohome.xml')
 env_serverlib.SharedLibrary('cryptohome_service', serverlib_sources)
 
 env_server = env.Clone()
 env_server.Append(LIBS=['cryptohome_service'])
 env_server.Program('cryptohomed', server_sources)
 
 # TODO(wad) we'll probably want a separate runner for client roundtrip tests
 env_tests = env.Clone()
 env_tests.Append(LIBS=['cryptohome_service', 'gtest', 'gmock'])
 env_tests.Program('cryptohome_testrunner', test_sources)
 
 env_client = env.Clone()
 env_client.DbusClientBindings('bindings/client.h', 'cryptohome.xml')
-env_client.Program('example_client', example_sources)
+env_client.Program('cryptohome', client_sources)