--- a/src/config-store/wscript Wed Sep 21 19:10:14 2011 +0100
+++ b/src/config-store/wscript Thu Sep 22 13:03:25 2011 +0100
@@ -43,14 +43,11 @@
'model/model-typeid-creator.cc',
'model/display-functions.cc',
])
- module.use = 'GTK_CONFIG_STORE'
+ module.use.append('GTK_CONFIG_STORE')
if bld.env['ENABLE_LIBXML2']:
module.source.append ('model/xml-config.cc')
- if bld.env['ENABLE_GTK_CONFIG_STORE']:
- module.use = module.use + ' LIBXML2'
- else:
- module.use = 'LIBXML2'
+ module.use.append('LIBXML2')
if bld.env['ENABLE_EXAMPLES']:
bld.add_subdirs('examples')
--- a/src/core/wscript Wed Sep 21 19:10:14 2011 +0100
+++ b/src/core/wscript Thu Sep 22 13:03:25 2011 +0100
@@ -82,7 +82,7 @@
conf.check_nonfatal(header_name='sys/inttypes.h', define_name='HAVE_SYS_INT_TYPES_H')
- if not conf.check_nonfatal(lib='rt', uselib='RT', define_name='HAVE_RT'):
+ if not conf.check_nonfatal(lib='rt', uselib_store='RT', define_name='HAVE_RT'):
conf.report_optional_feature("RealTime", "Real Time Simulator",
False, "librt is not available")
else:
@@ -275,11 +275,8 @@
'model/realtime-simulator-impl.cc',
'model/wall-clock-synchronizer.cc',
])
- core.uselib = 'RT'
- core_test.uselib = 'RT'
- else:
- core.uselib = ''
- core_test.uselib = ''
+ core.use.append('RT')
+ core_test.use.append('RT')
if env['ENABLE_THREADING']:
core.source.extend([
@@ -288,8 +285,8 @@
'model/unix-system-mutex.cc',
'model/unix-system-condition.cc',
])
- core.uselib = core.uselib + ' PTHREAD'
- core_test.uselib = core_test.uselib + ' PTHREAD'
+ core.use.append('PTHREAD')
+ core_test.use.append('PTHREAD')
headers.source.extend([
'model/unix-fd-reader.h',
'model/system-mutex.h',
@@ -298,8 +295,8 @@
])
if env['ENABLE_GSL']:
- core.uselib = core.uselib + ' GSL GSLCBLAS M'
- core_test.uselib = core_test.uselib + ' GSL GSLCBLAS M'
+ core.use.extend(['GSL', 'GSLCBLAS', 'M'])
+ core_test.use.extend(['GSL', 'GSLCBLAS', 'M'])
core_test.source.extend(['test/rng-test-suite.cc'])
if (bld.env['ENABLE_EXAMPLES']):
--- a/src/internet/wscript Wed Sep 21 19:10:14 2011 +0100
+++ b/src/internet/wscript Thu Sep 22 13:03:25 2011 +0100
@@ -61,7 +61,7 @@
if arch in ('x86_64', 'i686', 'i586', 'i486', 'i386'):
conf.env['NSC_ENABLED'] = True
conf.env.append_value('CXXDEFINES', 'NETWORK_SIMULATION_CRADLE')
- conf.check_nonfatal(mandatory=True, lib='dl', define_name='HAVE_DL', uselib='DL')
+ conf.check_nonfatal(mandatory=True, lib='dl', define_name='HAVE_DL', uselib_store='DL')
ok = True
conf.msg('Checking for NSC supported architecture ' + arch, ok)
@@ -283,8 +283,8 @@
obj.source.append ('model/nsc-tcp-socket-factory-impl.cc')
obj.source.append ('model/nsc-sysctl.cc')
headers.source.append('model/nsc-tcp-l4-protocol.h')
- obj.uselib = 'DL'
- internet_test.uselib = 'DL'
+ obj.use.append('DL')
+ internet_test.use.append('DL')
if (bld.env['ENABLE_EXAMPLES']):
bld.add_subdirs('examples')
--- a/src/mpi/wscript Wed Sep 21 19:10:14 2011 +0100
+++ b/src/mpi/wscript Thu Sep 22 13:03:25 2011 +0100
@@ -49,7 +49,7 @@
]
if env['ENABLE_MPI']:
- sim.uselib = 'MPI'
+ sim.use.append('MPI')
if bld.env['ENABLE_EXAMPLES']:
bld.add_subdirs('examples')
--- a/src/openflow/wscript Wed Sep 21 19:10:14 2011 +0100
+++ b/src/openflow/wscript Thu Sep 22 13:03:25 2011 +0100
@@ -96,8 +96,8 @@
}
'''
- conf.env['DL'] = conf.check(mandatory=True, lib='dl', define_name='DL', uselib='DL')
- conf.env['XML2'] = conf.check(mandatory=True, lib='xml2', define_name='XML2', uselib='XML2')
+ conf.env['DL'] = conf.check(mandatory=True, lib='dl', define_name='DL', uselib_store='DL')
+ conf.env['XML2'] = conf.check(mandatory=True, lib='xml2', define_name='XML2', uselib_store='XML2')
conf.env.append_value('NS3_MODULE_PATH',os.path.abspath(os.path.join(conf.env['WITH_OPENFLOW'],'build','default')))
@@ -136,8 +136,8 @@
]
if bld.env['OPENFLOW'] and bld.env['DL'] and bld.env['XML2']:
- obj.uselib = 'OPENFLOW DL XML2'
- obj_test.uselib = 'OPENFLOW DL XML2'
+ obj.use.extend('OPENFLOW DL XML2'.split())
+ obj_test.use.extend('OPENFLOW DL XML2'.split())
headers = bld.new_task_gen(features=['ns3header'])
headers.module = 'openflow'
@@ -150,7 +150,7 @@
obj.source.append('helper/openflow-switch-helper.cc')
obj.env.append_value('DEFINES', 'NS3_OPENFLOW')
- obj.use = "OPENFLOW"
+ obj.use.append("OPENFLOW")
obj_test.source.append('test/openflow-switch-test-suite.cc')
headers.source.append('model/openflow-interface.h')
--- a/src/stats/wscript Wed Sep 21 19:10:14 2011 +0100
+++ b/src/stats/wscript Thu Sep 22 13:03:25 2011 +0100
@@ -1,7 +1,7 @@
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
def configure(conf):
- conf.env['SQLITE_STATS'] = conf.check_nonfatal(lib='sqlite3', define_name='SQLITE3', uselib='SQLITE3')
+ conf.env['SQLITE_STATS'] = conf.check_nonfatal(lib='sqlite3', define_name='SQLITE3', uselib_store='SQLITE3')
conf.report_optional_feature("SqliteDataOutput", "SQlite stats data output",
conf.env['SQLITE_STATS'],
"library 'sqlite3' not found")
@@ -38,6 +38,6 @@
if bld.env['SQLITE_STATS']:
headers.source.append('model/sqlite-data-output.h')
obj.source.append('model/sqlite-data-output.cc')
- obj.uselib = 'SQLITE3'
+ obj.use.append('SQLITE3')
bld.ns3_python_bindings()
--- a/src/wifi/wscript Wed Sep 21 19:10:14 2011 +0100
+++ b/src/wifi/wscript Thu Sep 22 13:03:25 2011 +0100
@@ -140,8 +140,8 @@
]
if bld.env['ENABLE_GSL']:
- obj.uselib = 'GSL GSLCBLAS M'
- obj_test.uselib = 'GSL GSLCBLAS M'
+ obj.use.extend(['GSL', 'GSLCBLAS', 'M'])
+ obj_test.use.extend(['GSL', 'GSLCBLAS', 'M'])
if (bld.env['ENABLE_EXAMPLES']):
bld.add_subdirs('examples')