cluster: STABLE3 - cman_tool: fix Makefile

Fabio M. Di Nitto fabbione at fedoraproject.org
Fri Oct 2 08:54:02 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e5ac2f365c6c02709b19408fe2fae0f9507e1fa0
Commit:        e5ac2f365c6c02709b19408fe2fae0f9507e1fa0
Parent:        8e6dd47ad56b7a89c388ec50597f604369f289bc
Author:        Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate:    Fri Oct 2 10:50:09 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Fri Oct 2 10:50:09 2009 +0200

cman_tool: fix Makefile

add corosyncinc/libdir and respect search order

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
 cman/cman_tool/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cman/cman_tool/Makefile b/cman/cman_tool/Makefile
index 149b758..139ac52 100644
--- a/cman/cman_tool/Makefile
+++ b/cman/cman_tool/Makefile
@@ -14,13 +14,13 @@ OBJS=	main.o \
 	join.o
 
 CFLAGS += -DCOROSYNCBIN=\"${corosyncbin}\" -DSBINDIR=\"${sbindir}\"
-CFLAGS += -I${cmanincdir}
+CFLAGS += -I${cmanincdir} -I${ccsincdir}
+CFLAGS += -I${corosyncincdir}
 CFLAGS += -I${incdir}
-CFLAGS += -I${ccsincdir}
 
-LDFLAGS += -L${cmanlibdir} -lcman
+LDFLAGS += -L${cmanlibdir} -lcman -L${ccslibdir} -lccs
+LDFLAGS += -L${corosynclibdir} -lconfdb
 LDFLAGS += -L${libdir}
-LDFLAGS += -L${ccslibdir} -lconfdb -lccs
 
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)


More information about the cluster-commits mailing list