cluster: RHEL6 - rgmanager: cleanup binary linking and include dirs

Ryan McCabe rmccabe at fedoraproject.org
Tue May 1 15:01:39 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d03d3719d96f2c2a36d53e08e32e38aa830d8672
Commit:        d03d3719d96f2c2a36d53e08e32e38aa830d8672
Parent:        e114e9ad6579674555bfa019a29189b0a771bfe0
Author:        Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate:    Tue Apr 24 13:51:36 2012 +0200
Committer:     Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Tue May 1 10:58:04 2012 -0400

rgmanager: cleanup binary linking and include dirs

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
Reviewed-by: Lon Hohberger <lhh at redhat.com>
Reviewed-by: Ryan McCabe <rmccabe at redhat.com>
---
 rgmanager/src/daemons/Makefile |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile
index 336b6cf..d125eaa 100644
--- a/rgmanager/src/daemons/Makefile
+++ b/rgmanager/src/daemons/Makefile
@@ -49,7 +49,8 @@ OBJS5=	cpglockdump.o
 
 CFLAGS += -DSHAREDIR=\"${sharedir}\" -D_GNU_SOURCE
 CFLAGS += -fPIC
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${logtincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${corosyncincdir}
+CFLAGS += -I${dlmincdir} -I${fencedincdir} -I${logtincdir}
 CFLAGS += `xml2-config --cflags` -I${slangincdir}
 CFLAGS += -I$(S)/../../include
 CFLAGS += -I${incdir}
@@ -63,8 +64,8 @@ CCS_LDFLAGS += -L${ccslibdir} -lccs
 CMAN_LDFLAGS += -L${cmanlibdir} -lcman
 LOGSYS_LDFLAGS += -L${logtlibdir} -llogthread
 DLM_LDFLAGS += -L${dlmlibdir} -ldlm
-CPG_LDFLAGS += -lcpg
-FENCED_LDFLAGS += -lfenced
+CPG_LDFLAGS += -L${corosynclibdir} -lcpg
+FENCED_LDFLAGS += -L${fencedlibdir} -lfenced
 XML2_LDFLAGS += `xml2-config --libs`
 SLANG_LDFLAGS += -L${slanglibdir} -lslang
 EXTRA_LDFLAGS += -lpthread


More information about the cluster-commits mailing list