Testing library separation: now not in launcher but isolated

[anna.git] / example / diameter / launcher / SConscript

diff --git a/example/diameter/launcher/SConscript b/example/diameter/launcher/SConscript
index d9d48ce..04ad2a5 100644 (file)
--- a/example/diameter/launcher/SConscript
+++ b/example/diameter/launcher/SConscript
@@ -12,7 +12,7 @@ pwd = str(Dir ('.').abspath);
 anna_libpaths = []
 anna_libs = []
 
-modules = [ 'core', 'io', 'xml', 'app', 'http', 'comm', 'timex', 'http', 'statistics', 'time', 'diameter', 'diameter_comm' ];
+modules = [ 'core', 'io', 'xml', 'app', 'http', 'comm', 'timex', 'http', 'statistics', 'time', 'diameter', 'diameter_comm', 'testing' ];
 for module in modules:
   anna_libs.append ("anna_" + module)
   module = module.replace("_", ".")
@@ -43,12 +43,10 @@ localEnv.Append(LIBPATH = anna_libpaths)
 
 # Linking #################################################################
 
-# Process includes (avoid mandatory using of quoted includes and ../ paths from testing directory):
+# Process includes:
 current_directory = Dir ('.').abspath
-testing_include = os.path.join (current_directory, "testing")
 dynamic_include = os.path.join (pwd, "../../../../dynamic/launcher/default/")
-localEnv.Append (CPPPATH = [current_directory, testing_include, dynamic_include])
-
-result = localEnv.Program (pName, Glob ('*.cpp') + Glob ('testing/*.cpp'))
+localEnv.Append (CPPPATH = [current_directory, dynamic_include])
 
+result = localEnv.Program (pName, Glob ('*.cpp'))
 Return ('result')