mirror of
https://git.proxmox.com/git/mirror_corosync
synced 2025-08-13 14:54:41 +00:00
Fix dependencies and install all header files for external service handlers.
New defination required to build external service handlers. git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1066 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
parent
d193826724
commit
d223eda745
8
Makefile
8
Makefile
@ -34,6 +34,7 @@ SBINDIR=/usr/sbin
|
||||
INCLUDEDIR=/usr/include/openais
|
||||
INCLUDEDIR_TOTEM=/usr/include/openais/totem
|
||||
INCLUDEDIR_LCR=/usr/include/openais/lcr
|
||||
INCLUDEDIR_SERVICE=/usr/include/openais/service
|
||||
MANDIR=/usr/share/man
|
||||
ETCDIR=/etc/ais
|
||||
LCRSODIR=/usr/libexec/lcrso
|
||||
@ -63,6 +64,7 @@ install:
|
||||
mkdir -p $(DESTDIR)$(INCLUDEDIR)
|
||||
mkdir -p $(DESTDIR)$(INCLUDEDIR_TOTEM)
|
||||
mkdir -p $(DESTDIR)$(INCLUDEDIR_LCR)
|
||||
mkdir -p $(DESTDIR)$(INCLUDEDIR_SERVICE)
|
||||
mkdir -p $(DESTDIR)$(LIBDIR)
|
||||
mkdir -p $(DESTDIR)$(LCRSODIR)
|
||||
mkdir -p $(DESTDIR)$(ETCDIR)
|
||||
@ -159,11 +161,17 @@ endif
|
||||
install -m 644 include/cpg.h $(DESTDIR)$(INCLUDEDIR)
|
||||
install -m 644 include/evs.h $(DESTDIR)$(INCLUDEDIR)
|
||||
install -m 644 exec/aispoll.h $(DESTDIR)$(INCLUDEDIR_TOTEM)
|
||||
install -m 644 exec/totempg.h $(DESTDIR)$(INCLUDEDIR_TOTEM)
|
||||
install -m 644 exec/totem.h $(DESTDIR)$(INCLUDEDIR_TOTEM)
|
||||
install -m 644 exec/totemip.h $(DESTDIR)$(INCLUDEDIR_TOTEM)
|
||||
install -m 644 lcr/lcr_ckpt.h $(DESTDIR)$(INCLUDEDIR_LCR)
|
||||
install -m 644 lcr/lcr_comp.h $(DESTDIR)$(INCLUDEDIR_LCR)
|
||||
install -m 644 lcr/lcr_ifact.h $(DESTDIR)$(INCLUDEDIR_LCR)
|
||||
install -m 644 exec/service.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
|
||||
install -m 644 exec/objdb.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
|
||||
install -m 644 exec/print.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
|
||||
install -m 644 exec/config.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
|
||||
install -m 644 exec/swab.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
|
||||
install -m 644 man/*.3 $(DESTDIR)$(MANDIR)/man3
|
||||
install -m 644 man/*.5 $(DESTDIR)$(MANDIR)/man5
|
||||
install -m 644 man/*.8 $(DESTDIR)$(MANDIR)/man8
|
||||
|
@ -34,13 +34,10 @@
|
||||
|
||||
#define TRUE 1
|
||||
#define FALSE 0
|
||||
#include <sys/un.h>
|
||||
#include "../include/saAis.h"
|
||||
#include "../include/saClm.h"
|
||||
#include "../include/queue.h"
|
||||
#include "../include/ipc_gen.h"
|
||||
#include "mainconfig.h"
|
||||
#include "poll.h"
|
||||
#include "totempg.h"
|
||||
|
||||
#ifndef AIS_EXEC_H_DEFINED
|
||||
#define AIS_EXEC_H_DEFINED
|
||||
|
@ -31,12 +31,14 @@
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
||||
* THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
/*
|
||||
#include <netinet/in.h>
|
||||
#include "../include/saAis.h"
|
||||
#include "../include/list.h"
|
||||
#include "aispoll.h"
|
||||
#include "totemsrp.h"
|
||||
#include "totempg.h"
|
||||
*/
|
||||
#include "objdb.h"
|
||||
|
||||
#ifndef MAINCONFIG_H_DEFINED
|
||||
|
@ -57,6 +57,7 @@
|
||||
#include "print.h"
|
||||
#include "totemip.h"
|
||||
#include "../include/saAis.h"
|
||||
#include "mainconfig.h"
|
||||
|
||||
static unsigned int logmode = LOG_MODE_BUFFER | LOG_MODE_STDERR | LOG_MODE_SYSLOG;
|
||||
static char *logfile = 0;
|
||||
|
@ -41,7 +41,6 @@
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <syslog.h>
|
||||
#include "mainconfig.h"
|
||||
|
||||
#define LOG_MODE_DEBUG 1
|
||||
#define LOG_MODE_TIMESTAMP 2
|
||||
@ -111,7 +110,10 @@ static inline int mkpri (int level, int id)
|
||||
return _mkpri (level, id);
|
||||
}
|
||||
|
||||
int log_setup (char **error_string, struct main_config *config);
|
||||
#ifndef main_config
|
||||
struct main_config;
|
||||
#endif
|
||||
extern int log_setup (char **error_string, struct main_config *config);
|
||||
|
||||
extern int _log_init (const char *ident);
|
||||
static inline void log_init (const char *ident)
|
||||
|
@ -34,9 +34,13 @@
|
||||
#ifndef OPENAIS_SERVICE_H_DEFINED
|
||||
#define OPENAIS_SERVICE_H_DEFINED
|
||||
|
||||
//#include <netinet/in.h>
|
||||
#ifdef OPENAIS_EXTERNAL_SERVICE
|
||||
#include <openais/totem/totem.h>
|
||||
#include <openais/service/objdb.h>
|
||||
#else
|
||||
#include "totem.h"
|
||||
#include "objdb.h"
|
||||
#endif
|
||||
|
||||
#define SERVICE_ID_MAKE(a,b) ( ((a)<<16) | (b) )
|
||||
|
||||
|
@ -37,7 +37,6 @@
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include "aispoll.h"
|
||||
#include "totemsrp.h"
|
||||
#include "totem.h"
|
||||
|
||||
typedef unsigned int totempg_groups_handle;
|
||||
|
Loading…
Reference in New Issue
Block a user