diff --git a/SConstruct b/SConstruct
index 7357964..0a20e8b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -53,46 +53,10 @@ if not conf.CheckLib('boost_thread-mt', language='C++'):
 
 env = conf.Finish()
 
-env.Program('xboxdrv', ['src/xboxdrv.cpp', 
-                        'src/xboxmsg.cpp',
-                        'src/uinput.cpp',
-                        'src/uinput_deviceid.cpp',
-                        'src/uinput_cfg.cpp',
-                        'src/button_event.cpp',
-                        'src/axis_event.cpp',
-                        'src/arg_parser.cpp',
-                        'src/button_map.cpp',
-                        'src/pretty_printer.cpp',
-                        'src/helper.cpp',
-                        'src/modifier.cpp',
-                        'src/command_line_options.cpp',
-                        'src/xbox_controller.cpp',
-                        'src/xpad_device.cpp',
-                        'src/xbox360_controller.cpp',
-                        'src/xbox360_wireless_controller.cpp',
-                        'src/firestorm_dual_controller.cpp',
-                        'src/saitek_p2500_controller.cpp',
-                        'src/evdev_helper.cpp',
-                        'src/linux_uinput.cpp',
-                        'src/usb_read_thread.cpp',
-                        'src/force_feedback_handler.cpp'                        
-                        ])
+env.Program('xboxdrv', Glob('src/*.cpp'))
 
 if False:
-    env.Program('inputdrv',
-                ['src/inputdrv/inputdrv.cpp',
-                 'src/inputdrv/xbox360_driver.cpp',
-                 'src/inputdrv/evdev_driver.cpp',
-                 'src/inputdrv/xbox360_usb_thread.cpp',
-                 'src/inputdrv/control.cpp',
-                 'src/inputdrv/abs_to_rel.cpp',
-                 'src/inputdrv/abs_to_btn.cpp',
-                 'src/inputdrv/btn_to_abs.cpp',
-                 'src/inputdrv/autofire_button.cpp',
-                 'src/inputdrv/uinput_driver.cpp',
-                 'src/inputdrv/join_axis.cpp',
-                 'src/inputdrv/throttle.cpp',
-                 'src/inputdrv/toggle_button.cpp'],
+    env.Program('inputdrv', Glob('src/inputdrv/*.cpp'),
                 LIBS=['boost_signals', 'usb', 'pthread'])
 
 # EOF #