--- a/wscript	Mon Sep 07 11:45:05 2009 +0200
+++ b/wscript	Mon Sep 07 11:59:10 2009 +0100
@@ -542,11 +542,10 @@
         # When --run'ing a program, tell WAF to only build that program,
         # nothing more; this greatly speeds up compilation when all you
         # want to do is run a test program.
-        if not Options.options.compile_targets:
-            Options.options.compile_targets = os.path.basename(program_name)
-            for gen in bld.all_task_gen:
-                if type(gen).__name__ in ['ns3header_taskgen', 'ns3moduleheader_taskgen']:
-                    gen.post()
+        Options.options.compile_targets += ',' + os.path.basename(program_name)
+        for gen in bld.all_task_gen:
+            if type(gen).__name__ in ['ns3header_taskgen', 'ns3moduleheader_taskgen']:
+                gen.post()
 
     if Options.options.regression or Options.options.regression_generate:
         regression_traces = env['REGRESSION_TRACES']
@@ -556,6 +555,7 @@
         regression.run_regression(bld, regression_traces)
 
     if Options.options.check:
+        Options.options.compile_targets += ',run-tests,ns3module'
         _run_check(bld)