From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 30 Jun 2006 15:36:53 -0000
Subject: [Cluster-devel] cluster/group/dlm_controld Makefile member_cman.c
Message-ID: <20060630153653.25821.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:36:53

Modified files:
	group/dlm_controld: Makefile member_cman.c 

Log message:
	build against installed cman lib and header

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/member_cman.c.diff?cvsroot=cluster&r1=1.1&r2=1.2

--- cluster/group/dlm_controld/Makefile	2006/06/09 20:59:57	1.1
+++ cluster/group/dlm_controld/Makefile	2006/06/30 15:36:52	1.2
@@ -18,7 +18,6 @@
 CFLAGS+= -g -I${incdir} -I${top_srcdir}/config
 
 CFLAGS+= -idirafter ${KERNEL_SRC}/include/linux \
-	-I../../cman/lib/ \
 	-I../../group/lib/ \
 	-I../../ccs/lib/ \
 	-I../include/
@@ -35,10 +34,9 @@
 		member_cman.o \
 		group.o \
 		action.o \
-		../../cman/lib/libcman.a \
 		../lib/libgroup.a \
 		../../ccs/lib/libccs.a
-	$(CC) $(LDFLAGS) -o $@ $^
+	$(CC) $(LDFLAGS) -lcman -o $@ $^
 
 main.o: main.c
 	$(CC) $(CFLAGS) -c -o $@ $<
--- cluster/group/dlm_controld/member_cman.c	2006/06/09 20:59:57	1.1
+++ cluster/group/dlm_controld/member_cman.c	2006/06/30 15:36:52	1.2
@@ -10,8 +10,8 @@
 *******************************************************************************
 ******************************************************************************/
 
+#include <libcman.h>
 #include "dlm_daemon.h"
-#include "libcman.h"
 
 static cman_handle_t	ch;
 static cman_node_t      old_nodes[MAX_NODES];