New waf snapshot; move the ns3 library back to the top build dir (the 'lib' was only a workaround for a waf problem); allow --enable-modules on a per build run basis.

This commit is contained in:
Gustavo J. A. M. Carneiro committed 2007-12-09 14:39:07 +00:00
1 parent 32611749b2
commit 0ee86b72fb
4 files changed
+146 -352

No files matched your search

+1 -5
View File
@@ -47,17 +47,13 @@ def configure(conf):
conf.sub_config('simulator')
blddir = os.path.abspath(os.path.join(conf.m_blddir, conf.env.variant()))
conf.env['NS3_MODULE_PATH'] = [os.path.join(blddir, 'lib')]
conf.env['NS3_MODULE_PATH'] = [blddir]
if Params.g_options.enable_rpath:
conf.env.append_value('RPATH', '-Wl,-rpath=%s' % (os.path.join(blddir),))
## Used to link the 'run-tests' program with all of ns-3 code
conf.env['NS3_MODULES'] = ['ns3-' + module.split('/')[-1] for module in all_modules]
if Params.g_options.enable_modules:
conf.env['NS3_ENABLED_MODULES'] = ['ns3-'+mod for mod in
Params.g_options.enable_modules.split(',')]
def create_ns3_module(bld, name, dependencies=()):
module = bld.create_obj('cpp', 'objects')