summaryrefslogtreecommitdiff
path: root/source4/cluster
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-03-03 18:25:28 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-03-03 18:25:28 +0100
commitb29d47edcf2767d7f9e9f63332079c6e8e89946c (patch)
tree4d744bee8f5c7f14641bfc030e3f76dff2604add /source4/cluster
parentf0bac65d9a184d5faedec4d8b325496478d2e54c (diff)
downloadsamba-b29d47edcf2767d7f9e9f63332079c6e8e89946c.tar.gz
samba-b29d47edcf2767d7f9e9f63332079c6e8e89946c.tar.bz2
samba-b29d47edcf2767d7f9e9f63332079c6e8e89946c.zip
Move object file lists to the Makefile.
(This used to be commit a7e6d2a1832db388fdafa1279f84c9a8bbfc87d6)
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..2ec8187ea3 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 = brlock_ctdb.o
+
##################
[SUBSYSTEM::opendb_ctdb]
-OBJ_FILES = opendb_ctdb.o
PUBLIC_DEPENDENCIES = ctdb
+opendb_ctdb_OBJ_FILES = 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)
+