This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE3 - build: fix build dependency for ccs_tool
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Wed, 27 May 2009 06:39:58 +0000 (UTC)
- Subject: cluster: STABLE3 - build: fix build dependency for ccs_tool
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=207d205a81be6e60cd1891ad0dd20824bf6813ee
Commit: 207d205a81be6e60cd1891ad0dd20824bf6813ee
Parent: fa1737f1437b9673505d23bd85ffddee3fb7edc9
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Wed May 27 08:38:39 2009 +0200
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Wed May 27 08:38:39 2009 +0200
build: fix build dependency for ccs_tool
we were trying to build libcman for nothing as ccs_tool
doesn't use it.
build libccs instead as dependency and this finally breaks
a super annoying build loop! yeah for cleaning!
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
Makefile | 5 ++---
config/tools/ccs_tool/Makefile | 4 ++--
make/defines.mk.input | 1 -
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 4885d63..4299a22 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
include make/defines.mk
REALSUBDIRS = gfs-kernel/src/gfs \
- common cman/lib config cman dlm fence/libfenced group \
+ common config cman dlm fence/libfenced group \
fence gfs gfs2 rgmanager bindings doc \
contrib
@@ -9,7 +9,6 @@ SUBDIRS = $(filter-out \
$(if ${without_common},common) \
$(if ${without_gfs-kernel/src/gfs},gfs-kernel/src/gfs) \
$(if ${without_config},config) \
- $(if ${without_cman},cman/lib) \
$(if ${without_cman},cman) \
$(if ${without_dlm},dlm) \
$(if ${without_fence},fence/libfenced) \
@@ -33,7 +32,7 @@ gfs-kernel: gfs-kernel/src/gfs
# Dependencies
common:
-config: cman/lib
+config:
cman: common config
dlm: config
fence/libfenced:
diff --git a/config/tools/ccs_tool/Makefile b/config/tools/ccs_tool/Makefile
index 3324537..7ebb24a 100644
--- a/config/tools/ccs_tool/Makefile
+++ b/config/tools/ccs_tool/Makefile
@@ -6,7 +6,7 @@ SBINSYMT = $(TARGET2)
include ../../../make/defines.mk
-all: ${TARGET1} ${TARGET2}
+all: depends ${TARGET1} ${TARGET2}
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -32,7 +32,7 @@ ${TARGET2}: ${TARGET1}
ln -sf ${TARGET1} ${TARGET2}
depends:
- $(MAKE) -C $(OBJDIR)/cman/lib all
+ $(MAKE) -C $(OBJDIR)/config/libs/libccsconfdb all
clean: generalclean
diff --git a/make/defines.mk.input b/make/defines.mk.input
index d1de004..bfc0fc0 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -80,7 +80,6 @@ enable_pacemaker ?= @ENABLE_PACEMAKER@
without_gfs-kernel/src/gfs ?= @DISABLE_GFSKERNEL@
without_common ?= @DISABLE_COMMON@
without_config ?= @DISABLE_CONFIG@
-without_cman/lib ?= @DISABLE_CMAN@
without_cman ?= @DISABLE_CMAN@
without_dlm ?= @DISABLE_DLM@
without_group ?= @DISABLE_GROUP@