diff --git a/SConscript b/SConscript index e48e66dc1..438ac2351 100644 --- a/SConscript +++ b/SConscript @@ -168,7 +168,7 @@ if sys.platform != 'darwin': for sdir in subdirs: env.SConscript(sdir + '/SConscript', - exports=' '.join(exports), + exports = exports, variant_dir = env['TOP'] + '/vrouter/' + sdir, duplicate = 0) diff --git a/dpdk/SConscript b/dpdk/SConscript index 9889a9708..cfc88a6c6 100644 --- a/dpdk/SConscript +++ b/dpdk/SConscript @@ -23,8 +23,9 @@ env.Replace(LIBS = ['dp_core', 'dp_sandesh_c', 'dp_core', 'sandesh-c']) env.Append(LIBS = ['rt', 'dl', 'pthread', 'urcu-qsbr']) env.Append(LINKFLAGS = env['DPDK_LINKFLAGS']) -dpdk_vrouter = env.Program('contrail-vrouter-dpdk', Glob('*.c')) -env.Requires(dpdk_vrouter, dpdk_lib) +dpdk_objs = env.Object(Glob('*.c')) +dpdk_vrouter = env.Program('contrail-vrouter-dpdk', dpdk_objs) +env.Requires(dpdk_objs, dpdk_lib) # to make sure that all are built when you do 'scons' @ the top level env.Default(dpdk_vrouter)