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=9f4d378829 6a18ac012354ef616d857cc35a842d

The branch, master has been updated
via 9f4d3788296a18ac012354ef616d857cc35a842d (commit)
from 228cbfc49f5acbd8a0dc514b7385f7d9fd4ae6c5 (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 9f4d3788296a18ac012354ef616d857cc35a842d
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Tue Jul 22 07:42:15 2008 +0200

[BUILD] Cleanup linking order for logsys

Collect all openais libs into their own LDFLAGS entry

Linking to logsys requires pthread

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

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

Summary of changes:
fence/fenced/Makefile | 6 +++---
group/dlm_controld/Makefile | 5 ++---
group/gfs_controld/Makefile | 5 +++--
3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fence/fenced/Makefile b/fence/fenced/Makefile
index 7804224..f4840c4 100644
--- a/fence/fenced/Makefile
+++ b/fence/fenced/Makefile
@@ -23,11 +23,11 @@ CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${fenceincdir} -I${openaisincdir}
CFLAGS += -I$(S) -I$(S)/../include -I$(S)/../libfenced -I$(SRCDIR)/group/lib
CFLAGS += -I${incdir}

-LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${openaislibdir} -lccs -lcman -lcpg
-LDFLAGS += -L${fencelibdir} -L${openaislibdir} -lfence -llogsys -lpthread
+LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
+LDFLAGS += -L${fencelibdir} -lfence
+LDFLAGS += -L${openaislibdir} -lcpg -llogsys -lpthread
LDFLAGS += -L../../group/lib -l group

-
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
index 175e44b..fed6297 100644
--- a/group/dlm_controld/Makefile
+++ b/group/dlm_controld/Makefile
@@ -31,10 +31,9 @@ CFLAGS += -I${incdir}

LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += -L${dlmlibdir} -ldlm
-LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt
+LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt -llogsys -lpthread
LDFLAGS += -L../../fence/libfenced/ -lfenced
-LDFLAGS += -L../lib -lgroup -lpthread -llogsys
-
+LDFLAGS += -L../lib -lgroup

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
diff --git a/group/gfs_controld/Makefile b/group/gfs_controld/Makefile
index ff1dfc3..6c68a7a 100644
--- a/group/gfs_controld/Makefile
+++ b/group/gfs_controld/Makefile
@@ -29,9 +29,10 @@ CFLAGS += -I$(S)/../lib/ -I$(S)/../include/
CFLAGS += -I${incdir}

LDFLAGS += -L${ccslibdir} -lccs -L${cmanlibdir} -lcman
-LDFLAGS += -L${dlmcontrollibdir} -ldlmcontrol -L${openaislibdir} -lcpg -lSaCkpt
+LDFLAGS += -L${dlmcontrollibdir} -ldlmcontrol
+LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt -llogsys -lpthread
LDFLAGS += -L../../fence/libfenced/ -lfenced
-LDFLAGS += -L../lib -lgroup -llogsys
+LDFLAGS += -L../lib -lgroup

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)


hooks/post-receive
--
Cluster Project