| OLD | NEW |
| 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import os | 5 import os |
| 6 import re | 6 import re |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 def GlibMarshalEmitter(target, source, env): | 9 def GlibMarshalEmitter(target, source, env): |
| 10 """ Inputs: | 10 """ Inputs: |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 for key in Split('PKG_CONFIG PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'): | 65 for key in Split('PKG_CONFIG PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'): |
| 66 if os.environ.has_key(key): | 66 if os.environ.has_key(key): |
| 67 base_env['ENV'][key] = os.environ[key] | 67 base_env['ENV'][key] = os.environ[key] |
| 68 | 68 |
| 69 # Append these after pulling in the stuff from the environment so they | 69 # Append these after pulling in the stuff from the environment so they |
| 70 # don't get overwritten. | 70 # don't get overwritten. |
| 71 base_env.Append(CPPPATH=Split('. ..')) | 71 base_env.Append(CPPPATH=Split('. ..')) |
| 72 base_env.Append(CCFLAGS=Split('-ggdb -fPIC -fno-exceptions -Wall -Werror')) | 72 base_env.Append(CCFLAGS=Split('-ggdb -fPIC -fno-exceptions -Wall -Werror')) |
| 73 base_env.Append(LINKFLAGS=Split('-fPIC')) | 73 base_env.Append(LINKFLAGS=Split('-fPIC')) |
| 74 | 74 |
| 75 SOURCES=['chromeos_cryptohome.cc', | 75 SOURCES = Split('''\ |
| 76 'chromeos_imageburn.cc', | 76 chromeos_brightness.cc |
| 77 'chromeos_input_method.cc', | 77 chromeos_cryptohome.cc |
| 78 'chromeos_input_method_ui.cc', | 78 chromeos_imageburn.cc |
| 79 'chromeos_keyboard.cc', | 79 chromeos_input_method.cc |
| 80 'chromeos_login.cc', | 80 chromeos_input_method_ui.cc |
| 81 'chromeos_login_helpers.cc', | 81 chromeos_keyboard.cc |
| 82 'chromeos_mount.cc', | 82 chromeos_login.cc |
| 83 'chromeos_network.cc', | 83 chromeos_login_helpers.cc |
| 84 'chromeos_power.cc', | 84 chromeos_mount.cc |
| 85 'chromeos_screen_lock.cc', | 85 chromeos_network.cc |
| 86 'chromeos_speech_synthesis.cc', | 86 chromeos_power.cc |
| 87 'chromeos_synaptics.cc', | 87 chromeos_screen_lock.cc |
| 88 'chromeos_syslogs.cc', | 88 chromeos_speech_synthesis.cc |
| 89 'chromeos_system.cc', | 89 chromeos_synaptics.cc |
| 90 'chromeos_touchpad.cc', | 90 chromeos_syslogs.cc |
| 91 'chromeos_update.cc', | 91 chromeos_system.cc |
| 92 'chromeos_update_engine.cc', | 92 chromeos_touchpad.cc |
| 93 'marshal.glibmarshal.c', | 93 chromeos_update.cc |
| 94 'version_check.cc', | 94 chromeos_update_engine.cc |
| 95 ] | 95 marshal.glibmarshal.c |
| 96 version_check.cc |
| 97 ''') |
| 96 | 98 |
| 97 env = base_env.Clone() | 99 env = base_env.Clone() |
| 98 env.Append(LIBS=['base', 'chromeos', 'rt']) | 100 env.Append(LIBS=['base', 'chromeos', 'rt']) |
| 99 | 101 |
| 100 # glib, dbus, and ibus environment | 102 # glib, dbus, and ibus environment |
| 101 env.ParseConfig('%s --cflags --libs dbus-1 glib-2.0 gudev-1.0 dbus-glib-1 ibus-1
.0 libpcrecpp libxklavier' % env['ENV']['PKG_CONFIG']) | 103 env.ParseConfig('%s --cflags --libs dbus-1 glib-2.0 gudev-1.0 dbus-glib-1 ibus-1
.0 libpcrecpp libxklavier' % env['ENV']['PKG_CONFIG']) |
| 102 | 104 |
| 103 env.GlibMarshal('marshal.glibmarshal.c', 'marshal.list') | 105 env.GlibMarshal('marshal.glibmarshal.c', 'marshal.list') |
| 104 ibus_component_dir = "%s%s" % (env['ENV']['SYSROOT'], | 106 ibus_component_dir = "%s%s" % (env['ENV']['SYSROOT'], |
| 105 '/usr/share/ibus/component/') | 107 '/usr/share/ibus/component/') |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 env_test.Program('monitor_input_method_ui', | 173 env_test.Program('monitor_input_method_ui', |
| 172 ['monitor_input_method_ui.cc', Load]), | 174 ['monitor_input_method_ui.cc', Load]), |
| 173 env_test.Program('login_drive', ['drive_login.cc', Load]), | 175 env_test.Program('login_drive', ['drive_login.cc', Load]), |
| 174 env_test.Program('monitor_update_engine', ['monitor_update_engine.cc', Load]), | 176 env_test.Program('monitor_update_engine', ['monitor_update_engine.cc', Load]), |
| 175 env_test.Program('cryptohome_drive', ['drive_cryptohome.cc', Load]) | 177 env_test.Program('cryptohome_drive', ['drive_cryptohome.cc', Load]) |
| 176 ] | 178 ] |
| 177 test_alias = Alias('test', tests) | 179 test_alias = Alias('test', tests) |
| 178 AlwaysBuild(test_alias) | 180 AlwaysBuild(test_alias) |
| 179 | 181 |
| 180 Alias('crosapi', base_env.StaticLibrary('crosapi', Load), CCFLAGS='-ggdb') | 182 Alias('crosapi', base_env.StaticLibrary('crosapi', Load), CCFLAGS='-ggdb') |
| OLD | NEW |