diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 19:46:09 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 19:46:09 +0200 |
commit | 137ec6e340610759ed0653b11eafb3f4243e2728 (patch) | |
tree | 965f03f77e9dc0e626a74efa64637b25fbb2eee9 /source4/cluster | |
parent | 4f0db429588e550d97db21fc0c17231c2ea2a25d (diff) | |
download | samba-137ec6e340610759ed0653b11eafb3f4243e2728.tar.gz samba-137ec6e340610759ed0653b11eafb3f4243e2728.tar.bz2 samba-137ec6e340610759ed0653b11eafb3f4243e2728.zip |
Use variables for source directory in a couple more places.
(This used to be commit 2860a7db5968c7007522cdb300eba390da929ab8)
Diffstat (limited to 'source4/cluster')
-rw-r--r-- | source4/cluster/config.mk | 3 | ||||
-rw-r--r-- | source4/cluster/ctdb/config.mk | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/cluster/config.mk b/source4/cluster/config.mk index 00ac597f94..e841956a0c 100644 --- a/source4/cluster/config.mk +++ b/source4/cluster/config.mk @@ -1,6 +1,7 @@ +ctdbsrcdir = $(clustersrcdir)/ctdb mkinclude ctdb/config.mk [SUBSYSTEM::CLUSTER] PRIVATE_DEPENDENCIES = ctdb -CLUSTER_OBJ_FILES = cluster/cluster.o cluster/local.o +CLUSTER_OBJ_FILES = $(addprefix $(clustersrcdir)/, cluster.o local.o) diff --git a/source4/cluster/ctdb/config.mk b/source4/cluster/ctdb/config.mk index 01c639d142..28b18c17ce 100644 --- a/source4/cluster/ctdb/config.mk +++ b/source4/cluster/ctdb/config.mk @@ -2,19 +2,19 @@ [SUBSYSTEM::brlock_ctdb] PUBLIC_DEPENDENCIES = ctdb -brlock_ctdb_OBJ_FILES = cluster/ctdb/brlock_ctdb.o +brlock_ctdb_OBJ_FILES = $(ctdbsrcdir)/brlock_ctdb.o ################## [SUBSYSTEM::opendb_ctdb] PUBLIC_DEPENDENCIES = ctdb -opendb_ctdb_OBJ_FILES = cluster/ctdb/opendb_ctdb.o +opendb_ctdb_OBJ_FILES = $(ctdbsrcdir)/opendb_ctdb.o ################## [SUBSYSTEM::ctdb] PUBLIC_DEPENDENCIES = TDB_WRAP LIBTALLOC -ctdb_OBJ_FILES = $(addprefix cluster/ctdb/, \ +ctdb_OBJ_FILES = $(addprefix $(ctdbsrcdir)/, \ ctdb_cluster.o \ client/ctdb_client.o \ common/ctdb_io.o \ |