From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 30 Jun 2006 15:38:40 -0000
Subject: [Cluster-devel] cluster/fence/fenced Makefile member_cman.c
Message-ID: <20060630153840.26272.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-06-30 15:38:39

Modified files:
	fence/fenced   : Makefile member_cman.c 

Log message:
	build against installed cman lib and header

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/member_cman.c.diff?cvsroot=cluster&r1=1.11&r2=1.12

--- cluster/fence/fenced/Makefile	2005/05/19 19:51:05	1.4
+++ cluster/fence/fenced/Makefile	2006/06/30 15:38:39	1.5
@@ -22,8 +22,7 @@
 	-I${ccsincdir} \
 	-I${incdir} \
 	-I${top_srcdir}/config \
-	-I${top_srcdir}/../group/lib \
-	-I${top_srcdir}/../cman/lib
+	-I${top_srcdir}/../group/lib
 
 all: ${TARGET}
 
@@ -34,9 +33,8 @@
 	member_cman.o \
 	agent.o \
 	../../ccs/lib/libccs.a \
-	../../cman/lib/libcman.a \
 	../../group/lib/libgroup.a
-	$(CC) -o $@ $^
+	$(CC) -lcman -o $@ $^
 
 main.o: main.c fd.h
 	$(CC) $(CFLAGS) -c -o $@ $<
--- cluster/fence/fenced/member_cman.c	2006/06/20 18:11:58	1.11
+++ cluster/fence/fenced/member_cman.c	2006/06/30 15:38:39	1.12
@@ -10,8 +10,8 @@
 *******************************************************************************
 ******************************************************************************/
 
+#include <libcman.h>
 #include "fd.h"
-#include "libcman.h"
 
 #define BUFLEN		128