Adding dependencies for side effect files.

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
 
 # Protobuffer compilation
 def ProtocolBufferEmitter(target, source, env):
   """ Inputs:
           target: list of targets to compile to
@@ skipping 155 matching lines @@
                        pthread
                        ssl
                        xml2
                        z""")
 env['CPPPATH'] = ['..', '../../third_party/chrome/files', '../../common']
 env['LIBPATH'] = ['../../third_party/chrome']
 env['BUILDERS']['ProtocolBuffer'] = proto_builder
 env['BUILDERS']['DbusBindings'] = dbus_bindings_builder
 env['BUILDERS']['GlibMarshal'] = glib_marshal_builder
 
+# Hack to fix dependencies from auto generated headers.
+#   Some files indirectly included update_metatadata.pb.h
+#     which is built as a side effect of building update_metadata.pb.cc
+env.Depends('bzip_extent_writer_unittest.cc', 'update_metadata.pb.cc');
+env.Depends('bzip_extent_writer.cc', 'update_metadata.pb.cc');
+
+#   Some files indirectly include marshal.glibmarshal.h
+#     which is built as a side effect of the .c file
+env.Depends('dbus_service.cc', 'marshal.glibmarshal.c');
+
+#   Some files indirectly include update_engine.dbusserver.h
+#     which is built as a side effect of the dbusclient.h file
+env.Depends('mock_http_fetcher.cc', 'update_engine.dbusclient.h');
+
 # Fix issue with scons not passing pkg-config vars through the environment.
 for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH'):
   if os.environ.has_key(key):
     env['ENV'][key] = os.environ[key]
 
 env.ParseConfig('pkg-config --cflags --libs '
                 'dbus-1 dbus-glib-1 gio-2.0 gio-unix-2.0 glib-2.0')
 env.ProtocolBuffer('update_metadata.pb.cc', 'update_metadata.proto')
 
 env.DbusBindings('update_engine.dbusclient.h', 'update_engine.xml')
@@ skipping 87 matching lines @@
                                   delta_generator_main)
 
 http_server_cmd = env.Program('test_http_server', 'test_http_server.cc')
 
 unittest_env = env.Clone()
 unittest_env.Append(LIBS=['gtest'])
 unittest_cmd = unittest_env.Program('update_engine_unittests',
                            unittest_sources + unittest_main)
 Clean(unittest_cmd, Glob('*.gcda') + Glob('*.gcno') + Glob('*.gcov') +
                     Split('html app.info'))