cluster: master - cman build: fix different bits

["Fabio M. Di Nitto" <fabbione at fedoraproject dot org>]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6ef2d93e91760ccf199449c7c228f964dd526303
Commit:        6ef2d93e91760ccf199449c7c228f964dd526303
Parent:        de07e84c99c262bb124250ef9cde3297ce51eacc
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Wed Jan 7 19:56:24 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Wed Jan 7 19:56:24 2009 +0100

cman build: fix different bits

adapt top level Makefile to cope with the libccs/libcman build loop.

cman_tool needs to know where to find libccs now in order to link properly.

bump libcman soname to 4.0 since it's not ABI compliant with the old one.

fix libcman build to include missing -I and -L

keep default of cmanincdir to point to libcman.h for now or nothing builds.

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 Makefile                        |   10 ++++++----
 cman/cman_tool/Makefile         |    1 +
 cman/services/cman/lib/Makefile |    8 +++++++-
 configure                       |    4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 9ecc7b1..509d505 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
 include make/defines.mk
 
-REALSUBDIRS = common cman/lib config cman group doc \
-	      bindings contrib 
+REALSUBDIRS = common config/libs/libccsconfdb cman/services config cman group doc \
+	      bindings contrib
 
 SUBDIRS = $(filter-out \
 	  $(if ${without_common},common) \
+	  $(if ${without_config},config/libs/libccsconfdb) \
 	  $(if ${without_config},config) \
-	  $(if ${without_cman},cman/lib) \
+	  $(if ${without_cman},cman/services) \
 	  $(if ${without_cman},cman) \
 	  $(if ${without_group},group) \
 	  $(if ${without_bindings},bindings) \
@@ -20,7 +21,8 @@ ${SUBDIRS}:
 # Dependencies
 
 common:
-config: cman/lib
+cman/services: config/libs/libccsconfdb
+config: cman/services
 cman: common config
 group: cman
 bindings: cman
diff --git a/cman/cman_tool/Makefile b/cman/cman_tool/Makefile
index 71012ee..3db7e49 100644
--- a/cman/cman_tool/Makefile
+++ b/cman/cman_tool/Makefile
@@ -18,6 +18,7 @@ CFLAGS += -I${cmanincdir}
 CFLAGS += -I${incdir}
 
 LDFLAGS += -L${cmanlibdir} -lcman
+LDFLAGS += -L${ccslibdir} -lccs
 LDFLAGS += -L${libdir}
 
 ${TARGET}: ${OBJS}
diff --git a/cman/services/cman/lib/Makefile b/cman/services/cman/lib/Makefile
index dcdf29f..6ea115f 100644
--- a/cman/services/cman/lib/Makefile
+++ b/cman/services/cman/lib/Makefile
@@ -1,5 +1,8 @@
 TARGET= libcman
 
+SOMAJOR=4
+SOMINOR=0
+
 include ../../../../make/defines.mk
 include $(OBJDIR)/make/libs.mk
 include $(OBJDIR)/make/cobj.mk
@@ -8,7 +11,10 @@ include $(OBJDIR)/make/install.mk
 include $(OBJDIR)/make/uninstall.mk
 
 CFLAGS += -fPIC
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
 CFLAGS += -I${incdir}
 CFLAGS += -I../include -I../../quorum/include
 
-LDFLAGS += -L${corosynclibdir} -lcoroutil -lcfg -lccs -L../../quorum/lib/ -Wl,-Bstatic -lcmanquorum -Wl,-Bdynamic
+LDFLAGS += -L${corosynclibdir} -lcoroutil -lcfg 
+LDFLAGS += -L${ccslibdir} -lccs
+LDFLAGS += -L../../quorum/lib/ -Wl,-Bstatic -lcmanquorum -Wl,-Bdynamic
diff --git a/configure b/configure
index fcb49db..424e83e 100755
--- a/configure
+++ b/configure
@@ -154,7 +154,7 @@ if ($help || !$err) {
   print "--ccsincdir=\tthe base directory for ccs include files.  (Default: ./config/libs/libccsconfdb)\n";
   print "--ccslibdir=\tthe base directory for ccs libraries.  (Default: ./config/libs/libccsconfdb)\n";
   print "--cmanincdir=\tthe base directory for cman include files.  (Default: ./cman/lib)\n";
-  print "--cmanlibdir=\tthe base directory for cman libraries.  (Default: ./cman/lib)\n";
+  print "--cmanlibdir=\tthe base directory for cman libraries.  (Default: ./cman/services/cman/lib)\n";
   print "--logtincdir=\tthe base directory for logthread include files.  (Default: ./common/liblogthread)\n";
   print "--logtlibdir=\tthe base directory for logthread libraries.  (Default: ./common/liblogthread)\n";
   print "--corosyncincdir=\tthe base directory for corosync include files.  (Default: {incdir})\n";
@@ -261,7 +261,7 @@ if (!$ccslibdir) {
   $ccslibdir="${objdir}/config/libs/libccsconfdb";
 }
 if (!$cmanincdir) {
-  $cmanincdir="${cdir}/cman/services/cman/lib";
+  $cmanincdir="${cdir}/cman/lib";
 }
 if (!$cmanlibdir) {
   $cmanlibdir="${objdir}/cman/services/cman/lib";