Moved header files from src/lam/include to src/mpi/*

This commit was SVN r242.

src/mpi/communicator/Makefile.am

@@ -5,3 +5,16 @@
 
 include $(top_srcdir)/config/Makefile.options
 
+# Source code files
+
+headers = \
+        communicator.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/mpi/communicator
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/mpi/communicator/communicator.h

@@ -5,10 +5,10 @@
 #ifndef LAM_COMMUNICATOR_H
 #define LAM_COMMUNICATOR_H
 
-#include "mpi.h"
-#include "lam/group.h"
 #include "lam/stdint.h"
 #include "lam/threads/mutex.h"
+#include "mpi.h"
+#include "mpi/group/group.h"
 #include "mca/mpi/coll/coll.h"
 
 struct lam_communicator_t {

src/mpi/datatype/datatype.h

@@ -14,15 +14,15 @@
 /* typedefs ***********************************************************/
 
 typedef enum lam_checksum_kind_t lam_checksum_kind_t;
-typedef enum lam_checksum_kind_t lam_checksum_kind_t;
+typedef enum lam_datatype_kind_t lam_datatype_kind_t;
 typedef enum lam_datatype_creator_t lam_dtype_creator_t;
 typedef enum lam_datatype_state_t lam_datatype_state_t;
 typedef struct lam_checksum_t lam_checksum_t;
 typedef struct lam_datatype_t lam_datatype_t;
-typedef struct lam_datatype_t lam_datatype_t;
 typedef struct lam_datavec_element_t lam_datavec_element_t;
 typedef struct lam_datavec_t lam_datavec_t;
 typedef struct lam_dataxdr_t lam_dataxdr_t;
+typedef struct lam_pack_state_t lam_pack_state_t;
 
 
 /* enums **************************************************************/
@@ -201,11 +201,11 @@ int lam_datatype_copy(void *dest,
  * datatype.
  */
 struct lam_pack_state_t {
-    size_t current_offset;         /**< current offset into packed buffer */
+    size_t current_offset_packed;  /**< current offset into packed buffer */
     size_t current_type;           /**< current index of datatype */
     size_t current_repeat;         /**< current index of datavec repeat */
     size_t current_element;        /**< current index of datavec element */
-    size_t current_offset;         /**< current offset into datavec element */
+    size_t current_offset_datavec; /**< current offset into datavec element */
 };
 
 

src/mpi/group/Makefile.am

@@ -0,0 +1,20 @@
+# -*- makefile -*-
+#
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+# Source code files
+
+headers = \
+        group.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/mpi/group
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/mpi/group/group.h

@@ -6,7 +6,7 @@
 #define LAM_GROUP_H
 
 #include "mpi.h"
-#include "lam/proc.h"
+#include "mpi/proc/proc.h"
 
 struct lam_group_t {
    char g_name[MPI_MAX_OBJECT_NAME];

src/mpi/info/Makefile.am

@@ -0,0 +1,20 @@
+# -*- makefile -*-
+#
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+# Source code files
+
+headers = \
+        info.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/mpi/info
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/mpi/op/Makefile.am

@@ -0,0 +1,20 @@
+# -*- makefile -*-
+#
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+# Source code files
+
+headers = \
+        op.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/mpi/op
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/mpi/proc/Makefile.am

@@ -0,0 +1,20 @@
+# -*- makefile -*-
+#
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+# Source code files
+
+headers = \
+        proc.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/mpi/proc
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif

src/mpi/request/Makefile.am

@@ -0,0 +1,20 @@
+# -*- makefile -*-
+#
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+# Source code files
+
+headers = \
+        request.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+lamdir = $(includedir)/lam/mpi/request
+lam_HEADERS = $(headers)
+else
+lamdir = $(includedir)
+endif