build: rename HAVE_TESTS to WITH_TESTS
And rename a few waf targets for clarity and consistency
Change-Id: I7efad48a4edcbc311dba7981791249a4e0cc5678
diff --git a/tools/ndnsec/wscript b/tools/ndnsec/wscript
index 1b1f40b..5fc7dbd 100644
--- a/tools/ndnsec/wscript
+++ b/tools/ndnsec/wscript
@@ -3,7 +3,7 @@
top = '../..'
def build(bld):
- bld.objects(target='tools-ndnsec-objects',
+ bld.objects(target='ndnsec-objects',
source=bld.path.ant_glob('*.cpp', excl=['main.cpp']),
features='pch',
headers='ndnsec-pch.hpp',
@@ -12,7 +12,7 @@
bld.program(name='ndnsec',
target=f'{top}/bin/ndnsec',
source=['main.cpp'],
- use='tools-ndnsec-objects')
+ use='ndnsec-objects')
# create convenience symlinks
for cmd in ('list', 'get-default', 'set-default', 'delete',
diff --git a/tools/wscript b/tools/wscript
index 93cabd7..4e89967 100644
--- a/tools/wscript
+++ b/tools/wscript
@@ -16,7 +16,7 @@
# Sub-directory tools:
# tools/foo/**/*.cpp are compiled and linked into build/bin/foo.
# tools/foo/main.cpp must exist and must contain the main() function.
- # All other objects are collected into 'tools-foo-objects' and can be unit-tested.
+ # All other objects are collected into 'foo-objects' and can be unit-tested.
for subdir in bld.path.ant_glob('*', dir=True, src=False):
name = subdir.path_from(bld.path)
subWscript = subdir.find_node('wscript')
@@ -33,7 +33,7 @@
srcFiles = subdir.ant_glob('**/*.cpp', excl=['main.cpp'])
srcObjects = ''
if srcFiles:
- srcObjects = f'tools-{name}-objects'
+ srcObjects = f'{name}-objects'
bld.objects(target=srcObjects,
source=srcFiles,
use='ndn-cxx')