Remove some includes from .h files so they can be installed.

Also install flow.h & ipc.h for external services.


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1467 fd59a12c-fef9-0310-b244-a6a79926bd2f

Makefile

@@ -178,6 +178,8 @@ install: all
 	install -m 644 $(srcdir)lcr/lcr_ifact.h $(DESTDIR)$(INCLUDEDIR_LCR)
 	install -m 644 $(srcdir)exec/service.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
 	install -m 644 $(srcdir)exec/timer.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+	install -m 644 $(srcdir)exec/flow.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+	install -m 644 $(srcdir)exec/ipc.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
 	install -m 644 $(srcdir)exec/objdb.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
 	install -m 644 $(srcdir)exec/logsys.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
 	install -m 644 $(srcdir)exec/config.h $(DESTDIR)$(INCLUDEDIR_SERVICE)

exec/amf.c

@@ -150,6 +150,8 @@
 #include "util.h"
 #include "amf.h"
 #include "main.h"
+#include "tlist.h"
+#include "flow.h"
 #include "ipc.h"
 #include "service.h"
 #include "objdb.h"

exec/amfcomp.c

@@ -140,7 +140,10 @@
 #include "../include/ipc_amf.h"
 #include "totempg.h"
 #include "timer.h"
+#include "flow.h"
+#include "tlist.h"
 #include "ipc.h"
+#include "objdb.h"
 #include "service.h"
 #include "util.h"
 #include "amf.h"

exec/cfg.c

@@ -55,9 +55,12 @@
 #include "../include/list.h"
 #include "totem.h"
 #include "totempg.h"
+#include "flow.h"
+#include "tlist.h"
 #include "ipc.h"
 #include "../include/queue.h"
 #include "../lcr/lcr_comp.h"
+#include "objdb.h"
 #include "service.h"
 #include "totempg.h"
 #include "mempool.h"

exec/ckpt.c

@@ -55,12 +55,15 @@
 #include "../include/queue.h"
 #include "../include/hdb.h"
 #include "../lcr/lcr_comp.h"
+#include "objdb.h"
+#include "totem.h"
 #include "service.h"
 #include "mempool.h"
 #include "tlist.h"
 #include "timer.h"
 #include "util.h"
 #include "main.h"
+#include "flow.h"
 #include "ipc.h"
 #include "totempg.h"
 #include "logsys.h"

exec/clm.c

@@ -70,8 +70,11 @@
 #include "../lcr/lcr_comp.h"
 #include "totempg.h"
 #include "main.h"
+#include "flow.h"
+#include "tlist.h"
 #include "ipc.h"
 #include "mempool.h"
+#include "objdb.h"
 #include "service.h"
 #include "logsys.h"
 

exec/cpg.c

@@ -63,8 +63,11 @@
 #include "totempg.h"
 #include "totemip.h"
 #include "main.h"
+#include "flow.h"
+#include "tlist.h"
 #include "ipc.h"
 #include "mempool.h"
+#include "objdb.h"
 #include "service.h"
 #include "jhash.h"
 #include "swab.h"

exec/evs.c

@@ -59,8 +59,11 @@
 #include "../lcr/lcr_comp.h"
 #include "totempg.h"
 #include "main.h"
+#include "tlist.h"
+#include "flow.h"
 #include "ipc.h"
 #include "mempool.h"
+#include "objdb.h"
 #include "service.h"
 #include "logsys.h"
 

exec/evt.c

@@ -55,9 +55,13 @@
 #include "../include/queue.h"
 #include "../lcr/lcr_comp.h"
 #include "util.h"
+#include "objdb.h"
+#include "totem.h"
 #include "service.h"
 #include "mempool.h"
 #include "main.h"
+#include "flow.h"
+#include "tlist.h"
 #include "ipc.h"
 #include "totempg.h"
 #include "swab.h"

exec/ipc.c

@@ -70,6 +70,8 @@
 #include "mainconfig.h"
 #include "totemconfig.h"
 #include "main.h"
+#include "flow.h"
+#include "tlist.h"
 #include "ipc.h"
 #include "flow.h"
 #include "service.h"

exec/ipc.h

@@ -35,8 +35,10 @@
 #ifndef IPC_H_DEFINED
 #define IPC_H_DEFINED
 
-#include "tlist.h"
-#include "flow.h"
+#ifndef TIMER_HANDLE
+typedef void * timer_handle;
+#define TIMER_HANDLE
+#endif
 
 extern void message_source_set (mar_message_source_t *source, void *conn);
 

exec/lck.c

@@ -49,6 +49,8 @@
 #include <arpa/inet.h>
 
 #include "swab.h"
+#include "objdb.h"
+#include "totem.h"
 #include "service.h"
 #include "../include/saAis.h"
 #include "../include/saLck.h"
@@ -59,6 +61,8 @@
 #include "mempool.h"
 #include "util.h"
 #include "main.h"
+#include "flow.h"
+#include "tlist.h"
 #include "ipc.h"
 #include "totempg.h"
 #include "logsys.h"

exec/main.c

@@ -73,6 +73,8 @@
 #include "swab.h"
 #include "objdb.h"
 #include "config.h"
+#include "tlist.h"
+#include "flow.h"
 #include "ipc.h"
 #include "timer.h"
 #include "logsys.h"

exec/msg.c

@@ -52,10 +52,14 @@
 #include "../include/list.h"
 #include "../include/queue.h"
 #include "../lcr/lcr_comp.h"
+#include "objdb.h"
+#include "totem.h"
 #include "service.h"
 #include "mempool.h"
 #include "util.h"
 #include "main.h"
+#include "flow.h"
+#include "tlist.h"
 #include "ipc.h"
 #include "totempg.h"
 #include "logsys.h"

exec/service.c

@@ -40,6 +40,8 @@
 
 #include "../lcr/lcr_ifact.h"
 #include "swab.h"
+#include "objdb.h"
+#include "totem.h"
 #include "service.h"
 #include "mainconfig.h"
 #include "util.h"

exec/service.h

@@ -34,14 +34,6 @@
 #ifndef OPENAIS_SERVICE_H_DEFINED
 #define OPENAIS_SERVICE_H_DEFINED
 
-#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) )
 #define SERVICE_HANDLER_MAXIMUM_COUNT 64
 

exec/tlist.h

@@ -49,7 +49,10 @@
 	#define HZ 100  /* 10ms */
 #endif
 
+#ifndef TIMER_HANDLE
 typedef void * timer_handle;
+#define TIMER_HANDLE
+#endif
 
 struct timerlist {
 	struct list_head timer_head;