Cluster Project branch, master, updated. cluster-2.99.02-11-g1cde174

Cluster Project branch, master, updated. cluster-2.99.02-11-g1cde174

[fabbione]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=1cde174f2c53d29b3a30406ff80cd5b9ca8dd3d7

The branch, master has been updated
       via  1cde174f2c53d29b3a30406ff80cd5b9ca8dd3d7 (commit)
       via  82b2af8639846361a5376bbbd573065e01fbbf28 (commit)
       via  380cf0cdd7dca30c64c9df78e97356f245bfca9b (commit)
      from  79ac12992c9b317b1a3986d391575609a54f5446 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1cde174f2c53d29b3a30406ff80cd5b9ca8dd3d7
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Wed May 21 09:10:43 2008 +0200

    [BUILD] Fix dlm_controld linking
    
    dlm_controld does not require linking with libdlmcontrol.
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

commit 82b2af8639846361a5376bbbd573065e01fbbf28
Merge: 380cf0cdd7dca30c64c9df78e97356f245bfca9b 79ac12992c9b317b1a3986d391575609a54f5446
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Wed May 21 09:10:16 2008 +0200

    Merge branch 'master' of ssh://sources.redhat.com/git/cluster

commit 380cf0cdd7dca30c64c9df78e97356f245bfca9b
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Wed May 21 08:45:22 2008 +0200

    [BUILD] Fix build order
    
    group needs cman and not just config to build
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 Makefile                    |    2 +-
 group/dlm_controld/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index dcc9e98..c524a9b 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ cman: config
 ccs: cman
 dlm: config
 fence/libfenced:
-group: config dlm fence/libfenced
+group: cman dlm fence/libfenced
 fence: group
 gfs:
 gfs2:
diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
index 3e2f3dc..7c4f263 100644
--- a/group/dlm_controld/Makefile
+++ b/group/dlm_controld/Makefile
@@ -41,7 +41,7 @@ CFLAGS += -I$(S)/../lib/ -I$(S)/../include/
 CFLAGS += -I${incdir}
 
 LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
-LDFLAGS += -L${dlmlibdir} -L${dlmcontrollibdir} -ldlm -ldlmcontrol
+LDFLAGS += -L${dlmlibdir} -ldlm 
 LDFLAGS += -L${fencedlibdir} -lfenced
 LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt
 LDFLAGS += -L../lib -lgroup -lpthread


hooks/post-receive
--
Cluster Project