[Cluster-devel] cluster/group/gfs_controld Makefile cpg.c memb ...

[Cluster-devel] cluster/group/gfs_controld Makefile cpg.c memb ...

[teigland]

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

Modified files:
	group/gfs_controld: Makefile cpg.c member_cman.c 

Log message:
	build against installed headers and libs for cman and openais

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

--- cluster/group/gfs_controld/Makefile	2006/06/15 20:41:46	1.2
+++ cluster/group/gfs_controld/Makefile	2006/06/30 15:35:23	1.3
@@ -20,9 +20,8 @@
 	-I${incdir} \
 	-I${top_srcdir}/config \
 	-I../include/ \
-	-I../lib/ \
-	-I../../cman/lib/ \
-	-I../../cman/daemon/openais/trunk/include/
+	-I../lib/
+LDFLAGS+= -L/usr/lib/openais -L/usr/lib
 
 TARGET=gfs_controld
 
@@ -37,10 +36,8 @@
 		group.o \
 		plock.o \
 		recover.o \
-		../../cman/lib/libcman.a \
-		../../cman/daemon/openais/trunk/lib/libcpg.a \
 		../lib/libgroup.a
-	$(CC) $(LDFLAGS) -o $@ $^
+	$(CC) $(LDFLAGS) -lcman -lcpg -o $@ $^
 
 
 main.o: main.c
--- cluster/group/gfs_controld/cpg.c	2006/06/15 20:41:46	1.3
+++ cluster/group/gfs_controld/cpg.c	2006/06/30 15:35:23	1.4
@@ -10,8 +10,8 @@
 *******************************************************************************
 ******************************************************************************/
 
+#include <openais/cpg.h>
 #include "lock_dlm.h"
-#include "cpg.h"
 
 static cpg_handle_t	daemon_handle;
 static struct cpg_name	daemon_name;
--- cluster/group/gfs_controld/member_cman.c	2006/06/15 20:41:46	1.2
+++ cluster/group/gfs_controld/member_cman.c	2006/06/30 15:35:23	1.3
@@ -18,9 +18,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#include <libcman.h>
 
 #include "lock_dlm.h"
-#include "libcman.h"
 
 int			our_nodeid;
 char *			clustername;