X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2FstackManagement%2FSConscript;h=762e01b4bbffa1ac4c1128c528df80b0ff936ac9;hb=63c74af5519ae3db82627b9cd3b36bb2cfa3bd72;hp=3931b22a70fae4787dfa5618c935ac816161534d;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/example/diameter/stackManagement/SConscript b/example/diameter/stackManagement/SConscript
index 3931b22..762e01b 100644
--- a/example/diameter/stackManagement/SConscript
+++ b/example/diameter/stackManagement/SConscript
@@ -1,26 +1,34 @@
 Import ('env')
 
+# To avoid other libraries accumulation:
+localEnv = env.Clone()
+
 # Process #################################################################
-pName = "example_diameter_stackManagement"
+#pName = "example_<module>_<process>"
+bnames = Dir('..').abspath.rsplit('/', 2)
+pName = "example_" + bnames[-2] + "_" + bnames[-1]
 pPath = pName.replace("_", "/") + "/"
 
 # Anna modules ############################################################
 pwd = str(Dir ('.').abspath);
 anna_libpaths = []
 anna_libs = []
-modules = [ 'core', 'io', 'xml', 'time', 'diameter' ];
+modules = [ 'core', 'io', 'xml', 'time' ];
 for module in modules:
   anna_libs.append ("anna_" + module)
   #module = module.replace("_", ".")
   anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/")))
 
+# http://scons.1086193.n5.nabble.com/How-to-force-the-use-of-a-static-library-when-the-dynamic-library-is-available-as-well-td28385.html
+# libdiameter static variant:
+project_root = localEnv['PROJECT_ROOT']
+variant_dir = localEnv['VARIANT_DIR']
+anna_libs.append (File (project_root + "/source/diameter/" + variant_dir + "/libanna_diameter.a"))
+
 anna_rlibs = list(anna_libs)
 anna_rlibs.reverse()
 
 # Libraries ###############################################################
-# To avoid other libraries accumulation (boost testing, i.e.):
-localEnv = env.Clone()
-
 anna_library = { 'LIBS' : anna_rlibs }
 localEnv.MergeFlags (anna_library)