Merge branch 'master' into martins

[metze/ctdb/wip.git] / config.mk

diff --git a/config.mk b/config.mk
index 076562297f513a13310d9c5dd0fd024d86c42da7..61f1e3682330ff2d3d713f1678f269c7a3280a4a 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -6,25 +6,13 @@ OBJ_FILES = brlock_ctdb.o
 [SUBSYSTEM::opendb_ctdb]
 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