summaryrefslogtreecommitdiff
path: root/source4/cluster
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-14 16:53:00 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-14 16:53:00 +0200
commitffc5cbfe803326a1c3bf55684717af910d091c5a (patch)
tree46e3b9f4a60971176b43f0a4c5cfc4ccc001dd14 /source4/cluster
parentf800cf250f079ab1e1bc1051c34d1d1061187447 (diff)
downloadsamba-ffc5cbfe803326a1c3bf55684717af910d091c5a.tar.gz
samba-ffc5cbfe803326a1c3bf55684717af910d091c5a.tar.bz2
samba-ffc5cbfe803326a1c3bf55684717af910d091c5a.zip
Move object files lists to makefile rather than smb_build.
(This used to be commit 5628d58990144463fd87f8c847c9384ac2193681)
Diffstat (limited to 'source4/cluster')
-rw-r--r--source4/cluster/config.mk5
-rw-r--r--source4/cluster/ctdb/config.mk14
2 files changed, 11 insertions, 8 deletions
diff --git a/source4/cluster/config.mk b/source4/cluster/config.mk
index 8b225202fb..00ac597f94 100644
--- a/source4/cluster/config.mk
+++ b/source4/cluster/config.mk
@@ -1,7 +1,6 @@
mkinclude ctdb/config.mk
-####################
[SUBSYSTEM::CLUSTER]
-OBJ_FILES = cluster.o \
- local.o
PRIVATE_DEPENDENCIES = ctdb
+
+CLUSTER_OBJ_FILES = cluster/cluster.o cluster/local.o
diff --git a/source4/cluster/ctdb/config.mk b/source4/cluster/ctdb/config.mk
index b8199cafe4..01c639d142 100644
--- a/source4/cluster/ctdb/config.mk
+++ b/source4/cluster/ctdb/config.mk
@@ -1,20 +1,24 @@
##################
[SUBSYSTEM::brlock_ctdb]
-OBJ_FILES = brlock_ctdb.o
PUBLIC_DEPENDENCIES = ctdb
+brlock_ctdb_OBJ_FILES = cluster/ctdb/brlock_ctdb.o
+
##################
[SUBSYSTEM::opendb_ctdb]
-OBJ_FILES = opendb_ctdb.o
PUBLIC_DEPENDENCIES = ctdb
+opendb_ctdb_OBJ_FILES = cluster/ctdb/opendb_ctdb.o
+
##################
[SUBSYSTEM::ctdb]
-OBJ_FILES = \
+PUBLIC_DEPENDENCIES = TDB_WRAP LIBTALLOC
+
+ctdb_OBJ_FILES = $(addprefix cluster/ctdb/, \
ctdb_cluster.o \
client/ctdb_client.o \
common/ctdb_io.o \
common/ctdb_ltdb.o \
common/ctdb_message.o \
- common/ctdb_util.o
-PUBLIC_DEPENDENCIES = TDB_WRAP LIBTALLOC
+ common/ctdb_util.o)
+