build: Cleanup and update of build scripts
Change-Id: I7fb5b8696d3b068249ae16b117bd27646d990dc3
diff --git a/tools/chunks/wscript b/tools/chunks/wscript
index 56ff392..31f92f3 100644
--- a/tools/chunks/wscript
+++ b/tools/chunks/wscript
@@ -3,28 +3,30 @@
def build(bld):
- bld(features='cxx',
- name='ndncatchunks-objects',
+ bld.objects(
+ target='ndncatchunks-objects',
source=bld.path.ant_glob('catchunks/*.cpp', excl='catchunks/ndncatchunks.cpp'),
use='core-objects')
- bld(features='cxx cxxprogram',
+ bld.program(
target='../../bin/ndncatchunks',
+ name='ndncatchunks',
source='catchunks/ndncatchunks.cpp',
use='ndncatchunks-objects')
- bld(features='cxx',
- name='ndnputchunks-objects',
+ bld.objects(
+ target='ndnputchunks-objects',
source=bld.path.ant_glob('putchunks/*.cpp', excl='putchunks/ndnputchunks.cpp'),
use='core-objects')
- bld(features='cxx cxxprogram',
+ bld.program(
target='../../bin/ndnputchunks',
+ name='ndnputchunks',
source='putchunks/ndnputchunks.cpp',
use='ndnputchunks-objects')
## (for unit tests)
- bld(name='chunks-objects',
+ bld(target='chunks-objects',
use='ndncatchunks-objects ndnputchunks-objects')