From: teigland@sourceware.org <teigland@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster/group/gfs_controld Makefile cpg.c memb ...
Date: 30 Jun 2006 15:35:24 -0000 [thread overview]
Message-ID: <20060630153524.25222.qmail@sourceware.org> (raw)
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;
reply other threads:[~2006-06-30 15:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060630153524.25222.qmail@sourceware.org \
--to=teigland@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.