X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FSConscript;h=249a878928cecc626b0e4268023edcf57700e0d9;hb=97a93101fb874a3237083d72c6d6f8c8df8dcfba;hp=dc488706f5acb3ff3e44d37373933ae4538f8c29;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/example/diameter/launcher/SConscript b/example/diameter/launcher/SConscript
index dc48870..249a878 100644
--- a/example/diameter/launcher/SConscript
+++ b/example/diameter/launcher/SConscript
@@ -1,7 +1,10 @@
+import os
 Import ('env')
 
 # Process #################################################################
-pName = "example_diameter_launcher"
+#pName = "example_<module>_<process>"
+bnames = Dir('..').abspath.rsplit('/', 2)
+pName = "example_" + bnames[-2] + "_" + bnames[-1]
 pPath = pName.replace("_", "/") + "/"
 
 # Anna modules ############################################################
@@ -18,19 +21,24 @@ anna_rlibs = list(anna_libs)
 anna_rlibs.reverse()
 
 # Libraries ###############################################################
-# To avoid other libraries accumulation (boost testing, i.e.):
+# To avoid other libraries accumulation:
 localEnv = env.Clone()
 
 anna_library = { 'LIBS' : anna_rlibs }
 localEnv.MergeFlags (anna_library)
 
-system_library = { 'LIBS' : [ 'xml2', 'rt' ] }
+system_library = { 'LIBS' : [ 'xml2', 'rt', 'pthread' ] }
 localEnv.MergeFlags (system_library)
 
 localEnv.Append(LIBPATH = anna_libpaths)
 
 # Linking #################################################################
-result = localEnv.Program (pName, Glob ('*.cpp'))
 
+# Process includes (avoid mandatory using of quoted includes and ../ paths from testing directory):
+current_directory = Dir ('.').abspath
+testing_include = os.path.join (current_directory, "testing")
+localEnv.Append (CPPPATH = [current_directory, testing_include])
+
+result = localEnv.Program (pName, Glob ('*.cpp') + Glob ('testing/*.cpp'))
 
 Return ('result')