diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-08-25 14:00:45 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-09-10 01:36:14 +0200 |
| commit | f031d5b43fb272fbccc570dd174536c55e78ad47 (patch) | |
| tree | 0ed0b374184087262007cec24f7b47f3f869a9aa /ctdb/wscript | |
| parent | 05f08d5148e4df8c5bed13023824f030efebf26e (diff) | |
| download | samba-f031d5b43fb272fbccc570dd174536c55e78ad47.tar.gz | |
ctdb-build: Fix includes for SAMBA_BINARY()s
No need for "..", since the correct thing is generated. Add "include"
and "include/internal" where missing.
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 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ctdb/wscript b/ctdb/wscript index d185e7135a6..4854198d060 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -276,6 +276,7 @@ def build(bld): source='tools/ctdb.c tools/ctdb_vacuum.c', deps='''ctdb-client ctdb-common ctdb-common-util ctdb-system''', + includes='include include/internal', install_path='${BINDIR}', manpages='doc/ctdb.1') @@ -289,6 +290,7 @@ 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', + includes='include include/internal', install_path='${BINDIR}') bld.SAMBA_BINARY('ctdb_event_helper', @@ -443,6 +445,7 @@ def build(bld): bld.SAMBA_BINARY(target, source=src, + includes='include include/internal', deps='''ctdb-client ctdb-common ctdb-common-util ctdb-system''', install_path='${CTDB_TEST_LIBDIR}') @@ -451,19 +454,19 @@ def build(bld): source='tests/src/ctdb_takeover_tests.c', deps='replace popt tdb tevent talloc ctdb-system' + ib_deps, - includes='../include ../include/internal lib/util', + 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', - includes='../include ../include/internal lib/util', + 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', - includes='../include ../include/internal lib/util', + includes='include include/internal lib/util', install_path='${CTDB_TEST_LIBDIR}') if bld.env.HAVE_INFINIBAND: |