Merge monitor_reconfigure into powerd.

SConstruct

 # Copyright (c) 2011 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
 
 Help("""\
 Type: 'scons' to build and 'scons -c' to clean\
 """)
 
@@ skipping 50 matching lines @@
 backlight_tool = backlight_env.Program('backlight-tool',
                                        ['backlight-tool.cc', backlight])
 Default(backlight_tool)
 
 # Build power daemon
 backlight_controller = gdk_env.Library('backlight_controller',
                                        ['backlight_controller.cc'])
 power_prefs = gdk_env.Library('power_prefs', ['power_prefs.cc',
                                               'power_constants.cc'])
 powerd_env = xidle_env.Clone()
-powerd_env.Append(LIBS=Split('chromeos crosapi gflags pthread dl metrics'))
+powerd_env.Append(LIBS=Split(
+    'chromeos crosapi gflags pthread dl metrics X11 Xrandr udev'))
 powerd_env.ParseConfig(
   os.environ['PKG_CONFIG'] + ' --cflags --libs dbus-1 dbus-glib-1'
 )
 powerd_sources = Split('''\
   file_tagger.cc power_button_handler.cc powerd.cc powerd_metrics.cc
   screen_locker.cc suspender.cc video_detector.cc metrics_constants.cc
+  monitor_reconfigure.cc resolution_selector.cc udev_listener.cc
 ''')
 util_lib = powerd_env.Library('util_lib', ['util.cc', 'inotify.cc']);
 powerd_lib = powerd_env.Library('powerd_lib', powerd_sources)
 powerd = powerd_env.Program('powerd',
                             ['powerd_main.cc', powerd_lib, xidle, backlight,
                              power_prefs, backlight_controller, util_lib])
 Default(powerd)
 
+# Build drm tool
+udev = gdk_env.Library('udev_listener', ['udev_listener.cc'])
+udev_env = gdk_env.Clone()
+udev_env.Append(LIBS=Split('base rt pthread gflags X11 Xrandr udev'))
+drm_tool = udev_env.Program('drm-tool', ['drm-tool.cc', udev])
+Default(drm_tool)
+
 # Build privileged power daemon
 powerman_env = gdk_env.Clone()
 powerman_env.Append(LIBS=Split('base chromeos gflags pthread metrics X11'))
 powerman_env.ParseConfig(
   os.environ['PKG_CONFIG'] + ' --cflags --libs dbus-1 dbus-glib-1'
 )
 powerman_sources = ['powerman.cc', 'input.cc', 'powerman_metrics.cc']
 powerman_lib = powerman_env.Library('powerman_lib', powerman_sources)
 powerman = powerman_env.Program('powerm', ['powerman_main.cc', powerman_lib,
                                            power_prefs, util_lib])
@@ skipping 34 matching lines @@
         backlight_controller, backlight, power_prefs]
 tests.append(powerd_unittest_env.Program('powerd_unittest', deps))
 file_tagger_unittest_env = powerd_env.Clone()
 file_tagger_unittest_env.Append(LIBS=Split('gtest gmock Xtst'))
 deps = [testrunner, 'file_tagger_unittest.cc', powerd_lib,
         util_lib, xidle, backlight_controller, backlight, power_prefs]
 tests.append(file_tagger_unittest_env.Program('file_tagger_unittest', deps))
 powerman_unittest_env = powerman_env.Clone()
 powerman_unittest_env.Append(LIBS=Split('gtest gmock'))
 deps = [testrunner, 'powerman_unittest.cc', powerman_lib, util_lib, power_prefs]
 tests.append(powerman_unittest_env.Program('powerman_unittest', deps))

[Daniel Erat, 2011/04/13 23:33:26]

you should add the resolution selector test here, and check that it gets built
and run when you run emerge with FEATURES=test

 AlwaysBuild(base_env.Alias('tests', tests))