summaryrefslogtreecommitdiff
path: root/source4/cluster/ctdb/config.mk
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-07-10 08:06:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:59:20 -0500
commit6504900f1f52927adab3489b8d04b6644ceaee7d (patch)
tree893cadba231a529f320046429767cedf8b0eec30 /source4/cluster/ctdb/config.mk
parentd4e2d157cbce5a1cdc75efb5ced75d9608a0f7df (diff)
downloadsamba-6504900f1f52927adab3489b8d04b6644ceaee7d.tar.gz
samba-6504900f1f52927adab3489b8d04b6644ceaee7d.tar.bz2
samba-6504900f1f52927adab3489b8d04b6644ceaee7d.zip
r23806: update Samba4 with the latest ctdb code.
This doesn't get the ctdb code fully working in Samba4, it just gets it building and not breaking non-clustered use of Samba. It will take a bit longer to update some of the calling ctdb_cluster.c code to make it work correctly in Samba4. Note also that Samba4 now only links to the client portion of ctdb. For the moment I am leaving the ctdbd as a separate daemon, which you install separately from http://ctdb.samba.org/. (This used to be commit b196077cbb55cbecad87065133c2d67198e31066)
Diffstat (limited to 'source4/cluster/ctdb/config.mk')
-rw-r--r--source4/cluster/ctdb/config.mk20
1 files changed, 4 insertions, 16 deletions
diff --git a/source4/cluster/ctdb/config.mk b/source4/cluster/ctdb/config.mk
index 076562297f..61f1e36823 100644
--- a/source4/cluster/ctdb/config.mk
+++ b/source4/cluster/ctdb/config.mk
@@ -7,24 +7,12 @@ OBJ_FILES = brlock_ctdb.o
OBJ_FILES = opendb_ctdb.o
##################
-[SUBSYSTEM::ctdb_tcp]
-OBJ_FILES = \
- tcp/tcp_init.o \
- tcp/tcp_io.o \
- tcp/tcp_connect.o
-
-##################
[SUBSYSTEM::ctdb]
OBJ_FILES = \
ctdb_cluster.o \
- common/ctdb.o \
- common/ctdb_call.o \
- common/ctdb_message.o \
- common/ctdb_ltdb.o \
- common/ctdb_util.o \
+ client/ctdb_client.o \
common/ctdb_io.o \
- common/ctdb_client.o \
- common/ctdb_daemon.o \
- common/ctdb_lockwait.o
+ common/ctdb_ltdb.o \
+ common/ctdb_message.o \
+ common/ctdb_util.o
PUBLIC_DEPENDENCIES = LIBTDB LIBTALLOC
-PRIVATE_DEPENDENCIES = ctdb_tcp