diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-08-17 14:29:32 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-09-10 01:36:15 +0200 |
| commit | 088e4ab3ac22112a11cb685bb048bf49bf55c592 (patch) | |
| tree | 69e55da55624f97541ed203c9be222864d729d2b /ctdb/wscript | |
| parent | 8b39141c46458974d5476b2925f2dd5d51d9180d (diff) | |
| download | samba-088e4ab3ac22112a11cb685bb048bf49bf55c592.tar.gz | |
ctdb-build: Make ctdb-util a wscript build subsystem
This makes it look similar to samba-util, easing the transition.
Fold ctdb-util-misc into ctdb-util, since Samba doesn't separate them.
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 | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/ctdb/wscript b/ctdb/wscript index 81039e61510..0d560651389 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -173,6 +173,8 @@ def build(bld): if bld.CHECK_FOR_THIRD_PARTY(): bld.RECURSE('third_party/popt') + bld.RECURSE('lib/util') + bld.RECURSE('lib/talloc') bld.RECURSE('lib/tevent') bld.RECURSE('lib/tdb') @@ -184,20 +186,6 @@ def build(bld): dep_vars=['VERSION']) t.env.VERSION = VERSION - bld.SAMBA_SUBSYSTEM('ctdb-util', - source=bld.SUBDIR('lib/util', - 'util.c util_file.c util_time.c'), - includes='include include/internal', - deps='replace talloc tevent tdb') - - bld.SAMBA_SUBSYSTEM('ctdb-util-misc', - source=bld.SUBDIR('lib/util', - '''db_wrap.c debug.c fault.c - idtree.c signal.c - substitute.c'''), - includes='include include/internal lib/util', - deps='replace talloc tevent tdb') - bld.SAMBA_SUBSYSTEM('ctdb-tcp', source=bld.SUBDIR('tcp', 'tcp_connect.c tcp_init.c tcp_io.c'), @@ -250,7 +238,7 @@ 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 ctdb-util-misc') + deps='replace popt talloc tevent tdb ctdb-util') bld.SAMBA_SUBSYSTEM('ctdb-server', source='server/ctdbd.c ' + @@ -300,14 +288,14 @@ def build(bld): bld.SAMBA_BINARY('ctdb_lock_helper', source='server/ctdb_lock_helper.c', - deps='ctdb-util ctdb-util-misc ctdb-common-util talloc tdb', + deps='ctdb-util ctdb-common-util talloc tdb', includes='include include/internal', install_path='${BINDIR}') bld.SAMBA_BINARY('ctdb_event_helper', source='server/ctdb_event_helper.c', includes='include include/internal', - deps='ctdb-util ctdb-util-misc ctdb-common-util replace tdb', + deps='ctdb-util ctdb-common-util replace tdb', install_path='${BINDIR}') bld.SAMBA_GENERATOR('ctdb-smnotify-h', |