From 3f287ec47934225be5a72e9c7bf51421d22895a6 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Mon, 3 Aug 2015 15:38:32 +1000 Subject: [PATCH] ctdb-build: Do not split ctdb-system subsystem The functions defined in common/system_*.c depend on the functions defined in common/system_common.c. So keep them together. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke --- ctdb/tests/src/ctdb_test.c | 1 - ctdb/tests/src/ctdbd_test.c | 1 - ctdb/wscript | 43 +++++++++++++++++-------------------- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/ctdb/tests/src/ctdb_test.c b/ctdb/tests/src/ctdb_test.c index 38f5a064200..85f48136e30 100644 --- a/ctdb/tests/src/ctdb_test.c +++ b/ctdb/tests/src/ctdb_test.c @@ -175,7 +175,6 @@ ctdb_get_capabilities(struct ctdb_context *ctdb, #include "common/ctdb_ltdb.c" #include "common/ctdb_message.c" #include "common/rb_tree.c" -#include "common/system_common.c" #include "common/ctdb_logging.c" #include "common/ctdb_fork.c" #include "common/system_util.c" diff --git a/ctdb/tests/src/ctdbd_test.c b/ctdb/tests/src/ctdbd_test.c index b62429e1343..439512afd66 100644 --- a/ctdb/tests/src/ctdbd_test.c +++ b/ctdb/tests/src/ctdbd_test.c @@ -38,7 +38,6 @@ bool fast_start; #include "common/ctdb_message.c" #include "common/cmdline.c" #include "common/rb_tree.c" -#include "common/system_common.c" #include "common/ctdb_logging.c" #include "common/ctdb_fork.c" #include "common/system_util.c" diff --git a/ctdb/wscript b/ctdb/wscript index d815cd9d1eb..8b357fccaf4 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -299,20 +299,6 @@ def build(bld): deps='replace') ib_deps = ' ctdb-ib rdmacm ibverbs' - bld.SAMBA_SUBSYSTEM('ctdb-common', - source=bld.SUBDIR('common', - '''ctdb_io.c ctdb_util.c ctdb_ltdb.c - ctdb_message.c cmdline.c rb_tree.c - system_common.c ctdb_fork.c'''), - includes='include include/internal common .', - deps='replace popt talloc tevent tdb popt') - - bld.SAMBA_SUBSYSTEM('ctdb-common-util', - source=bld.SUBDIR('common', - 'system_util.c ctdb_logging.c'), - includes='include include/internal', - deps='replace tevent tdb') - if sys.platform.startswith('linux'): CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_linux.c') elif sys.platform.startswith('aix'): @@ -327,10 +313,24 @@ def build(bld): Logs.error("Platform %s not supported" % sys.platform) bld.SAMBA_SUBSYSTEM('ctdb-system', - source=CTDB_SYSTEM_SRC, + source='common/system_common.c ' + CTDB_SYSTEM_SRC, includes='include include/internal', deps='replace talloc tevent tdb pcap') + bld.SAMBA_SUBSYSTEM('ctdb-common', + source=bld.SUBDIR('common', + '''ctdb_io.c ctdb_util.c ctdb_ltdb.c + ctdb_message.c cmdline.c rb_tree.c + ctdb_fork.c'''), + includes='include include/internal common .', + deps='replace popt talloc tevent tdb popt ctdb-system') + + bld.SAMBA_SUBSYSTEM('ctdb-common-util', + source=bld.SUBDIR('common', + 'system_util.c ctdb_logging.c'), + includes='include include/internal', + deps='replace tevent tdb') + bld.SAMBA_SUBSYSTEM('ctdb-client', source=bld.SUBDIR('client', 'ctdb_client.c'), includes='include include/internal', @@ -362,15 +362,14 @@ def build(bld): bld.SAMBA_BINARY('ctdbd', source='', deps='''ctdb-server ctdb-client ctdb-common - ctdb-common-util ctdb-system ctdb-tcp''' + + ctdb-common-util ctdb-tcp''' + ib_deps, install_path='${SBINDIR}', manpages='ctdbd.1') bld.SAMBA_BINARY('ctdb', source='tools/ctdb.c tools/ctdb_vacuum.c', - deps='''ctdb-client ctdb-common ctdb-common-util - ctdb-system''', + deps='ctdb-client ctdb-common ctdb-common-util', includes='include include/internal', install_path='${BINDIR}', manpages='ctdb.1') @@ -428,7 +427,7 @@ def build(bld): bld.SAMBA_BINARY('pmdactdb', source='utils/pmda/pmda_ctdb.c', includes='include include/internal', - deps='''ctdb-client ctdb-common ctdb-system + deps='''ctdb-client ctdb-common ctdb-common-util pcp_pmda pcp''', install_path='${CTDB_PMDADIR}') bld.INSTALL_FILES('${CTDB_PMDADIR}', 'utils/pmda/Install', @@ -592,8 +591,7 @@ def build(bld): bld.SAMBA_BINARY(target, source=src, includes='include include/internal', - deps='''ctdb-client ctdb-common ctdb-common-util - ctdb-system''', + deps='ctdb-client ctdb-common ctdb-common-util', install_path='${CTDB_TEST_LIBDIR}') bld.SAMBA_BINARY('ctdb_takeover_tests', @@ -622,8 +620,7 @@ def build(bld): bld.SAMBA_BINARY('ibwrapper_test', source='ib/ibwrapper_test.c', includes='include include/internal', - deps='''replace talloc ctdb-client ctdb-common - ctdb-system''' + + deps='replace talloc ctdb-client ctdb-common ' + ib_deps, install_path='${CTDB_TEST_LIBDIR}') -- 2.34.1