From: pcaulfield@sourceware.org <pcaulfield@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster/cman/daemon Makefile ais.c ais.h barri ...
Date: 30 Jun 2006 13:00:28 -0000 [thread overview]
Message-ID: <20060630130028.17899.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: pcaulfield at sourceware.org 2006-06-30 13:00:27
Modified files:
cman/daemon : Makefile ais.c ais.h barrier.c cmanccs.c
cnxman-private.h commands.c config.c daemon.c
logging.c
Log message:
Build using installed openais
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.44&r2=1.45
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.30&r2=1.31
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.h.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/barrier.c.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/cmanccs.c.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/cnxman-private.h.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&r1=1.43&r2=1.44
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/config.c.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/daemon.c.diff?cvsroot=cluster&r1=1.28&r2=1.29
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/logging.c.diff?cvsroot=cluster&r1=1.11&r2=1.12
--- cluster/cman/daemon/Makefile 2006/06/27 06:43:26 1.44
+++ cluster/cman/daemon/Makefile 2006/06/30 13:00:26 1.45
@@ -12,31 +12,28 @@
top_srcdir=..
UNINSTALL=${top_srcdir}/scripts/uninstall.pl
-AISDIR=openais20060622
-AISTAG=trunk
include ${top_srcdir}/make/defines.mk
-CFLAGS+= -fPIC -g -I${ccsincdir} -I${incdir} -I${top_srcdir}/config \
- -DCMAN_RELEASE_NAME=\"${RELEASE}\" -I../lib -DDEBUG \
- -I ${AISDIR}/${AISTAG}/exec -L ${AISDIR}/${AISTAG}/exec \
- -I ${AISDIR}/${AISTAG}/include
+CFLAGS+= -fPIC -I${ccsincdir} -I${incdir} -I${top_srcdir}/config \
+ -DCMAN_RELEASE_NAME=\"${RELEASE}\" -I../lib -DOPENAIS_EXTERNAL_SERVICE
+
+ifeq ($(DEBUG),y)
+CFLAGS+= -O0 -g -DDEBUG
+else
+CFLAGS+= -O2
+endif
TARGET=service_cman.lcrso
CMAN_OBJS=daemon.o config.o logging.o ais.o commands.o barrier.o cmanccs.o
-AIS_LIBS=libSaClm libSaAmf libSaCkpt libSaEvt libSaLck libSaMsg libcpg libais libevs
-AIS_HEADERS=cpg.h evs.h openaisCfg.h saAis.h saCkpt.h saClm.h saEvt.h saLck.h saMsg.h
-all: ${AISDIR}/${AISTAG}/exec/aisexec ${TARGET}
+all: ${TARGET}
copytobin: all
cp ${TARGET} ${top_srcdir}/bin
-service_cman.lcrso: ${CMAN_OBJS} ${AISDIR}/${AISTAG}/exec/aisexec
+service_cman.lcrso: ${CMAN_OBJS}
$(CC) $(CFLAGS) -shared -Wl,-soname,service_cman.lcrso -o $@ ${CMAN_OBJS} -L../lib -L${ccslibdir} -lccs
- cp ${TARGET} ${AISDIR}/${AISTAG}/exec
- rm -f openais
- ln -sf ${AISDIR} openais
daemon.o: daemon.c list.h cnxman-socket.h cnxman-private.h \
daemon.h logging.h commands.h barrier.h cmanccs.h
@@ -63,45 +60,14 @@
logging.o: logging.c list.h cnxman-socket.h cnxman-private.h
$(CC) $(CFLAGS) -c -o $@ $<
-# Target to download openAIS
-${AISDIR}/${AISDIR}.tar.gz:
- mkdir -p ${AISDIR}
- cd ${AISDIR} && wget http://people.redhat.com/pcaulfie/${AISDIR}.tar.gz
-
-# Unpack the tarball
-${AISDIR}/${AISTAG}: ${AISDIR}/${AISDIR}.tar.gz
- cd ${AISDIR} && tar -xzf ${AISDIR}.tar.gz
- touch ${AISDIR}/${AISTAG}
-
-${AISDIR}/${AISTAG}/exec/aisexec: ${AISDIR}/${AISTAG}
- cd ${AISDIR}/${AISTAG} && make BUILD_DYNAMIC=1 OPENAIS_BUILD=DEBUG
-
install:
- install -d ${libexecdir}
- install -d ${libexecdir}/cman
- install ${AISDIR}/${AISTAG}/exec/aisexec ${libexecdir}/cman/
- install ${AISDIR}/${AISTAG}/exec/*.lcrso ${libexecdir}/cman/
- install ${AISDIR}/${AISTAG}/exec/keygen ${sbindir}/ais-keygen
- install -d ${incdir}
- cd ${AISDIR}/${AISTAG}/include; install ${AIS_HEADERS} ${incdir}
- cd ${AISDIR}/${AISTAG}/lib; for i in ${AIS_LIBS}; do \
- install $$i.a $$i.so.1.0 ${libdir}; \
- ln -sf ${libdir}/$$i.so.1.0 ${libdir}/$$i.so.1; \
- ln -sf ${libdir}/$$i.so.1 ${libdir}/$$i.so; \
- done
-
+ install -s service_cman.lcrso ${libexecdir}/lcrso
uninstall:
- rm -rf ${libexecdir}/cman
- ${UNINSTALL} ais-keygen ${sbindir}
- ${UNINSTALL} ${AIS_HEADERS} ${incdir}
- for i in ${AIS_LIBS}; do \
- ${UNINSTALL} $$i.a $$i.so.1.0 $$i.so.1 $$i.so ${libdir}; done
+ rm -f ${libexecdir}/lcrso/service_cman.lcrso
clean:
rm -f *.o service_cman.lcrso
- rm -rf ${AISDIR}/${AISTAG}
- rm -f openais
reallyclean: clean
rm -rf ${AISDIR}
--- cluster/cman/daemon/ais.c 2006/05/22 09:08:48 1.30
+++ cluster/cman/daemon/ais.c 2006/06/30 13:00:26 1.31
@@ -25,19 +25,19 @@
#include <arpa/inet.h>
#include <netdb.h>
-#include "totemip.h"
-#include "totemconfig.h"
-#include "commands.h"
-#include "totempg.h"
-#include "aispoll.h"
-#include "service.h"
-#include "config.h"
-#include "print.h"
-#include "../lcr/lcr_comp.h"
+/* openais headers */
+#include <openais/totem/totemip.h>
+#include <openais/totem/totempg.h>
+#include <openais/totem/aispoll.h>
+#include <openais/service/service.h>
+#include <openais/service/config.h>
+#include <openais/lcr/lcr_comp.h>
+#include <openais/service/swab.h>
#include "cnxman-socket.h"
+#include "commands.h"
#include "logging.h"
-#include "swab.h"
+
#include "ais.h"
#include "cmanccs.h"
#include "daemon.h"
--- cluster/cman/daemon/ais.h 2006/05/11 10:38:11 1.8
+++ cluster/cman/daemon/ais.h 2006/06/30 13:00:26 1.9
@@ -12,7 +12,7 @@
/* DLM Currently maxes out at 3 ! */
#define MAX_INTERFACES 8
-#include "totem.h"
+#include <openais/totem/totem.h>
extern int ais_add_ifaddr(char *mcast, char *ifaddr, int portnum);
extern int comms_send_message(void *buf, int len,
--- cluster/cman/daemon/barrier.c 2006/04/06 13:08:34 1.7
+++ cluster/cman/daemon/barrier.c 2006/06/30 13:00:26 1.8
@@ -30,9 +30,10 @@
#include <netinet/in.h>
#include <sys/errno.h>
+
+#include <openais/totem/totemip.h>
+#include <openais/totem/aispoll.h>
#include "list.h"
-#include "totemip.h"
-#include "aispoll.h"
#include "cnxman-socket.h"
#include "cnxman-private.h"
#include "daemon.h"
--- cluster/cman/daemon/cmanccs.c 2006/05/22 09:08:48 1.15
+++ cluster/cman/daemon/cmanccs.c 2006/06/30 13:00:27 1.16
@@ -26,7 +26,6 @@
#include "cnxman-socket.h"
#include "cnxman-private.h"
#include "logging.h"
-#include "totemip.h"
#include "commands.h"
#include "ais.h"
#include "ccs.h"
--- cluster/cman/daemon/cnxman-private.h 2006/05/24 09:02:41 1.21
+++ cluster/cman/daemon/cnxman-private.h 2006/06/30 13:00:27 1.22
@@ -14,12 +14,7 @@
#ifndef __CNXMAN_PRIVATE_H
#define __CNXMAN_PRIVATE_H
-#include <totem.h>
-
-// PJC: Remove this later
-#ifndef INTERFACE_MAX
-#define INTERFACE_MAX 2
-#endif
+#include <openais/totem/totem.h>
/* Protocol Version triplet */
#define CNXMAN_MAJOR_VERSION 6
--- cluster/cman/daemon/commands.c 2006/05/22 09:08:48 1.43
+++ cluster/cman/daemon/commands.c 2006/06/30 13:00:27 1.44
@@ -30,9 +30,11 @@
#include <netinet/in.h>
#include <sys/errno.h>
+#include <openais/totem/totemip.h>
+#include <openais/totem/totempg.h>
+#include <openais/service/swab.h>
+#include <openais/totem/aispoll.h>
#include "list.h"
-#include "totemip.h"
-#include "totempg.h"
#include "cnxman-socket.h"
#include "cnxman-private.h"
#include "daemon.h"
@@ -41,8 +43,6 @@
#include "cmanccs.h"
#include "commands.h"
#include "ais.h"
-#include "aispoll.h"
-#include "swab.h"
#define max(a,b) (((a) > (b)) ? (a) : (b))
--- cluster/cman/daemon/config.c 2006/04/24 16:45:04 1.16
+++ cluster/cman/daemon/config.c 2006/06/30 13:00:27 1.17
@@ -14,8 +14,8 @@
#include <stdlib.h>
#include <string.h>
+#include <openais/service/objdb.h>
#include "ccs.h"
-#include "objdb.h"
#include "logging.h"
static int read_config_for(int ccs_fd, struct objdb_iface_ver0 *objdb, unsigned int parent,
--- cluster/cman/daemon/daemon.c 2006/05/15 12:47:01 1.28
+++ cluster/cman/daemon/daemon.c 2006/06/30 13:00:27 1.29
@@ -29,9 +29,10 @@
#include <netinet/in.h>
#include <sys/errno.h>
-#include "aispoll.h"
+#include <openais/totem/aispoll.h>
+#include <openais/totem/totemip.h>
+
#include "list.h"
-#include "totemip.h"
#include "cnxman-socket.h"
#include "cnxman-private.h"
#include "daemon.h"
--- cluster/cman/daemon/logging.c 2006/04/21 10:13:40 1.11
+++ cluster/cman/daemon/logging.c 2006/06/30 13:00:27 1.12
@@ -21,8 +21,8 @@
#include <sys/socket.h>
#include <netinet/in.h>
-#include "print.h"
-#include "totemip.h"
+/* openais header */
+#include <openais/service/print.h>
#include "logging.h"
reply other threads:[~2006-06-30 13:00 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=20060630130028.17899.qmail@sourceware.org \
--to=pcaulfield@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.