diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-08-15 15:46:33 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-09-10 01:36:15 +0200 |
| commit | acf26089f18c163290a0540ece1209aea26834d5 (patch) | |
| tree | 6ee94c44c1a8e93b1648f8c54cb94efba46f6638 /ctdb/wscript | |
| parent | 088e4ab3ac22112a11cb685bb048bf49bf55c592 (diff) | |
| download | samba-acf26089f18c163290a0540ece1209aea26834d5.tar.gz samba-acf26089f18c163290a0540ece1209aea26834d5.tar.xz samba-acf26089f18c163290a0540ece1209aea26834d5.zip | |
ctdb-util: Rename db_wrap to tdb_wrap and make it a build subsystem
This makes it consistent with Samba, to ease transition.
Update unit test code to link to with tdb_wrap instead of including
db_wrap.c.
There are some potential whitespace fixes in this commit that have
been ignored. CTDB's lib/tdb_wrap will be deleted after the
transition to Samba's lib/tdb_wrap, so there's no point polishing it
too much.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/wscript')
| -rwxr-xr-x | ctdb/wscript | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ctdb/wscript b/ctdb/wscript index 0d56065138..3570b009ab 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -173,6 +173,7 @@ def build(bld): if bld.CHECK_FOR_THIRD_PARTY(): bld.RECURSE('third_party/popt') + bld.RECURSE('lib/tdb_wrap') bld.RECURSE('lib/util') bld.RECURSE('lib/talloc') @@ -238,7 +239,8 @@ def build(bld): source=bld.SUBDIR('client', 'ctdb_client.c'), includes='include include/internal lib/util', public_headers='include/ctdb_client.h', - deps='replace popt talloc tevent tdb ctdb-util') + deps='''replace popt talloc tevent tdb + ctdb-util tdb-wrap''') bld.SAMBA_SUBSYSTEM('ctdb-server', source='server/ctdbd.c ' + @@ -451,20 +453,23 @@ def build(bld): bld.SAMBA_BINARY('ctdb_takeover_tests', source='tests/src/ctdb_takeover_tests.c', - deps='replace popt tdb tevent talloc ctdb-system' + + deps='''replace popt tdb tevent talloc ctdb-system + tdb-wrap''' + ib_deps, includes='include include/internal lib/util', install_path='${CTDB_TEST_LIBDIR}') bld.SAMBA_BINARY('ctdb_functest', source='tests/src/ctdb_functest.c', - deps='replace tdb tevent talloc popt ctdb-system', + deps='''replace tdb tevent talloc popt ctdb-system + tdb-wrap''', includes='include include/internal lib/util', install_path='${CTDB_TEST_LIBDIR}') bld.SAMBA_BINARY('ctdb_stubtest', source='tests/src/ctdb_test.c', - deps='replace tdb tevent talloc popt ctdb-system', + deps='''replace tdb tevent talloc popt ctdb-system + tdb-wrap''', includes='include include/internal lib/util', install_path='${CTDB_TEST_LIBDIR}') |