First cut of MPI_File / io MCA component framework. This also

includes the romio component.  Only blocking operations are supported
-- non-blocking stuff is pending some changes in the top-level
progression engine, and some threaded issues need to be worked out.

This commit was SVN r2655.

include/mpi.h

@@ -18,6 +18,16 @@
 #define MPI_VERSION 2
 #define MPI_SUBVERSION 0
 
+/*
+ * To accomodate programs written for MPI implementations that use a
+ * straight ROMIO import
+ */
+#if !defined(OMPI_BUILDING) || !OMPI_BUILDING
+#define MPIO_Request MPI_Request
+#define MPIO_Test MPI_Test
+#define MPIO_Wait MPI_Wait
+#endif
+
 /*
  * Typedefs
  */
@@ -82,45 +92,69 @@ extern "C" {
 
 /*
  * Miscellaneous constants
- * JMS: Some of these may be L7-specific and should be removed...
+ * JMS: Some of these may be LAM-specific and should be removed...
  */
-#define MPI_ANY_SOURCE      -1      /* match any source rank */
-#define MPI_PROC_NULL       -2      /* rank of null process */
-#define MPI_ROOT -4
-#define MPI_CANCEL_SOURCE   -3      /* successful cancel */
-#define MPI_ANY_TAG     -1      /* match any message tag */
-#define MPI_GER_TAG     -2      /* used for GER protocol */
-#define MPI_MERGE_TAG       -3      /* used to merge inter-comm */
-#define MPI_MAX_PROCESSOR_NAME  256     /* max proc. name length */
-#define MPI_MAX_ERROR_STRING    256     /* max error message length */
-#define MPI_MAX_OBJECT_NAME 64      /* max object name length */
-#define MPI_UNDEFINED       -32766      /* undefined stuff */
-#define MPI_CART        1       /* cartesian topology */
-#define MPI_GRAPH       2       /* graph topology */
-#define MPI_KEYVAL_INVALID  -1      /* invalid key value */
+#define MPI_ANY_SOURCE         -1      /* match any source rank */
+#define MPI_PROC_NULL          -2      /* rank of null process */
+#define MPI_ROOT               -4
+#define MPI_CANCEL_SOURCE      -3      /* successful cancel */
+#define MPI_ANY_TAG            -1      /* match any message tag */
+#define MPI_GER_TAG            -2      /* used for GER protocol */
+#define MPI_MERGE_TAG          -3      /* used to merge inter-comm */
+#define MPI_MAX_PROCESSOR_NAME 256     /* max proc. name length */
+#define MPI_MAX_ERROR_STRING   256     /* max error message length */
+#define MPI_MAX_OBJECT_NAME    64      /* max object name length */
+#define MPI_UNDEFINED          -32766  /* undefined stuff */
+#define MPI_CART               1       /* cartesian topology */
+#define MPI_GRAPH              2       /* graph topology */
+#define MPI_KEYVAL_INVALID     -1      /* invalid key value */
 
 /*
  * More constants
- * JMS: Copied straight from L7 -- feel free to change
- * JMS: Some of these are probably L7-specific and should be deleted
+ * JMS: Copied straight from LAM -- feel free to change
+ * JMS: Some of these are probably LAM-specific and should be deleted
  */
-#define MPI_BOTTOM      ((void *) 0)    /* base reference address */
-#define MPI_BSEND_OVERHEAD  40      /* size of bsend header + ptr */
-#define MPI_MAX_INFO_KEY    36      /* max info key length */
-#define MPI_MAX_INFO_VAL    256     /* max info value length */
-#define MPI_ARGV_NULL       ((char **) 0)   /* NULL argument vector */
-#define MPI_ARGVS_NULL      ((char ***) 0)  /* NULL argument vectors */
-#define MPI_ERRCODES_IGNORE ((void *) 0)    /* don't return error codes */
-#define MPI_MAX_PORT_NAME       36              /* max port name length */
-#define MPI_MAX_NAME_LEN    MPI_MAX_PORT_NAME /* max port name length */
-#define MPI_ORDER_C     0       /* C row major order */
-#define MPI_ORDER_FORTRAN   1       /* Fortran column major order */
-#define MPI_DISTRIBUTE_BLOCK    0       /* block distribution */
-#define MPI_DISTRIBUTE_CYCLIC   1       /* cyclic distribution */
-#define MPI_DISTRIBUTE_NONE     2       /* not distributed */
-#define MPI_DISTRIBUTE_DFLT_DARG (-1)       /* default distribution arg */
+#define MPI_BOTTOM               ((void *) 0)    /* base reference address */
+#define MPI_BSEND_OVERHEAD       40      /* size of bsend header + ptr */
+#define MPI_MAX_INFO_KEY         36      /* max info key length */
+#define MPI_MAX_INFO_VAL         256     /* max info value length */
+#define MPI_ARGV_NULL            ((char **) 0)   /* NULL argument vector */
+#define MPI_ARGVS_NULL           ((char ***) 0)  /* NULL argument vectors */
+#define MPI_ERRCODES_IGNORE      ((void *) 0)    /* don't return error codes */
+#define MPI_MAX_PORT_NAME        36      /* max port name length */
+#define MPI_MAX_NAME_LEN         MPI_MAX_PORT_NAME /* max port name length */
+#define MPI_ORDER_C              0       /* C row major order */
+#define MPI_ORDER_FORTRAN        1       /* Fortran column major order */
+#define MPI_DISTRIBUTE_BLOCK     0       /* block distribution */
+#define MPI_DISTRIBUTE_CYCLIC    1       /* cyclic distribution */
+#define MPI_DISTRIBUTE_NONE      2       /* not distributed */
+#define MPI_DISTRIBUTE_DFLT_DARG (-1)    /* default distribution arg */
 #define MPI_TAG_UB_VALUE (0x7fffffff)
 
+/*
+ * Since these values are arbitrary to Open MPI, we might as well make
+ * them the same as ROMIO for ease of mapping.  These values taken
+ * from ROMIO's mpio.h file.
+ */
+#define MPI_MODE_CREATE              1  /* ADIO_CREATE */ 
+#define MPI_MODE_RDONLY              2  /* ADIO_RDONLY */
+#define MPI_MODE_WRONLY              4  /* ADIO_WRONLY  */
+#define MPI_MODE_RDWR                8  /* ADIO_RDWR  */
+#define MPI_MODE_DELETE_ON_CLOSE    16  /* ADIO_DELETE_ON_CLOSE */
+#define MPI_MODE_UNIQUE_OPEN        32  /* ADIO_UNIQUE_OPEN */
+#define MPI_MODE_EXCL               64  /* ADIO_EXCL */
+#define MPI_MODE_APPEND            128  /* ADIO_APPEND */
+#define MPI_MODE_SEQUENTIAL        256  /* ADIO_SEQUENTIAL */
+
+#define MPI_DISPLACEMENT_CURRENT   -54278278
+
+#define MPI_SEEK_SET            600
+#define MPI_SEEK_CUR            602
+#define MPI_SEEK_END            604
+
+#define MPI_MAX_DATAREP_STRING  128
+
+
 /*
  * Predefined attribute keyvals
  */
@@ -406,7 +440,7 @@ extern struct ompi_errhandler_t ompi_mpi_errhandler_null;
 extern struct ompi_errhandler_t ompi_mpi_errors_are_fatal;
 extern struct ompi_errhandler_t ompi_mpi_errors_return;
 
-extern struct ompi_file_t ompi_file_null;
+extern struct ompi_file_t ompi_mpi_file_null;
 
 extern struct ompi_info_t ompi_mpi_info_null;
 

src/file/file.c

@@ -7,6 +7,7 @@
 #include "file/file.h"
 #include "class/ompi_list.h"
 #include "mpi/runtime/params.h"
+#include "mca/io/base/base.h"
 
 
 /*
@@ -62,13 +63,17 @@ int ompi_file_init(void)
 
 
 /*
- * Create a file handle
+ * Back end to MPI_FILE_OPEN
  */
 int ompi_file_open(ompi_communicator_t *comm, char *filename, 
                    int amode, ompi_info_t *info, ompi_file_t **fh)
 {
+    int ret;
     ompi_file_t *file;
 
+    /* JMS: This is problematic -- need this to be as large as ROMIO
+       needs to to be, or we need an additional pointer to hang stuff
+       off :-( */
     file = OBJ_NEW(ompi_file_t);
     if (NULL == file) {
         return OMPI_ERR_OUT_OF_RESOURCE;
@@ -78,12 +83,30 @@ int ompi_file_open(ompi_communicator_t *comm, char *filename,
 
     file->f_comm = comm;
     OBJ_RETAIN(comm);
-    file->f_filename = strdup(filename);
+
+    if (MPI_INFO_NULL != info) {
+        if (OMPI_SUCCESS != (ret = ompi_info_dup(info, &file->f_info))) {
+            OBJ_RELEASE(file);
+            return ret;
+        }
+    } else {
+        file->f_info = MPI_INFO_NULL;
+        OBJ_RETAIN(MPI_INFO_NULL);
+    }
+
     file->f_amode = amode;
+    file->f_filename = strdup(filename);
+    if (NULL == file->f_filename) {
+        OBJ_RELEASE(file);
+        return OMPI_ERR_OUT_OF_RESOURCE;
+    }
 
     /* Select a module and actually open the file */
 
-    /* JMS fill in here */
+    if (OMPI_SUCCESS != (ret = mca_io_base_file_select(file, NULL))) {
+        OBJ_RELEASE(file);
+        return ret;
+    }
 
     /* All done */
 
@@ -93,13 +116,14 @@ int ompi_file_open(ompi_communicator_t *comm, char *filename,
 
 
 /*
- * Close a file handle
+ * Back end to MPI_FILE_CLOSE.
  */
 int ompi_file_close(ompi_file_t **file) 
 {
     (*file)->f_flags |= OMPI_FILE_ISCLOSED;
     OBJ_RELEASE(*file);
     *file = MPI_FILE_NULL;
+
     return OMPI_SUCCESS;
 }
 
@@ -174,7 +198,7 @@ static void file_constructor(ompi_file_t *file)
     file->f_comm = NULL;
     file->f_filename = NULL;
     file->f_amode = 0;
-    file->errhandler_type = OMPI_ERRHANDLER_TYPE_FILE;
+    file->f_info = NULL;
 
     /* Initialize flags */
 
@@ -191,6 +215,7 @@ static void file_constructor(ompi_file_t *file)
        be changed by invoking MPI_FILE_SET_ERRHANDLER on
        MPI_FILE_NULL). */
 
+    file->errhandler_type = OMPI_ERRHANDLER_TYPE_FILE;
     if (file != &ompi_mpi_file_null) {
         file->error_handler = ompi_mpi_file_null.error_handler;
     } else {
@@ -200,10 +225,10 @@ static void file_constructor(ompi_file_t *file)
 
     /* Initialize the module */
 
-    file->f_io_version = OMPI_IO_VERSION_NONE;
+    file->f_io_version = MCA_IO_BASE_V_NONE;
     memset(&(file->f_io_selected_module), 0, 
            sizeof(file->f_io_selected_module));
-    file->f_selected_data = NULL;
+    file->f_io_selected_data = NULL;
 
     /* If the user doesn't want us to ever free it, then add an extra
        RETAIN here */
@@ -222,19 +247,12 @@ static void file_destructor(ompi_file_t *file)
     /* Finalize the module */
 
     switch (file->f_io_version) {
-    case OMPI_IO_VERSION_1_0_0:
-#if 0
-        /* JMS need to implement */
-        file->f_io_selected_module.v1_0_0.iom_finalize(file);
-#endif
+    case MCA_IO_BASE_V_1_0_0:
+        file->f_io_selected_module.v1_0_0.io_module_file_close(file);
         break;
-        
-    case OMPI_IO_VERSION_2_0_0:
-        /* JMS fill in here */
-        break;
-        
+
     default:
-        /* All other cases are uninitialized or MPI_FILE_NULL */
+        /* Should never get here */
         break;
     }
     
@@ -261,6 +279,13 @@ static void file_destructor(ompi_file_t *file)
 #endif
     }
 
+    if (NULL != file->f_info) {
+        OBJ_RELEASE(file->f_info);
+#if OMPI_ENABLE_DEBUG
+        file->f_info = NULL;
+#endif
+    }
+
     /* Reset the f_to_c table entry */
 
     if (MPI_UNDEFINED != file->f_f_to_c_index &&

src/file/file.h

@@ -12,28 +12,6 @@
 #include "info/info.h"
 #include "mca/io/io.h"
 
-/**
- * Version of IO component interface that we're using.  
- *
- * The IO component is being designed to ensure that it can
- * simultaneously support multiple component versions in a single
- * executable.  This is because ROMIO will always be v1.x that
- * supports pretty much a 1-to-1 MPI-API-to-module-function mapping,
- * but we plan to have a v2.x series that will be "something
- * different" (as yet undefined).
- */
-enum ompi_io_version_t {
-    OMPI_IO_VERSION_NONE,
-    OMPI_IO_VERSION_1_0_0,
-    OMPI_IO_VERSION_2_0_0,
-
-    OMPI_IO_VERSION_MAX
-};
-/**
- * Convenience typedef
- */
-typedef enum ompi_io_version_t ompi_io_version_t;
-
 
 /*
  * Flags
@@ -46,42 +24,47 @@ typedef enum ompi_io_version_t ompi_io_version_t;
  * Back-end structure for MPI_File
  */
 struct ompi_file_t {
+    /** Base of OBJ_* interface */
     ompi_object_t super;
-    /**< Base of OBJ_* interface */
 
+    /** Communicator that this file was created with */
     ompi_communicator_t *f_comm;
-    /**< Communicator that this file was created with */
 
+    /** Filename that this file was created with */
     char *f_filename;
-    /**< Filename that this file was created with */
 
+    /** Amode that this file was created with */
     int f_amode;
-    /**< Amode that this file was created with */
-    
+
+    /** MPI_Info that this file was created with */
+    ompi_info_t *f_info;
+
+    /** Bit flags */
     int32_t f_flags;
-    /**< Bit flags */
 
+    /** Index in Fortran <-> C translation array */
     int f_f_to_c_index;
-    /**< Index in Fortran <-> C translation array */
 
-    ompi_errhandler_t                    *error_handler;
-    ompi_errhandler_type_t                errhandler_type;
-    /**< Error handler.  This field does not have the "f_" prefix so
-         that the OMPI_ERRHDL_* macros can find it, regardless of
-         whether it's a comm, window, or file. */
+    /** Error handler.  This field does not have the "f_" prefix so
+        that the OMPI_ERRHDL_* macros can find it, regardless of
+        whether it's a comm, window, or file. */
+    ompi_errhandler_t *error_handler;
+
+    /** Type of the error handler.  This field does not have the "f_"
+        prefix for the same reason as the field error_handler. */
+    ompi_errhandler_type_t errhandler_type;
     
-    ompi_io_version_t f_io_version;
-    /**< Indicate what version of the IO component we're using (this
-         indicates what member to look at in the union, below) */
+    /** Indicate what version of the IO component we're using (this
+        indicates what member to look at in the union, below) */
+    mca_io_base_version_t f_io_version;
 
-    union {
-        mca_io_base_module_1_0_0_t v1_0_0;
-        /**< IO v1.0.0 module */
-    } f_io_selected_module;
-    /**< The selected module */
+    /** The selected module (note that this is a union) */
+    mca_io_base_modules_t f_io_selected_module;
 
-    struct mca_io_base_file_t *f_selected_data;
-    /**< Allow the selected module to cache data on the file */
+    /** Allow the selected module to cache data on the file */
+    struct mca_io_base_file_t *f_io_selected_data;
+
+    /* JMS: also put io request freelist here */
 };
 /**
  * Convenience typedef
@@ -115,7 +98,8 @@ extern "C" {
     int ompi_file_init(void);
 
     /**
-     * Open a file handle.
+     * Back-end to MPI_FILE_OPEN: create a file handle, select an io
+     * component to use, and have that componet open the file.
      *
      * @param comm Communicator
      * @param filename String filename
@@ -127,7 +111,9 @@ extern "C" {
      * @retval OMPI_ERR* Upon error
      *
      * Create a file handle and select an io module to be paired with
-     * it.
+     * it.  There is a corresponding ompi_file_close() function; it
+     * mainly calls OBJ_RELEASE() but also does some other error
+     * handling as well.
      */
     int ompi_file_open(ompi_communicator_t *comm, char *filename, 
                        int amode, ompi_info_t *info, 
@@ -149,15 +135,18 @@ extern "C" {
      * ompi_file_is_name_set() will return true.
      */
     int ompi_file_set_name(ompi_file_t *file, char *name);
-    
+
     /**
-     * Close a file handle
+     * Back-end to MPI_FILE_CLOSE: destroy an ompi_file_t handle and
+     * close the file.
      *
-     * @param file MPI_File handle to set the name on
+     * @param file Pointer to ompi_file_t
      *
      * @returns OMPI_SUCCESS Always.
      *
-     * Close a file handle and free all resources associated with it.
+     * This is the preferred mechanism for freeing an ompi_file_t.
+     * Although the main action that it performs is OBJ_RELEASE(), it
+     * also does some additional handling for error checking, etc.
      */
     int ompi_file_close(ompi_file_t **file);
 

src/mca/base/mca_base_init_select_components.c

@@ -18,6 +18,7 @@
 #include "mca/pml/pml.h"
 #include "mca/pml/base/base.h"
 #include "mca/mpool/base/base.h"
+#include "mca/io/base/base.h"
 
 
 /*
@@ -69,7 +70,6 @@ int mca_base_init_select_components(int requested,
   allow_multi_user_threads &= user_threads;
   have_hidden_threads |= hidden_threads;
 
-
   if (OMPI_SUCCESS != mca_topo_base_find_available(&user_threads, 
                                                    &hidden_threads)) {
     return OMPI_ERROR;
@@ -77,6 +77,13 @@ int mca_base_init_select_components(int requested,
   allow_multi_user_threads &= user_threads;
   have_hidden_threads |= hidden_threads;
 
+  if (OMPI_SUCCESS != mca_io_base_find_available(&user_threads, 
+                                                 &hidden_threads)) {
+    return OMPI_ERROR;
+  }
+  allow_multi_user_threads &= user_threads;
+  have_hidden_threads |= hidden_threads;
+
   /* Now that we have a final list of all available modules, do the
      selection.  pml is already selected. */
 

src/mca/io/base/Makefile.am

@@ -7,12 +7,17 @@ include $(top_srcdir)/config/Makefile.options
 noinst_LTLIBRARIES = libmca_io_base.la
 
 headers = \
-        base.h
+        base.h \
+        io_base_request.h
 
 libmca_io_base_la_SOURCES = \
-        $(headers) \
-        io_base_close.c \
-        io_base_open.c
+	$(headers) \
+	io_base_close.c \
+        io_base_delete.c \
+	io_base_file_select.c \
+	io_base_find_available.c \
+	io_base_open.c \
+        io_base_request.c
 
 # Conditionally install the header files
 

src/mca/io/base/base.h

@@ -2,24 +2,221 @@
  * $HEADER$
  */
 
-#ifndef OMPI_MCA_IO_BASE_H
-#define OMPI_MCA_IO_BASE_H
+/** 
+ * @file
+ *
+ * MCA io base framework public interface functions.
+ */
+
+#ifndef MCA_IO_BASE_H
+#define MCA_IO_BASE_H
+
+#include "ompi_config.h"
+
+#include "mpi.h"
+#include "class/ompi_list.h"
+#include "mca/io/io.h"
+
+
+/*
+ * Global functions for MCA overall io open and close
+ */
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
     /**
-     * To be filled in soon
+     * Initialize the io MCA framework
+     *
+     * @retval OMPI_SUCCESS Upon success
+     * @retval OMPI_ERROR Upon failure
+     *
+     * This must be the first function invoked in the io MCA
+     * framework.  It initializes the io MCA framework, finds and
+     * opens io components, etc.
+     *
+     * This function is invoked during ompi_mpi_init() and during the
+     * initialization of the special case of the laminfo command.
+     * 
+     * This function fills in the internal global variable
+     * mca_io_base_components_opened, which is a list of all io components
+     * that were successfully opened.  This variable should \em only be
+     * used by other io base functions -- it is not considered a
+     * public interface member -- and is only mentioned here for
+     * completeness.
      */
     int mca_io_base_open(void);
 
     /**
-     * To be filled in soon
+     * Create list of available io components.
+     *
+     * @param allow_multi_user_threads Will be set to true if any of the
+     * available components will allow multiple user threads
+     * @param have_hidden_threads Will be set to true if any of the
+     * available components have hidden threads.
+     *
+     * @retval OMPI_SUCCESS If one or more io components are available.
+     * @retval OMPI_ERROR If no io components are found to be available.
+     *
+     * This function is invoked during ompi_mpi_init() to query all
+     * successfully opened io components and create a list of all
+     * available io components.
+     *
+     * This function traverses the (internal global variable)
+     * mca_io_base_components_opened list and queries each component to see
+     * if it ever might want to run during this MPI process.  It creates
+     * another internal global variable list named
+     * mca_io_base_components_available, consisting of a list of components
+     * that are available for selection when file handles are created.
+     * This variable should \em only be used by other io base
+     * functions -- it is not considered a public interface member --
+     * and is only mentioned here for completeness.
+     */
+    int mca_io_base_find_available(bool *allow_multi_user_threads, 
+                                   bool *have_hidden_threads);
+    
+    /**
+     * Select an available component for a new file handle.
+     *
+     * @param file File Handle that the component will be selected for.
+     * @param preferred The component that is preferred for this
+     * file handle (or NULL).
+     *
+     * @return OMPI_SUCCESS Upon success.
+     * @return OMPI_ERROR Upon failure.
+     *
+     * Note that the types of the parameters have "struct" in them
+     * (e.g., ompi_file_t" vs. a plain "ompi_file_t") to
+     * avoid an include file loop.  All similar types (e.g., "struct
+     * ompi_file_t *", "ompi_file_t *", and "MPI_File")
+     * are all typedef'ed to be the same, so the fact that we use struct
+     * here in the prototype is ok.
+     *
+     * This function is invoked when a new file handle is created and a
+     * io component needs to be selected for it.  It should be invoked
+     * near the end of the file handle creation process such that
+     * almost everything else is functional on the file handle.
+     *
+     * This function invokes the selection process for io components,
+     * which works as follows:
+     *
+     * - If the \em preferred argument is NULL, the selection set is
+     *   defined to be all the components found during
+     *   mca_io_base_find_available().  
+     * - If \em preferred is not NULL, then the selection set is just
+     *   that component.  (However, in this mode, we may make 2 passes
+     *   through the selection process -- more on this below).
+     * - All components in the selection set are queried to see if they
+     *   want to run with that file handle.  All components that want to
+     *   run are ranked by their priority and the highest priority
+     *   component is selected.  All non-selected components have their
+     *   "unquery" function invoked to let them know that they were not
+     *   selected.
+     * - The selected module will have its "init" function
+     *   invoked to let it know that it was selected.  All unselected
+     *   components will have their file_unselect function invoked.
+     * - If we fall through this entire process and no component is
+     *   selected \em and the \em preferred argument is not NULL, then
+     *   run the entire process again as if the \em preferred argument
+     *   was NULL (i.e., use the entire available set of components).
+     *
+     * At the end of this process, we'll either have a single
+     * component/module pair that is selected and initialized for the
+     * file handle, or no component was selected and an error is
+     * returned up the stack.
+     */
+    int mca_io_base_file_select(struct ompi_file_t *file,
+                                struct mca_base_component_t *preferred);
+
+    /**
+     * Finalize a io component on a specific file handle.
+     *
+     * @param file The file handle that is being destroyed.
+     *
+     * @retval OMPI_SUCCESS Always.
+     *
+     * Note that the type of the parameter is only a "struct
+     * ompi_file_t" (vs. a plain "ompi_file_t") to avoid an include file
+     * loop.  The types "struct ompi_file_t *", "ompi_file_t *", and
+     * "MPI_File" are all typedef'ed to be the same, so the fact that we
+     * use struct here in the prototype is ok.
+     *
+     * This function is invoked near the beginning of the destruction of
+     * a file handle.  It finalizes the io component associated with the
+     * file handle (e.g., allowing the component to clean up and free any
+     * resources allocated for that file handle).  Note that similar to
+     * mca_io_base_select(), as result of this function, other
+     * file handles may also be destroyed.
+     */
+    int mca_io_base_file_unselect(struct ompi_file_t *file);
+
+    /**
+     * Invoke a back-end component to delete a file.
+     *
+     * @param filename Name of the file to be deleted
+     * @param info MPI_Info for additional information
+     *
+     * This function is a bit different than most other MPI_File_*
+     * functions -- it does not take a MPI_File handle.  As such, this
+     * function function invokes appropriate delete handlers on all
+     * the available components (rather than some pre-selected
+     * module).  See io.h for details.
+     */
+    int mca_io_base_delete(char *filename, struct ompi_info_t *info);
+
+    /**
+     * Shut down the io MCA framework.
+     *
+     * @retval OMPI_SUCCESS Always
+     *
+     * This function shuts down everything in the io MCA framework,
+     * and is called during ompi_mpi_finalize() and the special case of
+     * the laminfo fileand.
+     *
+     * It must be the last function invoked on the io MCA framework.
      */
     int mca_io_base_close(void);
-
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif
 
-#endif /* OMPI_MCA_IO_BASE_H */
+
+/*
+ * Globals
+ */
+
+/**
+ * Index number from the "io" MCA parameter, created when the io
+ * framework is initialized and used during scope selection.
+ */
+extern int mca_io_base_param;
+/**
+ * io framework debugging stream ID used with ompi_output() and
+ * ompi_output_verbose().
+ */
+extern int mca_io_base_output;
+
+/**
+ * Indicator as to whether the list of opened io components is valid or
+ * not.
+ */
+extern bool mca_io_base_components_opened_valid;
+/**
+ * List of all opened components; created when the io framework is
+ * initialized and destroyed when we reduce the list to all available
+ * io components.
+ */
+extern ompi_list_t mca_io_base_components_opened;
+/**
+ * Indicator as to whether the list of available io components is valid
+ * or not.
+ */
+extern bool mca_io_base_components_available_valid;
+/**
+ * List of all available components; created by reducing the list of open
+ * components to all those who indicate that they may run during this
+ * process.
+ */
+extern ompi_list_t mca_io_base_components_available;
+
+#endif /* MCA_BASE_IO_H */

src/mca/io/base/io_base_close.c

@@ -4,12 +4,34 @@
 
 #include "ompi_config.h"
 
+#include <stdio.h>
+
 #include "include/constants.h"
+#include "mca/mca.h"
+#include "mca/base/base.h"
+#include "mca/io/io.h"
 #include "mca/io/base/base.h"
 
 
 int mca_io_base_close(void)
 {
-    /* JMS More coming here soon */
+    /* Close all components that are still open.  This may be the opened
+     list (if we're in ompi_info), or it may be the available list (if
+     we're anywhere else). */
+
+    if (mca_io_base_components_opened_valid) {
+        mca_base_components_close(mca_io_base_output,
+                                  &mca_io_base_components_opened, NULL);
+        OBJ_DESTRUCT(&mca_io_base_components_opened);
+        mca_io_base_components_opened_valid = false;
+    } else if (mca_io_base_components_available_valid) {
+        mca_base_components_close(mca_io_base_output,
+                                  &mca_io_base_components_available, NULL);
+        OBJ_DESTRUCT(&mca_io_base_components_available);
+        mca_io_base_components_available_valid = false;
+    }
+
+    /* All done */
+
     return OMPI_SUCCESS;
 }

src/mca/io/base/io_base_delete.c

@@ -0,0 +1,394 @@
+/*
+ * $HEADER$
+ */
+
+#include "ompi_config.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "mpi.h"
+#include "file/file.h"
+#include "util/argv.h"
+#include "class/ompi_list.h"
+#include "class/ompi_object.h"
+#include "mca/mca.h"
+#include "mca/base/base.h"
+#include "mca/io/io.h"
+#include "mca/io/base/base.h"
+
+
+/*
+ * Local types
+ */
+struct avail_io_t {
+    ompi_list_item_t super;
+
+    mca_io_base_version_t ai_version;
+
+    int ai_priority;
+    mca_io_base_components_t ai_component;
+    struct mca_io_base_delete_t *ai_private_data;
+};
+typedef struct avail_io_t avail_io_t;
+
+/*
+ * Local functions
+ */
+static ompi_list_t *check_components(ompi_list_t *components, 
+                                     char *filename, ompi_info_t *info,
+                                     char **names, int num_names);
+static avail_io_t *check_one_component(const mca_base_component_t *component,
+                                       char *filename, ompi_info_t *info);
+
+static avail_io_t *query(const mca_base_component_t *component,
+                         char *filename, ompi_info_t *info);
+static avail_io_t *query_1_0_0(const mca_io_base_component_1_0_0_t *io_component, 
+                               char *filename, ompi_info_t *info);
+
+static void unquery(avail_io_t *avail, char *filename, ompi_info_t *info);
+
+static int delete_file(avail_io_t *avail, char *filename, ompi_info_t *info);
+
+
+/*
+ * Stuff for the OBJ interface
+ */
+static OBJ_CLASS_INSTANCE(avail_io_t, ompi_list_item_t, NULL, NULL);
+
+
+/*
+ */
+int mca_io_base_delete(char *filename, ompi_info_t *info)
+{
+    int err, num_names;
+    char *names, **name_array;
+    ompi_list_t *selectable;
+    ompi_list_item_t *item;
+    avail_io_t *avail, selected;
+
+    /* Announce */
+
+    ompi_output_verbose(10, mca_io_base_output,
+                        "io:base:delete: deleting file: %s", 
+                        filename);
+  
+    /* See if a set of component was requested by the MCA parameter.
+       Don't check for error. */
+
+    names = NULL;
+    mca_base_param_lookup_string(mca_io_base_param, &names);
+
+    /* Compute the intersection of all of my available components with
+       the components from all the other processes in this file */
+
+    /* JMS CONTINUE HERE */
+
+    /* See if there were any listed in the MCA parameter; parse them
+       and check them all */
+
+    err = OMPI_ERROR;
+    if (NULL != names && 0 < strlen(names)) {
+        name_array = ompi_argv_split(names, ',');
+        num_names = ompi_argv_count(name_array);
+        
+        ompi_output_verbose(10, mca_io_base_output, 
+                            "io:base:delete: Checking specific modules: %s",
+                            names);
+        selectable = check_components(&mca_io_base_components_available, 
+                                      filename, info, name_array, num_names);
+        ompi_argv_free(name_array);
+    }
+
+    /* Nope -- a specific [set of] component[s] was not requested.  Go
+       check them all. */
+  
+    else {
+        ompi_output_verbose(10, mca_io_base_output, 
+                            "io:base:delete: Checking all available modules");
+        selectable = check_components(&mca_io_base_components_available, 
+                                      filename, info, NULL, 0);
+    }
+
+    /* Upon return from the above, the modules list will contain the
+       list of modules that returned (priority >= 0).  If we have no
+       io modules available, it's an error */
+
+    if (NULL == selectable) {
+        /* There's no modules available.  Doh! */
+        /* show_help */
+        return OMPI_ERROR;
+    }
+
+    /* Do some kind of collective operation to find a module that
+       everyone has available */
+
+#if 1
+    /* For the moment, just take the top module off the list */
+
+    item = ompi_list_remove_first(selectable);
+    avail = (avail_io_t *) item;
+    selected = *avail;
+    OBJ_RELEASE(avail);
+#else
+    /* JMS CONTINUE HERE */
+#endif
+
+    /* Everything left in the selectable list is therefore unwanted,
+       and we call their unquery() method (because they all had
+       query() invoked, but will never have init() invoked in this
+       scope). */
+
+    for (item = ompi_list_remove_first(selectable); item != NULL;
+         item = ompi_list_remove_first(selectable)) {
+        avail = (avail_io_t *) item;
+        unquery(avail, filename, info);
+        OBJ_RELEASE(item);
+    }
+    OBJ_RELEASE(selectable);
+
+    /* Finally -- delete the file with the selected component */
+        
+    if (OMPI_SUCCESS != (err = delete_file(&selected, filename, info))) {
+        return err;
+    }
+    
+    /* Announce the winner */
+  
+    ompi_output_verbose(10, mca_io_base_output,
+                        "io:base:delete: Selected io component %s", 
+                        selected.ai_component.v1_0_0.io_version.mca_component_name);
+  
+    return OMPI_SUCCESS;
+}
+
+
+/*
+ * For each module in the list, if it is in the list of names (or the
+ * list of names is NULL), then check and see if it wants to run, and
+ * do the resulting priority comparison.  Make a list of components to
+ * be only those who returned that they want to run, and put them in
+ * priority order.
+ */
+static ompi_list_t *check_components(ompi_list_t *components, 
+                                     char *filename, ompi_info_t *info,
+                                     char **names, int num_names)
+{
+    int i;
+    const mca_base_component_t *component;
+    ompi_list_item_t *item, *item2;
+    bool want_to_check;
+    ompi_list_t *selectable;
+    avail_io_t *avail, *avail2;
+
+    /* Make a list of the components that query successfully */
+
+    selectable = OBJ_NEW(ompi_list_t);
+
+    /* Scan through the list of components.  This nested loop is
+       O(N^2), but we should never have too many components and/or
+       names, so this *hopefully* shouldn't matter... */
+  
+    for (item = ompi_list_get_first(components); 
+         item != ompi_list_get_end(components); 
+         item = ompi_list_get_next(item)) {
+        component = ((mca_base_component_priority_list_item_t *) 
+                     item)->cpli_component;
+
+        /* If we have a list of names, scan through it */
+
+        if (0 == num_names) {
+            want_to_check = true;
+        } else {
+            want_to_check = false;
+            for (i = 0; i < num_names; ++i) {
+                if (0 == strcmp(names[i], component->mca_component_name)) {
+                    want_to_check = true;
+                }
+            }
+        }
+
+        /* If we determined that we want to check this component, then
+           do so */
+
+        if (want_to_check) {
+            avail = check_one_component(component, filename, info);
+            if (NULL != avail) {
+
+                /* Put this item on the list in priority order
+                   (highest priority first).  Should it go first? */
+
+                item2 = ompi_list_get_first(selectable); 
+                avail2 = (avail_io_t *) item2;
+                if (ompi_list_get_end(selectable) == item2 ||
+                    avail->ai_priority > avail2->ai_priority) {
+                    ompi_list_prepend(selectable, (ompi_list_item_t*) avail);
+                } else {
+                    for (i = 1; item2 != ompi_list_get_end(selectable); 
+                         item2 = ompi_list_get_next(selectable), ++i) {
+                        avail2 = (avail_io_t *) item2;
+                        if (avail->ai_priority > avail2->ai_priority) {
+                            ompi_list_insert(selectable,
+                                             (ompi_list_item_t *) avail, i);
+                            break;
+                        }
+                    }
+
+                    /* If we didn't find a place to put it in the
+                       list, then append it (because it has the lowest
+                       priority found so far) */
+
+                    if (ompi_list_get_end(selectable) == item2) {
+                        ompi_list_append(selectable, 
+                                         (ompi_list_item_t *) avail);
+                    }
+                }
+            }
+        }
+    }
+    
+    /* If we didn't find any available components, return an error */
+    
+    if (0 == ompi_list_get_size(selectable)) {
+        OBJ_RELEASE(selectable);
+        return NULL;
+    }
+
+    /* All done */
+
+    return selectable;
+}
+
+
+/*
+ * Check a single component
+ */
+static avail_io_t *check_one_component(const mca_base_component_t *component,
+                                       char *filename, ompi_info_t *info)
+{
+    avail_io_t *avail;
+
+    avail = query(component, filename, info);
+    if (NULL != avail) {
+        avail->ai_priority = (avail->ai_priority < 100) ? 
+            avail->ai_priority : 100;
+        avail->ai_priority = (avail->ai_priority < 0) ?
+            0 : avail->ai_priority;
+        ompi_output_verbose(10, mca_io_base_output, 
+                            "io:base:delete: component available: %s, priority: %d", 
+                            component->mca_component_name, 
+                            avail->ai_priority);
+    } else {
+        ompi_output_verbose(10, mca_io_base_output, 
+                            "io:base:delete: component not available: %s",
+                            component->mca_component_name);
+    }
+    
+    return avail;
+}
+
+
+/**************************************************************************
+ * Query functions
+ **************************************************************************/
+
+/*
+ * Take any version of a io module, query it, and return the right
+ * module struct
+ */
+static avail_io_t *query(const mca_base_component_t *component, 
+                         char *filename, ompi_info_t *info)
+{
+    const mca_io_base_component_1_0_0_t *ioc_100;
+
+    /* io v1.0.0 */
+
+    if (1 == component->mca_major_version &&
+        0 == component->mca_minor_version &&
+        0 == component->mca_release_version) {
+        ioc_100 = (mca_io_base_component_1_0_0_t *) component;
+        
+        return query_1_0_0(ioc_100, filename, info);
+    }
+
+    /* Unknown io API version -- return error */
+
+    return NULL;
+}
+
+
+static avail_io_t *query_1_0_0(const mca_io_base_component_1_0_0_t *component,
+                               char *filename, ompi_info_t *info)
+{
+    bool usable;
+    int priority, ret;
+    avail_io_t *avail;
+    struct mca_io_base_delete_t *private_data;
+
+    /* Query v1.0.0 */
+
+    avail = NULL;
+    private_data = NULL;
+    usable = false;
+    ret = component->io_delete_query(filename, info, &private_data, &usable, 
+                                     &priority);
+    if (OMPI_SUCCESS == ret && usable) {
+        avail = OBJ_NEW(avail_io_t);
+        avail->ai_version = MCA_IO_BASE_V_1_0_0;
+        avail->ai_priority = priority;
+        avail->ai_component.v1_0_0 = *component;
+        avail->ai_private_data = private_data;
+    }
+
+    return avail;
+}
+
+
+/**************************************************************************
+ * Unquery functions
+ **************************************************************************/
+
+static void unquery(avail_io_t *avail, char *filename, ompi_info_t *info)
+{
+    const mca_io_base_component_1_0_0_t *ioc_100;
+
+    switch(avail->ai_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        ioc_100 = &(avail->ai_component.v1_0_0);
+        if (NULL != ioc_100->io_delete_unquery) {
+            ioc_100->io_delete_unquery(filename, info, avail->ai_private_data);
+        }
+        break;
+
+    default:
+        break;
+    }
+}
+
+
+/**************************************************************************
+ * File delete functions
+ **************************************************************************/
+
+/*
+ * Invoke the component's delete function
+ */
+static int delete_file(avail_io_t *avail, char *filename, ompi_info_t *info)
+{
+    const mca_io_base_component_1_0_0_t *ioc_100;
+
+    switch(avail->ai_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        ioc_100 = &(avail->ai_component.v1_0_0);
+        return ioc_100->io_delete_select(filename, info,
+                                         avail->ai_private_data);
+        break;
+
+    default:
+        return OMPI_ERROR;
+        break;
+    }
+
+    /* No way to reach here */
+}

src/mca/io/base/io_base_file_select.c

@@ -0,0 +1,435 @@
+/*
+ * $HEADER$
+ */
+
+#include "ompi_config.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "mpi.h"
+#include "file/file.h"
+#include "util/argv.h"
+#include "class/ompi_list.h"
+#include "class/ompi_object.h"
+#include "mca/mca.h"
+#include "mca/base/base.h"
+#include "mca/io/io.h"
+#include "mca/io/base/base.h"
+
+
+/*
+ * Local types
+ */
+struct avail_io_t {
+    ompi_list_item_t super;
+
+    mca_io_base_version_t ai_version;
+
+    int ai_priority;
+    mca_io_base_components_t ai_component;
+    mca_io_base_modules_t ai_module;
+    struct mca_io_base_file_t *ai_module_data;
+};
+typedef struct avail_io_t avail_io_t;
+
+/*
+ * Local functions
+ */
+static ompi_list_t *check_components(ompi_list_t *components, 
+                                     ompi_file_t *file, 
+                                     char **names, int num_names);
+static avail_io_t *check_one_component(ompi_file_t *file, 
+                                       const mca_base_component_t *component);
+
+static avail_io_t *query(const mca_base_component_t *component, 
+                         ompi_file_t *file);
+static avail_io_t *query_1_0_0(const mca_io_base_component_1_0_0_t *io_component, 
+                               ompi_file_t *file);
+
+static void unquery(avail_io_t *avail, ompi_file_t *file);
+
+static int module_init(ompi_file_t *file);
+
+
+/*
+ * Stuff for the OBJ interface
+ */
+static OBJ_CLASS_INSTANCE(avail_io_t, ompi_list_item_t, NULL, NULL);
+
+
+/*
+ * This function is called at the initialization time of every
+ * file.  It is used to select which io component will be
+ * active for a given file.
+ */
+int mca_io_base_file_select(ompi_file_t *file, 
+                            mca_base_component_t *preferred)
+{
+    int err, num_names;
+    char *names, **name_array;
+    char *str;
+    ompi_list_t *selectable;
+    ompi_list_item_t *item;
+    avail_io_t *avail, selected;
+
+    /* Announce */
+
+    ompi_output_verbose(10, mca_io_base_output,
+                        "io:base:file_select: new file: %s", 
+                        file->f_filename);
+  
+    /* Initialize all the relevant pointers, since they're used as
+       sentinel values */
+
+    file->f_io_version = MCA_IO_BASE_V_NONE;
+    file->f_io_selected_data = NULL;
+  
+    /* See if a set of component was requested by the MCA parameter.
+       Don't check for error. */
+
+    names = NULL;
+    mca_base_param_lookup_string(mca_io_base_param, &names);
+
+    /* Compute the intersection of all of my available components with
+       the components from all the other processes in this file */
+
+    /* JMS CONTINUE HERE */
+
+    /* See if a preferred component was provided.  If so, try to
+       select it.  If we don't succeed, fall through and do a normal
+       selection. */
+
+    err = OMPI_ERROR;
+    if (NULL != preferred) {
+        str = &(preferred->mca_component_name[0]);
+
+        ompi_output_verbose(10, mca_io_base_output, 
+                            "io:base:file_select: Checking preferred module: %s",
+                            str);
+        selectable = check_components(&mca_io_base_components_available, 
+                                      file, &str, 1);
+    
+        /* If we didn't get a preferred module, then call again
+           without a preferred module.  This makes the logic below
+           dramatically simpler. */
+    
+        if (NULL == selectable) {
+            return mca_io_base_file_select(file, NULL);
+        }
+
+        /* We only fall through here if we were able to select one of
+           the preferred modules */
+    }
+
+    /* If there was no preferred module, then see if there were any
+       listed in the MCA parameter; parse them and check them all */
+
+    else if (NULL != names && 0 < strlen(names)) {
+        name_array = ompi_argv_split(names, ',');
+        num_names = ompi_argv_count(name_array);
+        
+        ompi_output_verbose(10, mca_io_base_output, 
+                            "io:base:file_select: Checking specific modules: %s",
+                            names);
+        selectable = check_components(&mca_io_base_components_available, 
+                                      file, name_array, num_names);
+        ompi_argv_free(name_array);
+    }
+
+    /* Nope -- a specific [set of] component[s] was not requested.  Go
+       check them all. */
+  
+    else {
+        ompi_output_verbose(10, mca_io_base_output, 
+                            "io:base:file_select: Checking all available modules");
+        selectable = check_components(&mca_io_base_components_available, 
+                                      file, NULL, 0);
+    }
+
+    /* Upon return from the above, the modules list will contain the
+       list of modules that returned (priority >= 0).  If we have no
+       io modules available, it's an error */
+
+    if (NULL == selectable) {
+        /* There's no modules available.  Doh! */
+        /* show_help */
+        return OMPI_ERROR;
+    }
+
+    /* Do some kind of collective operation to find a module that
+       everyone has available */
+
+#if 1
+    /* For the moment, just take the top module off the list */
+
+    item = ompi_list_remove_first(selectable);
+    avail = (avail_io_t *) item;
+    selected = *avail;
+    OBJ_RELEASE(avail);
+#else
+    /* JMS CONTINUE HERE */
+#endif
+
+    /* Everything left in the selectable list is therefore unwanted,
+       and we call their unquery() method (because they all had
+       query() invoked, but will never have init() invoked in this
+       scope). */
+
+    for (item = ompi_list_remove_first(selectable); item != NULL;
+         item = ompi_list_remove_first(selectable)) {
+        avail = (avail_io_t *) item;
+        unquery(avail, file);
+        OBJ_RELEASE(item);
+    }
+    OBJ_RELEASE(selectable);
+
+    /* Save the pointers of the selected module on the ompi_file_t */
+
+    file->f_io_version = selected.ai_version;
+    file->f_io_selected_module = selected.ai_module;
+    file->f_io_selected_data = selected.ai_module_data;
+
+    /* Finally -- intialize the selected module. */
+        
+    if (OMPI_SUCCESS != (err = module_init(file))) {
+        return err;
+    }
+    
+    /* Announce the winner */
+  
+    ompi_output_verbose(10, mca_io_base_output,
+                        "io:base:file_select: Selected io module %s", 
+                        selected.ai_component.v1_0_0.io_version.mca_component_name);
+  
+    return OMPI_SUCCESS;
+}
+
+
+/*
+ * For each module in the list, if it is in the list of names (or the
+ * list of names is NULL), then check and see if it wants to run, and
+ * do the resulting priority comparison.  Make a list of modules to be
+ * only those who returned that they want to run, and put them in
+ * priority order.
+ */
+static ompi_list_t *check_components(ompi_list_t *components, 
+                                     ompi_file_t *file, 
+                                     char **names, int num_names)
+{
+    int i;
+    const mca_base_component_t *component;
+    ompi_list_item_t *item, *item2;
+    bool want_to_check;
+    ompi_list_t *selectable;
+    avail_io_t *avail, *avail2;
+
+    /* Make a list of the components that query successfully */
+
+    selectable = OBJ_NEW(ompi_list_t);
+
+    /* Scan through the list of components.  This nested loop is
+       O(N^2), but we should never have too many components and/or
+       names, so this *hopefully* shouldn't matter... */
+  
+    for (item = ompi_list_get_first(components); 
+         item != ompi_list_get_end(components); 
+         item = ompi_list_get_next(item)) {
+        component = ((mca_base_component_priority_list_item_t *) 
+                     item)->cpli_component;
+
+        /* If we have a list of names, scan through it */
+
+        if (0 == num_names) {
+            want_to_check = true;
+        } else {
+            want_to_check = false;
+            for (i = 0; i < num_names; ++i) {
+                if (0 == strcmp(names[i], component->mca_component_name)) {
+                    want_to_check = true;
+                }
+            }
+        }
+
+        /* If we determined that we want to check this component, then
+           do so */
+
+        if (want_to_check) {
+            avail = check_one_component(file, component);
+            if (NULL != avail) {
+
+                /* Put this item on the list in priority order
+                   (highest priority first).  Should it go first? */
+
+                item2 = ompi_list_get_first(selectable); 
+                avail2 = (avail_io_t *) item2;
+                if (ompi_list_get_end(selectable) == item2 ||
+                    avail->ai_priority > avail2->ai_priority) {
+                    ompi_list_prepend(selectable, (ompi_list_item_t*) avail);
+                } else {
+                    for (i = 1; item2 != ompi_list_get_end(selectable); 
+                         item2 = ompi_list_get_next(selectable), ++i) {
+                        avail2 = (avail_io_t *) item2;
+                        if (avail->ai_priority > avail2->ai_priority) {
+                            ompi_list_insert(selectable,
+                                             (ompi_list_item_t *) avail, i);
+                            break;
+                        }
+                    }
+
+                    /* If we didn't find a place to put it in the
+                       list, then append it (because it has the lowest
+                       priority found so far) */
+
+                    if (ompi_list_get_end(selectable) == item2) {
+                        ompi_list_append(selectable, 
+                                         (ompi_list_item_t *) avail);
+                    }
+                }
+            }
+        }
+    }
+    
+    /* If we didn't find any available components, return an error */
+    
+    if (0 == ompi_list_get_size(selectable)) {
+        OBJ_RELEASE(selectable);
+        return NULL;
+    }
+
+    /* All done */
+
+    return selectable;
+}
+
+
+/*
+ * Check a single component
+ */
+static avail_io_t *check_one_component(ompi_file_t *file, 
+                                       const mca_base_component_t *component)
+{
+    avail_io_t *avail;
+
+    avail = query(component, file);
+    if (NULL != avail) {
+        avail->ai_priority = (avail->ai_priority < 100) ? 
+            avail->ai_priority : 100;
+        avail->ai_priority = (avail->ai_priority < 0) ?
+            0 : avail->ai_priority;
+        ompi_output_verbose(10, mca_io_base_output, 
+                            "io:base:file_select: component available: %s, priority: %d", 
+                            component->mca_component_name, 
+                            avail->ai_priority);
+    } else {
+        ompi_output_verbose(10, mca_io_base_output, 
+                            "io:base:file_select: component not available: %s",
+                            component->mca_component_name);
+    }
+    
+    return avail;
+}
+
+
+/**************************************************************************
+ * Query functions
+ **************************************************************************/
+
+/*
+ * Take any version of a io module, query it, and return the right
+ * module struct
+ */
+static avail_io_t *query(const mca_base_component_t *component, 
+                         ompi_file_t *file)
+{
+    const mca_io_base_component_1_0_0_t *ioc_100;
+
+    /* io v1.0.0 */
+
+    if (1 == component->mca_major_version &&
+        0 == component->mca_minor_version &&
+        0 == component->mca_release_version) {
+        ioc_100 = (mca_io_base_component_1_0_0_t *) component;
+        
+        return query_1_0_0(ioc_100, file);
+    }
+
+    /* Unknown io API version -- return error */
+
+    return NULL;
+}
+
+
+static avail_io_t *query_1_0_0(const mca_io_base_component_1_0_0_t *component,
+                               ompi_file_t *file)
+{
+    int priority;
+    avail_io_t *avail;
+    const mca_io_base_module_1_0_0_t *module;
+    struct mca_io_base_file_t *module_data;
+
+    /* Query v1.0.0 */
+
+    avail = NULL;
+    module_data = NULL;
+    module = component->io_file_query(file, &module_data, &priority);
+    if (NULL != module) {
+        avail = OBJ_NEW(avail_io_t);
+        avail->ai_version = MCA_IO_BASE_V_1_0_0;
+        avail->ai_priority = priority;
+        avail->ai_component.v1_0_0 = *component;
+        avail->ai_module.v1_0_0 = *module;
+        avail->ai_module_data = module_data;
+    }
+
+    return avail;
+}
+
+
+/**************************************************************************
+ * Unquery functions
+ **************************************************************************/
+
+static void unquery(avail_io_t *avail, ompi_file_t *file)
+{
+    const mca_io_base_component_1_0_0_t *ioc_100;
+
+    switch(avail->ai_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        ioc_100 = &(avail->ai_component.v1_0_0);
+        ioc_100->io_file_unquery(file, avail->ai_module_data);
+        break;
+
+    default:
+        break;
+    }
+}
+
+
+/**************************************************************************
+ * Module_Init functions
+ **************************************************************************/
+
+/*
+ * Initialize a module
+ */
+static int module_init(ompi_file_t *file)
+{
+    const mca_io_base_module_1_0_0_t *iom_100;
+
+    switch(file->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        iom_100 = &(file->f_io_selected_module.v1_0_0);
+        return iom_100->io_module_file_open(file->f_comm, file->f_filename,
+                                            file->f_amode, file->f_info,
+                                            file);
+        break;
+
+    default:
+        return OMPI_ERROR;
+        break;
+    }
+
+    /* No way to reach here */
+}

src/mca/io/base/io_base_find_available.c

@@ -0,0 +1,195 @@
+/*
+ * $HEADER$
+ */
+
+#include "ompi_config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "mpi.h"
+#include "include/constants.h"
+#include "class/ompi_list.h"
+#include "util/output.h"
+#include "mca/mca.h"
+#include "mca/base/base.h"
+#include "mca/io/io.h"
+#include "mca/io/base/base.h"
+
+
+/*
+ * Global variables
+ */
+bool mca_io_base_components_available_valid = false;
+ompi_list_t mca_io_base_components_available;
+const mca_io_base_component_1_0_0_t *mca_io_base_basic_component = NULL;
+
+
+/*
+ * Private functions
+ */
+static int init_query(const mca_base_component_t *ls, 
+                      mca_base_component_priority_list_item_t *entry);
+static int init_query_1_0_0(const mca_base_component_t *ls, 
+                            mca_base_component_priority_list_item_t *entry);
+
+/*
+ * Scan down the list of successfully opened components and query each of
+ * them (the opened list will be one or more components.  If the user
+ * requested a specific component, it will be the only component in the
+ * opened list).  Create and populate the available list of all
+ * components who indicate that they want to be considered for selection.
+ * Close all components who do not want to be considered for selection,
+ * and destroy the opened list.
+ *
+ * Also find the basic component while we're doing all of this, and save
+ * it in a global variable so that we can find it easily later (e.g.,
+ * during scope selection).
+ */
+int mca_io_base_find_available(bool *allow_multi_user_threads,
+                               bool *have_hidden_threads)
+{
+    bool found = false;
+    mca_base_component_priority_list_item_t *entry;
+    ompi_list_item_t *p;
+    const mca_base_component_t *component;
+
+    /* Initialize the list */
+
+    OBJ_CONSTRUCT(&mca_io_base_components_available, ompi_list_t);
+    mca_io_base_components_available_valid = true;
+
+    /* The list of components that we should check has already been
+       established in mca_io_base_open. */
+  
+    for (found = false, 
+             p = ompi_list_remove_first(&mca_io_base_components_opened);
+         p != NULL;
+         p = ompi_list_remove_first(&mca_io_base_components_opened)) {
+        component = ((mca_base_component_list_item_t *) p)->cli_component;
+        
+        /* Call a subroutine to do the work, because the component may
+           represent different versions of the io MCA. */
+    
+        entry = OBJ_NEW(mca_base_component_priority_list_item_t);
+        entry->cpli_component = component;
+        entry->cpli_priority = 0;
+        if (OMPI_SUCCESS == init_query(component, entry)) {
+      
+            /* Save the results in the list.  The priority isn't
+               relevant, because selection is decided at
+               communicator-constructor time.  But we save the thread
+               arguments (set in the init_query() function) so that
+               the initial selection algorithm can negotiate the
+               overall thread level for this process. */
+      
+            ompi_list_append(&mca_io_base_components_available, 
+                             (ompi_list_item_t *) entry);
+
+            /* We found something :-) */
+
+            found = true;
+        } else {
+      
+            /* If the component doesn't want to run, then close it.
+               It's already had its close() method invoked; now close
+               it out of the DSO repository (if it's there). */
+      
+            mca_base_component_repository_release(component);
+            OBJ_RELEASE(entry);
+        }
+
+        /* Free the entry from the "opened" list */
+
+        OBJ_RELEASE(p);
+    }
+
+    /* The opened list is now no longer useful and we can free it */
+    
+    OBJ_DESTRUCT(&mca_io_base_components_opened);
+    mca_io_base_components_opened_valid = false;
+
+    /* If we have no io components available, it's an error.  Thanks
+       for playing! */
+    
+    if (!found) {
+        OBJ_DESTRUCT(&mca_io_base_components_available);
+        mca_io_base_components_available_valid = false;
+        ompi_output_verbose(10, mca_io_base_output,
+                            "io:find_available: no io components available!");
+        /* JMS show_help */
+        return OMPI_ERROR;
+    }
+
+    /* All done */
+
+    return OMPI_SUCCESS;
+}
+
+
+/*
+ * Query a component, see if it wants to run at all.  If it does, save
+ * some information.  If it doesn't, close it.
+ */
+static int init_query(const mca_base_component_t *m, 
+                      mca_base_component_priority_list_item_t *entry)
+{
+    int ret;
+
+    ompi_output_verbose(10, mca_io_base_output,
+                        "io:find_available: querying io component %s", 
+                        m->mca_component_name);
+
+    /* This component has already been successfully opened.  So now
+       query it. */
+
+    if (1 == m->mca_type_major_version &&
+        0 == m->mca_type_minor_version &&
+        0 == m->mca_type_release_version) {
+        ret = init_query_1_0_0(m, entry);
+    } else {
+        /* Unrecognized io API version */
+
+        ompi_output_verbose(10, mca_io_base_output,
+                            "io:find_available: unrecognized io API version (%d.%d.%d)", 
+                            m->mca_type_major_version,
+                            m->mca_type_minor_version,
+                            m->mca_type_release_version);
+        /* JMS show_help */
+        return OMPI_ERROR;
+    }
+
+    /* Query done -- look at the return value to see what happened */
+
+    if (OMPI_SUCCESS != ret) {
+        ompi_output_verbose(10, mca_io_base_output, 
+                            "io:find_available: io component %s is not available", 
+                            m->mca_component_name);
+        if (NULL != m->mca_close_component) {
+            m->mca_close_component();
+        }
+    } else {
+        ompi_output_verbose(10, mca_io_base_output, 
+                            "io:find_available: io component %s is available", 
+                            m->mca_component_name);
+    }
+
+    /* All done */
+
+    return ret;
+}
+
+
+/*
+ * Query a specific component, io v1.0.0
+ */
+static int 
+init_query_1_0_0(const mca_base_component_t *component, 
+                 mca_base_component_priority_list_item_t *entry)
+{
+    mca_io_base_component_1_0_0_t *io = 
+	(mca_io_base_component_1_0_0_t *) component;
+
+    return io->io_init_query(&(entry->cpli_allow_multi_user_threads), 
+                             &(entry->cpli_have_hidden_threads));
+}

src/mca/io/base/io_base_open.c

@@ -4,12 +4,61 @@
 
 #include "ompi_config.h"
 
-#include "include/constants.h"
+#include <stdio.h>
+
+#include "util/output.h"
+#include "mca/mca.h"
+#include "mca/base/base.h"
+#include "mca/base/mca_base_param.h"
+#include "mca/io/io.h"
 #include "mca/io/base/base.h"
 
 
+/*
+ * The following file was created by configure.  It contains extern
+ * statements and the definition of an array of pointers to each
+ * component's public mca_base_component_t struct.
+ */
+
+#include "mca/io/base/static-components.h"
+
+
+/*
+ * Global variables; most of which are loaded by back-ends of MCA
+ * variables
+ */
+int mca_io_base_param = -1;
+int mca_io_base_output = -1;
+
+bool mca_io_base_components_opened_valid = false;
+ompi_list_t mca_io_base_components_opened;
+
+
+/*
+ * Function for finding and opening either all MCA components, or the one
+ * that was specifically requested via a MCA parameter.
+ */
 int mca_io_base_open(void)
 {
-    /* JMS More coming here soon */
+    /* Open an output stream for this framework */
+
+    mca_io_base_output = ompi_output_open(NULL);
+
+    /* Open up all available components */
+
+    if (OMPI_SUCCESS != 
+        mca_base_components_open("io", mca_io_base_output,
+                                 mca_io_base_static_components, 
+                                 &mca_io_base_components_opened)) {
+        return OMPI_ERROR;
+    }
+    mca_io_base_components_opened_valid = true;
+
+    /* Find the index of the MCA "io" param for selection */
+    
+    mca_io_base_param = mca_base_param_find("io", "base", NULL);
+    
+    /* All done */
+    
     return OMPI_SUCCESS;
 }

src/mca/io/base/io_base_request.c

@@ -0,0 +1,101 @@
+/*
+ * $HEADER$
+ */
+
+#include "ompi_config.h"
+
+#include "class/ompi_object.h"
+#include "file/file.h"
+#include "mca/io/base/io_base_request.h"
+
+
+/*
+ * Private functions
+ */
+static void io_base_request_constructor(mca_io_base_request_t *req);
+
+
+OBJ_CLASS_INSTANCE(mca_io_base_request_t,
+                   ompi_request_t,
+                   io_base_request_constructor,
+                   NULL);
+
+
+static void io_base_request_constructor(mca_io_base_request_t *req)
+{
+    req->req_ompi.req_type = OMPI_REQUEST_IO;
+}
+
+
+/*
+ * Return a module-specific IO MPI_Request
+ */
+int mca_io_base_request_alloc(ompi_file_t *file, 
+                              mca_io_base_request_t **req)
+{
+    int err;
+    size_t extra;
+    mca_io_base_module_request_init_fn_t func;
+
+    /* JMS For the moment, no freelisting */
+
+    switch (file->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        extra = file->f_io_selected_module.v1_0_0.io_module_cache_bytes;
+        func = file->f_io_selected_module.v1_0_0.io_module_request_init;
+        break;
+
+    default:
+        extra = 0;
+        func = NULL;
+        break;
+    }
+
+    /* Malloc out enough space */
+
+    *req = malloc(sizeof(mca_io_base_request_t) + extra);
+    if (NULL == *req) {
+        return OMPI_ERR_OUT_OF_RESOURCE;
+    }
+
+    /* Construct the object and call the module's request init
+       function, if it exists */
+
+    OBJ_CONSTRUCT(req, mca_io_base_request_t);
+    if (NULL != func) {
+        if (OMPI_SUCCESS != (err = func(&file->f_io_selected_module, *req))) {
+            OBJ_RELEASE(*req);
+            return err;
+        }
+    }
+
+    return OMPI_SUCCESS;
+}
+
+
+/*
+ * Free a module-specific IO MPI_Request
+ */
+void mca_io_base_request_free(ompi_file_t *file,
+                              mca_io_base_request_t **req)
+{
+    mca_io_base_module_request_finalize_fn_t func;
+
+    /* JMS For the moment, no freelisting */
+
+    switch (file->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        func = file->f_io_selected_module.v1_0_0.io_module_request_finalize;
+        if (NULL != func) {
+            func(&file->f_io_selected_module, *req);
+        }
+        break;
+
+    default:
+        break;
+    }
+
+    OBJ_RELEASE(*req);
+    *req = (mca_io_base_request_t*) MPI_REQUEST_NULL;
+}
+

src/mca/io/base/io_base_request.h

@@ -0,0 +1,99 @@
+/*
+ * $HEADER$
+ */
+/**
+ * @file
+ *
+ * This is the base request type for all IO requests.
+ */
+
+#ifndef IO_BASE_REQUEST_H
+#define IO_BASE_REQUEST_H
+
+#include "class/ompi_object.h"
+#include "request/request.h"
+#include "file/file.h"
+
+/**
+ * Base request type.
+ */
+struct mca_io_base_request_t {
+    /** Base request */
+    ompi_request_t req_ompi;
+
+    /** io component version number of the module that owns this
+        request */
+    mca_io_base_version_t req_ver;
+
+    /** ompi_file_t of the file that owns this request */
+    ompi_file_t *req_file;
+
+    /* JMS ...nothing more needed for io v1.x, but will likely need
+       more for io v2.x -- probably need to keep other things,
+       analogout to the pml_base_request_t */
+};
+/**
+ * Convenience typedef
+ */
+typedef struct mca_io_base_request_t mca_io_base_request_t;
+
+/**
+ * Declare the class
+ */
+OBJ_CLASS_DECLARATION(mca_io_base_request_t);
+
+
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+    /**
+     * Get a new IO request
+     *
+     * @param fh The file handle
+     * @param req Pointer to an IO base request
+     *
+     * @returns MPI_SUCCESS on success
+     * @returns err otherwise
+     *
+     * This function allocates an MPI_Request (ompi_request_t)
+     * according to the io module that is selected on the file handle.
+     * Specifically, it mallocs enough contiguous space for an
+     * ompi_request_t, an mca_io_base_request_t, and the value of
+     * io_cache_bytes from the selected module.  This allows all three
+     * entities to have space allocated in one contiguous chunk.
+     *
+     * This function will either allocate an initialize a new request
+     * (in which case it will call the module's request init
+     * function), or it will take an old request off a cache of
+     * already-created requests.  Either way, the return is a new IO
+     * request that is suitable for use by the selected module.
+     *
+     * For optimization reasons, only minimal error checking is
+     * performed.
+     */
+    int mca_io_base_request_alloc(ompi_file_t *file, 
+                                  mca_io_base_request_t **req);
+
+    /**
+     * Return a module-specific IO MPI_Request.
+     *
+     * @param fh The file handle
+     * @param req The request to return
+     *
+     * Returns a module-specific IO request when it has completed.
+     * This request may actually be freed (in which case it will call
+     * the IO module's fini function before freeing it) or it may be
+     * placed on a freelist.
+     *
+     * The req argument is set to MPI_REQUEST_NULL upon return.
+     *
+     * For optimization reasons, \em no error checking is performed.
+     */
+    void mca_io_base_request_free(ompi_file_t *file,
+                                  mca_io_base_request_t **req);
+
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+#endif

src/mca/io/io.h

@@ -6,6 +6,46 @@
 #define MCA_IO_H
 
 #include "mca/mca.h"
+#include "datatype/datatype.h"
+
+/*
+ * Forward declaration for private data on io components and modules.
+ */
+struct mca_io_base_file_t;
+struct mca_io_base_delete_t;
+
+/*
+ * Forward declataion so that we don't create an include file loop.
+ */
+struct mca_io_base_request_t;
+
+/* * Forward declarations of things declared in this file
+ */
+struct mca_io_base_module_1_0_0_t;
+union mca_io_base_modules_t;
+
+
+/**
+ * Version of IO component interface that we're using.  
+ *
+ * The IO component is being designed to ensure that it can
+ * simultaneously support multiple component versions in a single
+ * executable.  This is because ROMIO will always be v1.x that
+ * supports pretty much a 1-to-1 MPI-API-to-module-function mapping,
+ * but we plan to have a v2.x series that will be "something
+ * different" (as yet undefined).
+ */
+enum mca_io_base_version_t {
+    MCA_IO_BASE_V_NONE,
+    MCA_IO_BASE_V_1_0_0,
+
+    MCA_IO_BASE_V_MAX
+};
+/**
+ * Convenience typedef
+ */
+typedef enum mca_io_base_version_t mca_io_base_version_t;
+
 
 /*
  * Macro for use in components that are of type io v1.0.0
@@ -16,263 +56,343 @@
   "io", 1, 0, 0
 
 /*
- * Macro for use in components that are of type io v2.0.0
- * as of yet undefined, but not 1-1 mapping of all MPI-IO functions
+ * Component v1.0.0
  */
-#define MCA_IO_BASE_VERSION_2_0_0 \
-  MCA_BASE_VERSION_1_0_0, \
-  "io", 2, 0, 0
 
 struct mca_io_base_module_1_0_0_t;
-typedef struct mca_io_base_module_1_0_0_t * (*mca_io_base_component_init_fn_t)
-  (int *priority, int* min_thread, int* max_thread);
+typedef int (*mca_io_base_component_init_query_fn_t)
+    (bool *allow_multi_user_threads, bool *have_hidden_threads);
+typedef const struct mca_io_base_module_1_0_0_t *
+    (*mca_io_base_component_file_query_1_0_0_fn_t)
+    (struct ompi_file_t *file, struct mca_io_base_file_t **private_data, 
+     int *priority);
+typedef int (*mca_io_base_component_file_unquery_fn_t)
+    (struct ompi_file_t *file, struct mca_io_base_file_t *private_data);
+
+typedef int (*mca_io_base_component_file_delete_query_fn_t)
+    (char *filename, struct ompi_info_t *info, 
+     struct mca_io_base_delete_t **private_data,
+     bool *usable, int *priority);
+typedef int (*mca_io_base_component_file_delete_select_fn_t)
+    (char *filename, struct ompi_info_t *info, 
+     struct mca_io_base_delete_t *private_data);
+typedef int (*mca_io_base_component_file_delete_unselect_fn_t)
+    (char *filename, struct ompi_info_t *info,
+     struct mca_io_base_delete_t *private_data);
 
 /* IO component version and interface functions. */
 struct mca_io_base_component_1_0_0_t {
-   mca_base_component_t io_version;
-   mca_base_component_data_1_0_0_t io_data;
-   mca_io_base_component_init_fn_t io_init;
+    mca_base_component_t io_version;
+    mca_base_component_data_1_0_0_t io_data;
+
+    mca_io_base_component_init_query_fn_t io_init_query;
+    mca_io_base_component_file_query_1_0_0_fn_t io_file_query;
+    mca_io_base_component_file_unquery_fn_t io_file_unquery;
+
+    mca_io_base_component_file_delete_query_fn_t io_delete_query;
+    mca_io_base_component_file_delete_unselect_fn_t io_delete_unquery;
+    mca_io_base_component_file_delete_select_fn_t io_delete_select;
 };
 typedef struct mca_io_base_component_1_0_0_t mca_io_base_component_1_0_0_t;
 
 
 /*
- * to add functions:  
- * add prototypes for all MPI-IO functions to io_romio.h
- * add typedefs for all MPI-IO functions to io.h
- * add all functions to struct mca_io_1_0_0_t in io.h
- * set all functions in struct in io_romio_component.c
+ * All component versions
+ */
+union mca_io_base_components_t {
+    mca_io_base_component_1_0_0_t v1_0_0;
+};
+typedef union mca_io_base_components_t mca_io_base_components_t;
+
+
+/*
+ * Module v1.0.0
  */
 
-
-typedef int (*mca_io_base_module_File_open_t)
-  (struct ompi_communicator_t *comm, char *filename, int amode,
-   struct ompi_info_t *info, struct ompi_file_t **fh);
-typedef int (*mca_io_base_module_File_close_t)(struct ompi_file_t **fh);
-typedef int (*mca_io_base_module_File_delete_t)
-  (char *filename, struct ompi_info_t *info);
-typedef int (*mca_io_base_module_File_set_size_t)
-  (struct ompi_file_t *fh, MPI_Offset size);
-typedef int (*mca_io_base_module_File_preallocate_t)
-  (struct ompi_file_t *fh, MPI_Offset size);
-typedef int (*mca_io_base_module_File_get_size_t)
-  (struct ompi_file_t *fh, MPI_Offset *size);
-typedef int (*mca_io_base_module_File_get_group_t)
-  (struct ompi_file_t *fh, struct ompi_group_t **group);
-typedef int (*mca_io_base_module_File_get_amode_t)
-  (struct ompi_file_t *fh, int *amode);
-typedef int (*mca_io_base_module_File_set_info_t)
-  (struct ompi_file_t *fh, struct ompi_info_t *info);
-typedef int (*mca_io_base_module_File_get_info_t)
-  (struct ompi_file_t *fh, struct ompi_info_t **info_used);
-
-typedef int (*mca_io_base_module_File_set_view_t)
-  (struct ompi_file_t *fh, MPI_Offset disp, struct ompi_datatype_t *etype,
-   struct ompi_datatype_t *filetype, char *datarep, struct ompi_info_t *info);
-typedef int (*mca_io_base_module_File_get_view_t)
-  (struct ompi_file_t *fh, MPI_Offset *disp, 
-   struct ompi_datatype_t **etype, struct ompi_datatype_t **filetype,
-   char *datarep);
-
-typedef int (*mca_io_base_module_File_read_at_t)
-  (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
-   int count, struct ompi_datatype_t *datatype, 
-   struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_File_read_at_all_t)
-  (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
-   int count, struct ompi_datatype_t *datatype, 
-   struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_File_write_at_t)
-  (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
-   int count, struct ompi_datatype_t *datatype, 
-   struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_File_write_at_all_t)
-  (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
-   int count, struct ompi_datatype_t *datatype, 
-   struct ompi_status_public_t *status);
-
-typedef int (*mca_io_base_module_File_iread_at_t)
-  (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
-   int count, struct ompi_datatype_t *datatype, 
-   struct ompi_request_t **request);
-typedef int (*mca_io_base_module_File_iwrite_at_t)
-  (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
-   int count, struct ompi_datatype_t *datatype, 
-   struct ompi_request_t **request);
+/**
+ * Initialize a request for use by the io module.
+ *
+ * @param module (IN)    IO module
+ * @param request (IN)   Pointer to allocated request.
+ *
+ * To reduce latency (number of required allocations), the io base
+ * allocates additional space along with each request that may be used
+ * by the io module for additional control information. If the io
+ * module intends to use this space, the io_module_cache_bytes
+ * attributes should be set to reflect the number of bytes needed by
+ * the io module on a per-request basis. This space is allocated
+ * contiguously along with the mca_io_base_request_t with the space
+ * immediately following the base request available to the io module.
+ * 
+ * This init function is called the first time the request is created
+ * by the io base. On completion of the request, the io base will
+ * cache the request for later use by the same io module.  When the
+ * request is re-used from the cache, this init function is NOT called
+ * again.
+ */
+typedef int (*mca_io_base_module_request_init_fn_t)(
+    union mca_io_base_modules_t* module_union,
+    struct mca_io_base_request_t* request);
 
 
-typedef int (*mca_io_base_module_File_read_t)
-  (struct ompi_file_t *fh, void *buf, int count, MPI_Datatype
-   datatype, struct ompi_status_public_t *status); 
-typedef int (*mca_io_base_module_File_read_all_t)
-  (struct ompi_file_t *fh, void *buf, int count, MPI_Datatype
-   datatype, struct ompi_status_public_t *status); 
-typedef int (*mca_io_base_module_File_write_t)
-  (struct ompi_file_t *fh, void *buf, int count, MPI_Datatype
-   datatype, struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_File_write_all_t)
-  (struct ompi_file_t *fh, void *buf, int count, MPI_Datatype
-   datatype, struct ompi_status_public_t *status);
+/**
+ * Cleanup any resources that may have been associated with the
+ * request by the io module.
+ *
+ * @param module (IN)    io module
+ * @param request (IN)   Pointer to allocated request.
+ *
+ * The fini function is called when the io base removes a request from
+ * the io module's cache (due to resource constraints) or the cache
+ * limit has been reached, prior to re-using the request for another
+ * io module. This provides the io module the chance to
+ * cleanup/release any resources cached on the request by the io
+ * module.
+ */
+typedef int (*mca_io_base_module_request_finalize_fn_t)(
+    union mca_io_base_modules_t* module_union,
+    struct mca_io_base_request_t* request);
 
-typedef int (*mca_io_base_module_File_iread_t)
-  (struct ompi_file_t *fh, void *buf, int count, MPI_Datatype
-   datatype, struct ompi_request_t **request); 
-typedef int (*mca_io_base_module_File_iwrite_t)
-  (struct ompi_file_t *fh, void *buf, int count, 
-   struct ompi_datatype_t *datatype, struct ompi_request_t **request);
+typedef int (*mca_io_base_module_file_open_fn_t)
+    (struct ompi_communicator_t *comm, char *filename, int amode,
+     struct ompi_info_t *info, struct ompi_file_t *fh);
+typedef int (*mca_io_base_module_file_close_fn_t)(struct ompi_file_t *fh);
 
-typedef int (*mca_io_base_module_File_seek_t)
-  (struct ompi_file_t *fh, MPI_Offset offset, int whence);
-typedef int (*mca_io_base_module_File_get_position_t)
-  (struct ompi_file_t *fh, MPI_Offset *offset);
-typedef int (*mca_io_base_module_File_get_byte_offset_t)
-  (struct ompi_file_t *fh, MPI_Offset offset, MPI_Offset *disp);
+typedef int (*mca_io_base_module_file_set_size_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset size);
+typedef int (*mca_io_base_module_file_preallocate_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset size);
+typedef int (*mca_io_base_module_file_get_size_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset *size);
+typedef int (*mca_io_base_module_file_get_amode_fn_t)
+    (struct ompi_file_t *fh, int *amode);
+typedef int (*mca_io_base_module_file_set_info_fn_t)
+    (struct ompi_file_t *fh, struct ompi_info_t *info);
+typedef int (*mca_io_base_module_file_get_info_fn_t)
+    (struct ompi_file_t *fh, struct ompi_info_t **info_used);
 
-typedef int (*mca_io_base_module_File_read_shared_t)
-  (struct ompi_file_t *fh, void *buf, int count, 
-   struct ompi_datatype_t *datatype, struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_File_write_shared_t)
-  (struct ompi_file_t *fh, void *buf, int count, 
-   struct ompi_datatype_t *datatype, struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_File_iread_shared_t)
-  (struct ompi_file_t *fh, void *buf, int count, 
-   struct ompi_datatype_t *datatype, struct ompi_request_t **request);
-typedef int (*mca_io_base_module_File_iwrite_shared_t)
-  (struct ompi_file_t *fh, void *buf, int count, 
-   struct ompi_datatype_t *datatype, struct ompi_request_t **request);
-typedef int (*mca_io_base_module_File_read_ordered_t)
-  (struct ompi_file_t *fh, void *buf, int count, 
-   struct ompi_datatype_t *datatype, struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_File_write_ordered_t)
-  (struct ompi_file_t *fh, void *buf, int count, 
-   struct ompi_datatype_t *datatype, struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_File_seek_shared_t)
-  (struct ompi_file_t *fh, MPI_Offset offset, int whence);
-typedef int (*mca_io_base_module_File_get_position_shared_t)
-  (struct ompi_file_t *fh, MPI_Offset *offset);
+typedef int (*mca_io_base_module_file_set_view_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset disp, struct ompi_datatype_t *etype,
+     struct ompi_datatype_t *filetype, char *datarep, 
+     struct ompi_info_t *info);
+typedef int (*mca_io_base_module_file_get_view_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset *disp, 
+     struct ompi_datatype_t **etype, struct ompi_datatype_t **filetype,
+     char *datarep);
 
-typedef int (*mca_io_base_module_File_read_at_all_begin_t)
-  (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
-   int count, struct ompi_datatype_t *datatype);
-typedef int (*mca_io_base_module_File_read_at_all_end_t)
-  (struct ompi_file_t *fh, void *buf, struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_File_write_at_all_begin_t)
-  (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
-   int count, struct ompi_datatype_t *datatype);
-typedef int (*mca_io_base_module_File_write_at_all_end_t)
-  (struct ompi_file_t *fh, void *buf, struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_File_read_all_begin_t)
-  (struct ompi_file_t *fh, void *buf, int count, 
-   struct ompi_datatype_t *datatype);
-typedef int (*mca_io_base_module_File_read_all_end_t)
-  (struct ompi_file_t *fh, void *buf, struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_File_write_all_begin_t)
-  (struct ompi_file_t *fh, void *buf, int count, 
-   struct ompi_datatype_t *datatype);
-typedef int (*mca_io_base_module_File_write_all_end_t)
-  (struct ompi_file_t *fh, void *buf, struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_File_read_ordered_begin_t)
-  (struct ompi_file_t *fh, void *buf, int count, 
-   struct ompi_datatype_t *datatype);
-typedef int (*mca_io_base_module_File_read_ordered_end_t)
-  (struct ompi_file_t *fh, void *buf, struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_File_write_ordered_begin_t)
-  (struct ompi_file_t *fh, void *buf, int count, 
-   struct ompi_datatype_t *datatype);
-typedef int (*mca_io_base_module_File_write_ordered_end_t)
-  (struct ompi_file_t *fh, void *buf, struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_read_at_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
+     int count, struct ompi_datatype_t *datatype, 
+     struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_read_at_all_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
+     int count, struct ompi_datatype_t *datatype, 
+     struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_write_at_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
+     int count, struct ompi_datatype_t *datatype, 
+     struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_write_at_all_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
+     int count, struct ompi_datatype_t *datatype, 
+     struct ompi_status_public_t *status);
 
-typedef int (*mca_io_base_module_File_get_type_extent_t)
-  (struct ompi_file_t *fh, struct ompi_datatype_t *datatype, 
-   MPI_Aint *extent);
+typedef int (*mca_io_base_module_file_iread_at_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
+     int count, struct ompi_datatype_t *datatype, 
+     struct mca_io_base_request_t *request);
+typedef int (*mca_io_base_module_file_iwrite_at_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
+     int count, struct ompi_datatype_t *datatype, 
+     struct mca_io_base_request_t *request);
 
-typedef int (*mca_io_base_module_File_set_atomicity_t)
-  (struct ompi_file_t *fh, int flag);
-typedef int (*mca_io_base_module_File_get_atomicity_t)
-  (struct ompi_file_t *fh, int *flag);
-typedef int (*mca_io_base_module_File_sync_t)(struct ompi_file_t *fh);
+typedef int (*mca_io_base_module_file_read_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, ompi_datatype_t *
+     datatype, struct ompi_status_public_t *status); 
+typedef int (*mca_io_base_module_file_read_all_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, ompi_datatype_t *
+     datatype, struct ompi_status_public_t *status); 
+typedef int (*mca_io_base_module_file_write_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, ompi_datatype_t *
+     datatype, struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_write_all_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, ompi_datatype_t *
+     datatype, struct ompi_status_public_t *status);
 
-typedef int (*mca_io_base_module_File_set_errhandler_t)
-  (struct ompi_file_t *fh, MPI_Errhandler e);
-typedef int (*mca_io_base_module_File_get_errhandler_t)
-  (struct ompi_file_t *fh, MPI_Errhandler *e );
+typedef int (*mca_io_base_module_file_iread_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, ompi_datatype_t *
+     datatype, struct mca_io_base_request_t *request); 
+typedef int (*mca_io_base_module_file_iwrite_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, 
+     struct ompi_datatype_t *datatype, struct mca_io_base_request_t *request);
 
-typedef int (*mca_io_base_module_Test_t)
-  (struct ompi_request_t **request, int *flag, 
-   struct ompi_status_public_t *status);
-typedef int (*mca_io_base_module_Wait_t)
-  (struct ompi_request_t **request, struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_seek_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset offset, int whence);
+typedef int (*mca_io_base_module_file_get_position_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset *offset);
+typedef int (*mca_io_base_module_file_get_byte_offset_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset offset, MPI_Offset *disp);
+
+typedef int (*mca_io_base_module_file_read_shared_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, 
+     struct ompi_datatype_t *datatype, struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_write_shared_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, 
+     struct ompi_datatype_t *datatype, struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_iread_shared_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, 
+     struct ompi_datatype_t *datatype, struct mca_io_base_request_t *request);
+typedef int (*mca_io_base_module_file_iwrite_shared_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, 
+     struct ompi_datatype_t *datatype, struct mca_io_base_request_t *request);
+typedef int (*mca_io_base_module_file_read_ordered_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, 
+     struct ompi_datatype_t *datatype, struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_write_ordered_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, 
+     struct ompi_datatype_t *datatype, struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_seek_shared_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset offset, int whence);
+typedef int (*mca_io_base_module_file_get_position_shared_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset *offset);
+
+typedef int (*mca_io_base_module_file_read_at_all_begin_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
+     int count, struct ompi_datatype_t *datatype);
+typedef int (*mca_io_base_module_file_read_at_all_end_fn_t)
+    (struct ompi_file_t *fh, void *buf, struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_write_at_all_begin_fn_t)
+    (struct ompi_file_t *fh, MPI_Offset offset, void *buf,
+     int count, struct ompi_datatype_t *datatype);
+typedef int (*mca_io_base_module_file_write_at_all_end_fn_t)
+    (struct ompi_file_t *fh, void *buf, struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_read_all_begin_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, 
+     struct ompi_datatype_t *datatype);
+typedef int (*mca_io_base_module_file_read_all_end_fn_t)
+    (struct ompi_file_t *fh, void *buf, struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_write_all_begin_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, 
+     struct ompi_datatype_t *datatype);
+typedef int (*mca_io_base_module_file_write_all_end_fn_t)
+    (struct ompi_file_t *fh, void *buf, struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_read_ordered_begin_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, 
+     struct ompi_datatype_t *datatype);
+typedef int (*mca_io_base_module_file_read_ordered_end_fn_t)
+    (struct ompi_file_t *fh, void *buf, struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_file_write_ordered_begin_fn_t)
+    (struct ompi_file_t *fh, void *buf, int count, 
+     struct ompi_datatype_t *datatype);
+typedef int (*mca_io_base_module_file_write_ordered_end_fn_t)
+    (struct ompi_file_t *fh, void *buf, struct ompi_status_public_t *status);
+
+typedef int (*mca_io_base_module_file_get_type_extent_fn_t)
+    (struct ompi_file_t *fh, struct ompi_datatype_t *datatype, 
+     MPI_Aint *extent);
+
+typedef int (*mca_io_base_module_file_set_atomicity_fn_t)
+    (struct ompi_file_t *fh, int flag);
+typedef int (*mca_io_base_module_file_get_atomicity_fn_t)
+    (struct ompi_file_t *fh, int *flag);
+typedef int (*mca_io_base_module_file_sync_fn_t)(struct ompi_file_t *fh);
+
+typedef int (*mca_io_base_module_test_fn_t)
+    (struct mca_io_base_request_t *request, int *flag, 
+     struct ompi_status_public_t *status);
+typedef int (*mca_io_base_module_wait_fn_t)
+    (struct mca_io_base_request_t *request,
+     struct ompi_status_public_t *status);
 
 struct mca_io_base_module_1_0_0_t {
-    mca_io_base_module_File_open_t        mca_io_File_open;
-    mca_io_base_module_File_close_t       mca_io_File_close;
-    mca_io_base_module_File_delete_t      mca_io_File_delete;
-    mca_io_base_module_File_set_size_t    mca_io_File_set_size;
-    mca_io_base_module_File_preallocate_t mca_io_File_preallocate;
-    mca_io_base_module_File_get_size_t    mca_io_File_get_size;
-    mca_io_base_module_File_get_group_t   mca_io_File_get_group;
-    mca_io_base_module_File_get_amode_t   mca_io_File_get_amode; 
-    mca_io_base_module_File_set_info_t    mca_io_File_set_info;
-    mca_io_base_module_File_get_info_t    mca_io_File_get_info;
 
-    mca_io_base_module_File_set_view_t    mca_io_File_set_view;
-    mca_io_base_module_File_get_view_t    mca_io_File_get_view;
+    /* Additional data */
 
-    mca_io_base_module_File_read_at_t     mca_io_File_read_at;
-    mca_io_base_module_File_read_at_all_t mca_io_File_read_at_all;
-    mca_io_base_module_File_write_at_t    mca_io_File_write_at;
-    mca_io_base_module_File_write_at_all_t  mca_io_File_write_at_all;
+    /** Maximum number of requests to hold in the cache */
+    size_t io_module_cache_size;
 
-    mca_io_base_module_File_iread_at_t    mca_io_File_iread_at;
-    mca_io_base_module_File_iwrite_at_t   mca_io_File_iwrite_at;
+    /** Additional bytes that this module needs to be allocated when
+        an MPI_Request (ompi_request_t) is allocated. */
+    size_t io_module_cache_bytes;
 
-    mca_io_base_module_File_read_t        mca_io_File_read;
-    mca_io_base_module_File_read_all_t    mca_io_File_read_all;
-    mca_io_base_module_File_write_t       mca_io_File_write;
-    mca_io_base_module_File_write_all_t   mca_io_File_write_all;
+    mca_io_base_module_request_init_fn_t io_module_request_init;
+    mca_io_base_module_request_finalize_fn_t io_module_request_finalize;
 
-    mca_io_base_module_File_iread_t       mca_io_File_iread;
-    mca_io_base_module_File_iwrite_t      mca_io_File_iwrite;
+    /* Back-ends to MPI API calls (pretty much a 1-to-1 mapping) */
 
-    mca_io_base_module_File_seek_t        mca_io_File_seek;
-    mca_io_base_module_File_get_position_t mca_io_File_get_position;
-    mca_io_base_module_File_get_byte_offset_t mca_io_File_get_byte_offset;
+    mca_io_base_module_file_open_fn_t        io_module_file_open;
+    mca_io_base_module_file_close_fn_t       io_module_file_close;
+  
+    mca_io_base_module_file_set_size_fn_t    io_module_file_set_size;
+    mca_io_base_module_file_preallocate_fn_t io_module_file_preallocate;
+    mca_io_base_module_file_get_size_fn_t    io_module_file_get_size;
+    mca_io_base_module_file_get_amode_fn_t   io_module_file_get_amode; 
+    mca_io_base_module_file_set_info_fn_t    io_module_file_set_info;
+    mca_io_base_module_file_get_info_fn_t    io_module_file_get_info;
+    
+    mca_io_base_module_file_set_view_fn_t    io_module_file_set_view;
+    mca_io_base_module_file_get_view_fn_t    io_module_file_get_view;
 
-    mca_io_base_module_File_read_shared_t   mca_io_File_read_shared;
-    mca_io_base_module_File_write_shared_t  mca_io_File_write_shared;
-    mca_io_base_module_File_iread_shared_t  mca_io_File_iread_shared;
-    mca_io_base_module_File_iwrite_shared_t mca_io_File_iwrite_shared;
-    mca_io_base_module_File_read_ordered_t  mca_io_File_read_ordered;
-    mca_io_base_module_File_write_ordered_t mca_io_File_write_ordered;
-    mca_io_base_module_File_seek_shared_t   mca_io_File_seek_shared;
-    mca_io_base_module_File_get_position_shared_t  mca_io_File_get_position_shared;
-
-    mca_io_base_module_File_read_at_all_begin_t    mca_io_File_read_at_all_begin;
-    mca_io_base_module_File_read_at_all_end_t      mca_io_File_read_at_all_end;
-    mca_io_base_module_File_write_at_all_begin_t   mca_io_File_write_at_all_begin;
-    mca_io_base_module_File_write_at_all_end_t     mca_io_File_write_at_all_end;
-    mca_io_base_module_File_read_all_begin_t       mca_io_File_read_all_begin;
-    mca_io_base_module_File_read_all_end_t         mca_io_File_read_all_end;
-    mca_io_base_module_File_write_all_begin_t      mca_io_File_write_all_begin;
-    mca_io_base_module_File_write_all_end_t        mca_io_File_write_all_end;
-    mca_io_base_module_File_read_ordered_begin_t   mca_io_File_read_ordered_begin;
-    mca_io_base_module_File_read_ordered_end_t     mca_io_File_read_ordered_end;
-    mca_io_base_module_File_write_ordered_begin_t  mca_io_File_write_ordered_begin;
-    mca_io_base_module_File_write_ordered_end_t    mca_io_File_write_ordered_end;
-
-    mca_io_base_module_File_get_type_extent_t      mca_io_File_get_type_extent;
-
-    mca_io_base_module_File_set_atomicity_t        mca_io_File_set_atomicity;
-    mca_io_base_module_File_get_atomicity_t        mca_io_File_get_atomicity;
-    mca_io_base_module_File_sync_t                 mca_io_File_sync;
-
-    mca_io_base_module_File_set_errhandler_t       mca_io_File_set_errhandler;
-    mca_io_base_module_File_get_errhandler_t       mca_io_File_get_errhandler;
-
-    mca_io_base_module_Test_t                      mca_io_Test;
-    mca_io_base_module_Wait_t                      mca_io_Wait;
+    mca_io_base_module_file_read_at_fn_t     io_module_file_read_at;
+    mca_io_base_module_file_read_at_all_fn_t io_module_file_read_at_all;
+    mca_io_base_module_file_write_at_fn_t    io_module_file_write_at;
+    mca_io_base_module_file_write_at_all_fn_t  io_module_file_write_at_all;
+    
+    mca_io_base_module_file_iread_at_fn_t    io_module_file_iread_at;
+    mca_io_base_module_file_iwrite_at_fn_t   io_module_file_iwrite_at;
+    
+    mca_io_base_module_file_read_fn_t        io_module_file_read;
+    mca_io_base_module_file_read_all_fn_t    io_module_file_read_all;
+    mca_io_base_module_file_write_fn_t       io_module_file_write;
+    mca_io_base_module_file_write_all_fn_t   io_module_file_write_all;
+    
+    mca_io_base_module_file_iread_fn_t       io_module_file_iread;
+    mca_io_base_module_file_iwrite_fn_t      io_module_file_iwrite;
+    
+    mca_io_base_module_file_seek_fn_t        io_module_file_seek;
+    mca_io_base_module_file_get_position_fn_t io_module_file_get_position;
+    mca_io_base_module_file_get_byte_offset_fn_t io_module_file_get_byte_offset;
+    
+    mca_io_base_module_file_read_shared_fn_t   io_module_file_read_shared;
+    mca_io_base_module_file_write_shared_fn_t  io_module_file_write_shared;
+    mca_io_base_module_file_iread_shared_fn_t  io_module_file_iread_shared;
+    mca_io_base_module_file_iwrite_shared_fn_t io_module_file_iwrite_shared;
+    mca_io_base_module_file_read_ordered_fn_t  io_module_file_read_ordered;
+    mca_io_base_module_file_write_ordered_fn_t io_module_file_write_ordered;
+    mca_io_base_module_file_seek_shared_fn_t   io_module_file_seek_shared;
+    mca_io_base_module_file_get_position_shared_fn_t  io_module_file_get_position_shared;
+    
+    mca_io_base_module_file_read_at_all_begin_fn_t    io_module_file_read_at_all_begin;
+    mca_io_base_module_file_read_at_all_end_fn_t      io_module_file_read_at_all_end;
+    mca_io_base_module_file_write_at_all_begin_fn_t   io_module_file_write_at_all_begin;
+    mca_io_base_module_file_write_at_all_end_fn_t     io_module_file_write_at_all_end;
+    mca_io_base_module_file_read_all_begin_fn_t       io_module_file_read_all_begin;
+    mca_io_base_module_file_read_all_end_fn_t         io_module_file_read_all_end;
+    mca_io_base_module_file_write_all_begin_fn_t      io_module_file_write_all_begin;
+    mca_io_base_module_file_write_all_end_fn_t        io_module_file_write_all_end;
+    mca_io_base_module_file_read_ordered_begin_fn_t   io_module_file_read_ordered_begin;
+    mca_io_base_module_file_read_ordered_end_fn_t     io_module_file_read_ordered_end;
+    mca_io_base_module_file_write_ordered_begin_fn_t  io_module_file_write_ordered_begin;
+    mca_io_base_module_file_write_ordered_end_fn_t    io_module_file_write_ordered_end;
+    
+    mca_io_base_module_file_get_type_extent_fn_t      io_module_file_get_type_extent;
+    
+    mca_io_base_module_file_set_atomicity_fn_t        io_module_file_set_atomicity;
+    mca_io_base_module_file_get_atomicity_fn_t        io_module_file_get_atomicity;
+    mca_io_base_module_file_sync_fn_t                 io_module_file_sync;
+    
+    mca_io_base_module_test_fn_t                      io_module_file_fn_test;
+    mca_io_base_module_wait_fn_t                      io_module_file_wait;
 };
 typedef struct mca_io_base_module_1_0_0_t mca_io_base_module_1_0_0_t;
 
 
+/*
+ * All module versions
+ */
+union mca_io_base_modules_t {
+    mca_io_base_module_1_0_0_t v1_0_0;
+};
+typedef union mca_io_base_modules_t mca_io_base_modules_t;
+
 #endif /* MCA_IO_H */

src/mca/io/romio/Makefile.am

@@ -20,13 +20,15 @@ component_noinst = libmca_mpi_io_romio.la
 component_install =
 endif
 
+libs = src/libmca_io_romio.la romio-dist/libromio_dist.la
+
 mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_io_romio_la_SOURCES = 
-mca_io_romio_la_LIBADD = src/libmca_io_romio.la
+mca_io_romio_la_LIBADD = $(libs)
 mca_io_romio_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_mpi_io_romio_la_SOURCES =
-libmca_mpi_io_romio_la_LIBADD = src/libmca_io_romio.la
+libmca_mpi_io_romio_la_LIBADD = $(libs)
 libmca_mpi_io_romio_la_LDFLAGS = -module -avoid-version

src/mca/io/romio/configure.params

@@ -5,6 +5,7 @@
 
 # Specific to this module
 
-PARAM_INIT_FILE=src/io_romio_module.c
+PARAM_INIT_FILE=src/io_romio_component.c
 PARAM_CONFIG_HEADER_FILE="src/romio_config.h"
-PARAM_CONFIG_FILES="Makefile src/Makefile romio-dist/Makefile romio-dist/include/Makefile romio-dist/adio/Makefile romio-dist/adio/common/Makefile romio-dist/adio/ad_ufs/Makefile romio-dist/adio/ad_nfs/Makefile romio-dist/mpi-io/Makefile"
+PARAM_CONFIG_FILES="Makefile src/Makefile"
+

src/mca/io/romio/configure.stub

@@ -0,0 +1,73 @@
+# -*- shell-script -*-
+#
+# $HEADER$
+#
+
+# Because of the following statements, this component is essentially
+# "core" and cannot be configured / compiled outside of the Open MPI
+# tree.
+
+sinclude(../../../../config/ompi_config_subdir.m4)
+
+
+#
+# Main function.  This will be invoked in the middle of the templated
+# configure script.
+#
+AC_DEFUN([MCA_CONFIGURE_STUB],[
+    AC_ARG_WITH([io-romio-flags], 
+        AC_HELP_STRING([--with-io-romio-flags=FLAGS],
+                [Pass FLAGS to the ROMIO distribution configuration script]))
+
+    AC_MSG_CHECKING([for ROMIO distribution configure flags])
+    io_romio_flags=
+    if test -n "$with_io_romio_flags" -a "$with_io_romio_flags" != "no"; then
+        io_romio_flags="$with_io_romio_flags $io_romio_flags"
+    fi
+
+    shared=enable
+    if test -n "$enable_shared"; then
+        if test "$enable_shared" != "no"; then
+            shared=enable
+        else
+            shared=disable
+        fi
+    fi
+
+    static=enable
+    if test -n "$enable_static"; then
+        if test "$enable_static" != "no"; then
+            static=enable
+        else
+            static=disable
+        fi
+    fi
+    io_romio_flags="CFLAGS="'"'"$CFLAGS"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LSFLAGS"'"'" --$shared-shared --$static-static $io_romio_flags"
+    AC_MSG_RESULT([$io_romio_flags])
+
+    ompi_show_subtitle "Configuring ROMIO distribution"
+    OMPI_CONFIG_SUBDIR([romio-dist], [$io_romio_flags],
+                        [HAPPY=1], [HAPPY=0])
+    if test "$HAPPY" = "1"; then
+        echo "ROMIO distribution configured successfully"
+    else
+        AC_MSG_WARN([ROMIO distribution did not configure successfully])
+        AC_MSG_ERROR([Cannot continue])
+    fi
+])
+
+#
+# For dist
+#
+AC_DEFUN([MCA_CONFIGURE_DIST_STUB],[
+    ompi_show_subtitle "Configuring ROMIO distribution"
+    OMPI_CONFIG_SUBDIR([romio-dist], [],
+                        [HAPPY=1], [HAPPY=0])
+    if test "$HAPPY" = "1"; then
+        echo "ROMIO distribution configured successfully"
+    else
+        AC_MSG_WARN([ROMIO distribution did not configure successfully])
+        AC_MSG_WARN([Nothing I can do about that -- sorry!])
+        AC_MSG_ERROR([Cannot continue])
+    fi
+])

src/mca/io/romio/romio-dist/Makefile.am

@@ -2,25 +2,17 @@
 # $HEADER$
 #
 
-include $(top_srcdir)/config/Makefile.options
+include $(top_ompi_srcdir)/config/Makefile.options
 
-# Source code files
-headers = acconfig.h
-
-AM_CPPFLAGS = -DHAVE_MPI_INFO #-DMPIO_INCLUDE
-
-#SUBDIRS = include adio mpi2-other mpi-io util 
 SUBDIRS = include adio mpi-io 
+DIST_SUBDIRS = $(SUBDIRS) doc test
 
-noinst_LTLIBRARIES = libmca_io_romio_romio_dist.la 
-
-libmca_io_romio_romio_dist_la_SOURCES = 
-libmca_io_romio_romio_dist_la_LIBADD  = \
-	adio/libmca_io_romio_romio_dist_adio.la \
-	mpi-io/libmca_io_romio_romio_dist_mpi_io.la 
+noinst_LTLIBRARIES = libromio_dist.la 
+libromio_dist_la_SOURCES = 
+libromio_dist_la_LIBADD  = \
+	adio/libadio.la \
+	mpi-io/libmpi-io.la \
 	$(MCA_io_romio_STATIC_LTLIBS)
-
-libmca_io_romio_romio_dist_la_DEPENDENCIES = \
+libromio_dist_la_DEPENDENCIES = \
 	$(libmca_io_romio_romio_dist_la_LIBADD)
-
-libmca_io_romio_romio_dist_la_LDFLAGS = -module -avoid-version
+libromio_dist_la_LDFLAGS = -module -avoid-version

src/mca/io/romio/romio-dist/Makefile.in

@@ -1,197 +1,712 @@
-ARCH        = @ARCH@
-RANLIB      = @RANLIB@
-FILE_SYSTEM = @FILE_SYSTEM@
-MAKE        = @MAKE@
-AR          = @AR@
-LIBNAME     = @LIBNAME@
-NOF77       = @NOF77@
-NOPROFILE   = @NOPROFILE@
-MPI         = @MPI@
-PREFIX      = @prefix@
-FROM_MPICH  = @FROM_MPICH@
-FROM_MPICH2  = @FROM_MPICH2@
-BUILD_MPI_INFO = @BUILD_MPI_INFO@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $HEADER$
+#
+
+SOURCES = $(libromio_dist_la_SOURCES)
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \
+	$(srcdir)/../config.sub $(srcdir)/../install-sh \
+	$(srcdir)/../ltmain.sh $(srcdir)/../missing \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/configure $(top_srcdir)/test/Makefile.in \
+	$(top_srcdir)/test/large_file.c.in \
+	$(top_srcdir)/test/misc.c.in $(top_srcdir)/test/runtests.in
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES = test/Makefile test/misc.c test/large_file.c \
+	test/runtests
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+am_libromio_dist_la_OBJECTS =
+libromio_dist_la_OBJECTS = $(am_libromio_dist_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libromio_dist_la_SOURCES)
+DIST_SOURCES = $(libromio_dist_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
 BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
-DIRS        = mpi-io adio/common
-MPIO_DIRS   = mpi-io
-ALL_DIRS    = mpi-io mpi-io/fortran mpi2-other/info mpi2-other/info/fortran mpi2-other/array mpi2-other/array/fortran adio/common adio/ad_pfs adio/ad_piofs adio/ad_nfs adio/ad_ufs adio/ad_xfs adio/ad_hfs adio/ad_sfs adio/ad_testfs adio/ad_pvfs test
-SHELL       = /bin/sh
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+SUBDIRS = include adio mpi-io 
+DIST_SUBDIRS = $(SUBDIRS) doc test
+noinst_LTLIBRARIES = libromio_dist.la 
+libromio_dist_la_SOURCES = 
+libromio_dist_la_LIBADD = \
+	adio/libadio.la \
+	mpi-io/libmpi-io.la \
+	$(MCA_io_romio_STATIC_LTLIBS)
 
-@VPATH@
+libromio_dist_la_DEPENDENCIES = \
+	$(libmca_io_romio_romio_dist_la_LIBADD)
 
-all: mpio
+libromio_dist_la_LDFLAGS = -module -avoid-version
+all: all-recursive
 
-# The sleep 1 at the end of the build is used to ensure that make
-# builds the libraries for any steps that *follow* this one and
-# use the same library.  This is a work around for a bug in make that 
-# is related to the use of file time stamps in make, but is in fact
-# a bug in the logic of several make implementations, including gnumake
-mpio:
-	$(MAKE) clean
-	$(MAKE) mpiolib
-	$(MAKE) clean
-	@if test "$(NOPROFILE)" = 0 ; then\
-            $(MAKE) profile; \
-        fi;\
-	$(MAKE) clean
-	$(RANLIB) $(LIBNAME)
-	@if test "$(FROM_MPICH)" = 0 -a "$(FROM_MPICH2)" = 0 ; then \
-           echo " "; \
-           echo "Completed build of ROMIO. Check the output for errors."; \
-           echo " " ;\
-           echo "To compile the example programs, cd to the test directory"; \
-           echo "and type make."; \
-           echo "Run the examples the way you would run any MPI program."; \
-           echo "Each program takes the filename as a command-line argument"; \
-           echo "'-fname filename'." ; \
-           echo " " ;\
-        fi
-	@sleep 1
+.SUFFIXES:
+am--refresh:
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
 
-clean:
-	@-rm -f work.pc work.pcl
-	@dirs=`echo "$(DIRS)"`; \
-        for x in $(FILE_SYSTEM) ;\
-         do \
-             dirs=`echo "$$dirs" adio/ad_$$x` ;\
-         done ; \
-        if test "$(BUILD_MPI_INFO)" = 1 ; then \
-            dirs=`echo "$$dirs" mpi2-other/info` ;\
-            if test "$(NOF77)" = 0 ; then\
-                dirs=`echo "$$dirs" mpi2-other/info/fortran` ;\
-            fi;\
-        fi; \
-        if test "$(BUILD_MPI_ARRAY)" = 1 ; then \
-            dirs=`echo "$$dirs" mpi2-other/array` ;\
-            if test "$(NOF77)" = 0 ; then\
-                dirs=`echo "$$dirs" mpi2-other/array/fortran` ;\
-            fi;\
-        fi; \
-        if test "$(NOF77)" = 0 ; then\
-            dirs=`echo "$$dirs" mpi-io/fortran` ;\
-        fi;\
-        for dir in $$dirs ;\
-         do \
-            echo " " ;\
-            echo cleaning directory $$dir ;\
-            (cd $$dir; rm -f *.o) ;\
-         done; \
-         echo " " ;\
-         echo cleaning directory test ;\
-         (cd test; $(MAKE) clean);\
-         echo " ";
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
 
-mpiolib:
-	@if test "$(FROM_MPICH)" = 0 -a "$(FROM_MPICH2)" = 0 ; then \
-            echo " " ;\
-            echo "deleting previously built library if it exists" ;\
-            rm -f $(LIBNAME) ;\
-        fi; \
-        dirs=`echo "$(DIRS)"`; \
-        for x in $(FILE_SYSTEM) ;\
-         do \
-             dirs=`echo "$$dirs" adio/ad_$$x` ;\
-         done ; \
-        if test "$(BUILD_MPI_INFO)" = 1 ; then \
-            dirs=`echo "$$dirs" mpi2-other/info` ;\
-            if test "$(NOF77)" = 0 ; then \
-                dirs=`echo "$$dirs" mpi2-other/info/fortran` ;\
-            fi; \
-        fi; \
-        if test "$(BUILD_MPI_ARRAY)" = 1 ; then \
-            dirs=`echo "$$dirs" mpi2-other/array` ;\
-            if test "$(NOF77)" = 0 ; then \
-                dirs=`echo "$$dirs" mpi2-other/array/fortran` ;\
-            fi; \
-        fi; \
-        if test "$(NOF77)" = 0 ; then \
-            dirs=`echo "$$dirs" mpi-io/fortran` ;\
-        fi; \
-        for dir in $$dirs ;\
-         do \
-            echo " " ;\
-            echo compiling ROMIO in directory $$dir ;\
-	    sleep 1;\
-            (cd $$dir && $(MAKE) ;) ;\
-            if [ $$? != 0 ] ; then \
-                echo "Make failed in directory $$dir" ; exit 1 ;\
-            fi ;\
-         done
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+test/Makefile: $(top_builddir)/config.status $(top_srcdir)/test/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+test/misc.c: $(top_builddir)/config.status $(top_srcdir)/test/misc.c.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+test/large_file.c: $(top_builddir)/config.status $(top_srcdir)/test/large_file.c.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+test/runtests: $(top_builddir)/config.status $(top_srcdir)/test/runtests.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
-profile: 
-	@if [ "@HAVE_WEAK_SYMBOLS@" = 0 ] ; then \
-           dirs=`echo "$(MPIO_DIRS)"`; \
-           if test "$(BUILD_MPI_INFO)" = 1 ; then \
-               dirs=`echo "$$dirs" mpi2-other/info` ;\
-               if test "$(NOF77)" = 0 ; then\
-                   dirs=`echo "$$dirs" mpi2-other/info/fortran` ;\
-               fi;\
-           fi; \
-           if test "$(BUILD_MPI_ARRAY)" = 1 ; then \
-               dirs=`echo "$$dirs" mpi2-other/array` ;\
-               if test "$(NOF77)" = 0 ; then\
-                   dirs=`echo "$$dirs" mpi2-other/array/fortran` ;\
-               fi;\
-           fi; \
-           if test "$(NOF77)" = 0 ; then\
-               dirs=`echo "$$dirs" mpi-io/fortran` ;\
-           fi;\
-           for dir in $$dirs ;\
-            do \
-               echo " " ;\
-               echo building profiling interface in directory $$dir ;\
-               sleep 1;\
-               (cd $$dir; \
-                $(MAKE) profile MPIOPROFILE="-DMPIO_BUILD_PROFILING";) ;\
-                if [ $$? != 0 ] ; then \
-                    echo "Make failed in directory $$dir" ; exit 1 ;\
-                fi ;\
-            done \
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libromio_dist.la: $(libromio_dist_la_OBJECTS) $(libromio_dist_la_DEPENDENCIES) 
+	$(LINK)  $(libromio_dist_la_LDFLAGS) $(libromio_dist_la_OBJECTS) $(libromio_dist_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
 	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
 
-cleanall:
-	@dirs=`echo "$(ALL_DIRS)"`; \
-	echo "cleaning test directory" ;\
-	(cd test ; ${MAKE} cleanall ) ;\
-        echo cleaning current directory ;\
-        (rm -f config.status Makefile *~ *.log romio.tar*) ;\
-        for dir in $$dirs ;\
-         do \
-            echo " " ;\
-	    if [ ! -d $$dir ] ; then continue ; fi ; \
-            echo cleaning directory $$dir ;\
-            (cd $$dir; rm -f *.o Makefile *~) ;\
-         done; \
-         echo " " ;\
-         echo "cleaning directory include" ;\
-         (cd include; rm -f *.h);\
-         echo " " ;\
-         echo "cleaning directory util" ;\
-         (cd util; rm -f romioinstall *~)
-	-rm -f lib
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
-install:
-	$(MAKE) clean
-	@./util/romioinstall -prefix=$(PREFIX)
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-# LAM added uninstall target
-uninstall:
-	@./util/romioinstall -prefix=$(PREFIX) -uninstall
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	mkdir $(distdir)
+	$(mkdir_p) $(distdir)/.. $(distdir)/include $(distdir)/test
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || mkdir "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="../$(top_distdir)" \
+	        distdir="../$(distdir)/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
 
-romio_lflags:
-	@echo '@ROMIO_LFLAGS@'
+dist-bzip2: distdir
+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
 
-romio_liblist:
-	@echo '@ROMIO_LIBLIST@'
+dist-tarZ: distdir
+	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
 
-romio_tcflags:
-	@echo '@ROMIO_TCFLAGS@'
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
 
-romio_tcppflags:
-	@echo '@ROMIO_TCPPFLAGS@'
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
 
-romio_tfflags:
-	@echo '@ROMIO_TFFLAGS@'
+dist dist-all: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
 
-# distclean the standard form for cleanall
-distclean: cleanall
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+distuninstallcheck:
+	@cd $(distuninstallcheck_dir) \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+	check-am clean clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES clean-recursive ctags ctags-recursive \
+	dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
+	dist-zip distcheck distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-recursive \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/README_OMPI

@@ -0,0 +1,22 @@
+Please note that this is *NOT* a vanilla 1.2.5.1 distribution of the
+ROMIO package from Argonne National Labs.  Various customizations had
+to be applied to the configuration process.  More to the point -- if
+replace this copy of ROMIO with a newer version, it will likely not
+work.  :-(
+
+- The Open MPI Team
+
+-----------------------------------------------------------------------------
+
+Local modifications:
+====================
+
+- Moved aclocal.m4 -> acinclude.m4
+- Bunches of changes in acinclude.m4 to make it work with modern
+  versions of the GNU auto tools -- see comments in file.
+- Bunches of changes in configure.in to make it work with modern
+  versions of the GNU auto tools -- see comments in file.
+- Added a full set of Makefile.am files; removed all prior Makefile's;
+  replaced most Makefile.in's.  Ignore mpi2-other and man directories.
+- Not all systems have snprintf(); include "util/printf.h" in
+  test/noncontig_coll.c

src/mca/io/romio/romio-dist/acconfig.h

@@ -1,54 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; -*- */
-/*  $Id: acconfig.h,v 1.3 2002/11/15 16:28:07 gropp Exp $
- *
- *  (C) 2001 by Argonne National Laboratory.
- *      See COPYRIGHT in top-level directory.
- */
-
-#undef AIO_HANDLE_IN_AIOCB
-#undef AIO_PRIORITY_DEFAULT
-#undef AIO_SIGNOTIFY_NONE
-#undef AIO_SUN
-#undef FREEBSD
-#undef HAVE_LONG_LONG_64
-#undef HAVE_MOUNT_NFS
-#undef HAVE_MPI_COMBINERS
-#undef HAVE_MPI_DARRAY_SUBARRAY
-#undef HAVE_MPI_INFO
-#undef HAVE_MPI_LONG_LONG_INT
-#undef HAVE_PRAGMA_CRI_DUP
-#undef HAVE_PRAGMA_HP_SEC_DEF
-#undef HAVE_PRAGMA_WEAK
-#undef HAVE_PREAD64
-#undef HAVE_STATUS_SET_BYTES
-#undef HAVE_STRERROR
-#undef HAVE_SYSERRLIST
-#undef HAVE_WEAK_SYMBOLS
-#undef HFS
-#undef HPUX
-#undef INT_LT_POINTER
-#undef IRIX
-#undef LINUX
-#undef MPICH
-#undef MPIHP
-#undef MPILAM
-#undef MPISGI
-#undef MPI_OFFSET_IS_INT
-#undef NEEDS_MPI_TEST
-#undef NFS
-#undef NO_AIO
-#undef NO_FD_IN_AIOCB
-#undef NO_MPI_SGI_type_is_contig
-#undef PARAGON
-#undef PFS
-#undef PIOFS
-#undef PRINT_ERR_MSG
-#undef ROMIO_PVFS
-#undef ROMIO_TESTFS
-#undef SFS
-#undef SOLARIS
-#undef SPPUX
-#undef SX4
-#undef UFS
-#undef XFS
-#undef NEEDS_AIOCB_T

src/mca/io/romio/romio-dist/acinclude.m4

@@ -7,8 +7,22 @@ dnl
 dnl Get the format of Fortran names.  Uses F77, FFLAGS, and sets WDEF.
 dnl If the test fails, sets NOF77 to 1, HAVE_FORTRAN to 0.
 dnl
+dnl Open MPI changes to this file:
 dnl
-define(PAC_GET_FORTNAMES,[
+dnl Removed definitions for:
+dnl - AC_PROG_ECH_N
+dnl - AC_FD_MSG
+dnl - AC_MSG_CHECKING
+dnl - AC_MSG
+dnl - AC_CHECKING
+dnl - AC_MSG_WARN
+dnl - AC_MSG_RESULT
+dnl - AC_TRY_LINK
+dnl
+dnl Changed all function defintions from "define(name...)" to 
+dnl "AC_DEFUN([name]...")
+dnl
+AC_DEFUN([PAC_GET_FORTNAMES],[
    rm -f confftest.f confftest.o
    cat > confftest.f <<EOF
        subroutine mpir_init_fop( a )
@@ -72,7 +86,7 @@ dnl directory) if provided to double check.
 dnl
 dnl Need a way to use "automounter fix" for this.
 dnl
-define(PAC_GETWD,[
+AC_DEFUN([PAC_GETWD],[
 $1=$PWD
 if test "${$1}" != "" -a -d "${$1}" ; then 
     if test -r ${$1}/.foo$$ ; then
@@ -129,7 +143,7 @@ dnl
 dnl sets var_for_size to the size.  Ignores if the size cannot be determined
 dnl (see aclocal.m4 in MPICH)
 dnl
-define(PAC_GET_TYPE_SIZE,
+AC_DEFUN([PAC_GET_TYPE_SIZE],
 [Pac_name="$1"
  Pac_varname=`echo "$Pac_name" | sed -e 's/ /_/g' -e 's/\*/star/g'`
 eval Pac_testval=\$"${Pac_varname}_len"
@@ -165,7 +179,7 @@ $2=$Pac_CV_NAME
 dnl
 dnl
 dnl
-define(PAC_INT_LT_POINTER,[
+AC_DEFUN([PAC_INT_LT_POINTER],[
 if test -z "$intsize" ; then
     PAC_GET_TYPE_SIZE(int,intsize)
 fi
@@ -187,65 +201,7 @@ fi
 ])dnl
 dnl
 dnl
-dnl Check whether to use -n, \c, or newline-tab to separate
-dnl checking messages from result messages.
-dnl from MPICH
-define(AC_PROG_ECHO_N,
-ac_echo_n=yes
-[if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-ac_echo_test=`echo foo 1>&1`
-if test -z "$ac_echo_test" ; then
-     print_error "Your sh shell does not handle the output redirection"
-     print_error "1>&1 correctly.  Configure will work around this problem,"
-     print_error "but you should report the problem to your vendor."
-fi
-])dnl
-dnl AC_MSG_CHECKING(FEATURE-DESCRIPTION)
-define(AC_FD_MSG,1)dnl
-define(AC_MSG_CHECKING,[dnl
-if test -z "$ac_echo_n" ; then
-AC_PROG_ECHO_N
-fi
-if test -z "$ac_echo_test" -a AC_FD_MSG = 1 ; then
-echo $ac_n "checking $1""... $ac_c"
-else
-echo $ac_n "checking $1""... $ac_c" 1>&AC_FD_MSG
-fi])dnl
-dnl
-dnl AC_MSG(msg)
-dnl generates "msg..." (no newline)
-define(AC_MSG,[dnl
-if test -z "$ac_echo_n" ; then
-AC_PROG_ECHO_N
-fi
-if test -z "$ac_echo_test" -a AC_FD_MSG = 1 ; then
-echo $ac_n "$1""... $ac_c"
-else
-echo $ac_n "$1""... $ac_c" 1>&AC_FD_MSG
-fi])dnl
-dnl
-dnl AC_CHECKING(FEATURE-DESCRIPTION)
-define(AC_CHECKING,dnl
-[echo "checking $1" 1>&AC_FD_MSG])dnl
-dnl
-dnl AC_MSG_RESULT(RESULT-DESCRIPTION)
-define(AC_MSG_RESULT,dnl
-if test -z "$ac_echo_test" -a AC_FD_MSG = 1 ; then
-[echo "$ac_t""$1"]
-else
-[echo "$ac_t""$1" 1>&AC_FD_MSG]
-fi)dnl
-dnl
-define(PAC_GET_SPECIAL_SYSTEM_INFO,[
+AC_DEFUN([PAC_GET_SPECIAL_SYSTEM_INFO],[
 #
 if test -n "$arch_IRIX"; then
    AC_MSG_CHECKING(for IRIX OS version)
@@ -254,19 +210,15 @@ if test -n "$arch_IRIX"; then
    dnl  For example
    dnl  IRIX_5_4400 (IRIX 5.x, using MIPS 4400)
    osversion=`uname -r | sed 's/\..*//'`
-   dnl Note that we need to allow brackets here, so we briefly turn off 
-   dnl the macro quotes
-   changequote(,)dnl
    dnl Get the second field (looking for 6.1)
-   osvminor=`uname -r | sed 's/[0-9]\.\([0-9]*\)\..*/\1/'`
+   osvminor=`uname -r | sed 's/[[]0-9[]]\.\([[]0-9[]]*\)\..*/\1/'`
    AC_MSG_RESULT($osversion)
    dnl Get SGI processor count by quick hack
    AC_MSG_CHECKING(for IRIX cpucount)
-   cpucount=`hinv | grep '[0-9]* [0-9]* MHZ IP[0-9]* Proc' | cut -f 1 -d' '`
+   cpucount=`hinv | grep '[[]0-9[]]* [[]0-9[]]* MHZ IP[[]0-9[]]* Proc' | cut -f 1 -d' '`
    if test "$cpucount" = "" ; then
-     cpucount=`hinv | grep 'Processor [0-9]*:' | wc -l | sed -e 's/ //g'`
+     cpucount=`hinv | grep 'Processor [[]0-9[]]*:' | wc -l | sed -e 's/ //g'`
    fi
-   changequote([,])dnl
    if test "$cpucount" = "" ; then
      print_error "Could not determine cpucount."
      print_error "Please send "
@@ -354,7 +306,7 @@ dnl
 dnl On an SGI check whether to link 32 bit objects or 64 bit objects
 dnl for the MPI-2 datatype accessor functions
 dnl
-define(PAC_CHECK_SGI_3264,[
+AC_DEFUN([PAC_CHECK_SGI_3264],[
 AC_MSG_CHECKING(for 32-bit or 64-bit objects)
 cat <<EOF >bittest.c
 main()
@@ -399,7 +351,7 @@ AC_MSG_RESULT($BITS bit)
 dnl
 dnl
 dnl
-define(PAC_TEST_MPI,[
+AC_DEFUN([PAC_TEST_MPI],[
   AC_MSG_CHECKING(if a simple MPI program compiles and links)
   rm -f mpitest.c
   cat > mpitest.c <<EOF
@@ -427,7 +379,7 @@ AC_MSG_RESULT(yes)
 dnl
 dnl
 dnl
-define(PAC_NEEDS_FINT,[
+AC_DEFUN([PAC_NEEDS_FINT],[
   AC_MSG_CHECKING(if MPI_Fint is defined in the MPI implementation)
   cat > mpitest1.c <<EOF
 #include "mpi.h"
@@ -453,7 +405,7 @@ EOF
 dnl
 dnl
 dnl
-define(PAC_LONG_64,[
+AC_DEFUN([PAC_LONG_64],[
 if test -z "$longsize" ; then
     PAC_GET_TYPE_SIZE(long,longsize)
 fi
@@ -467,7 +419,7 @@ fi
 ])dnl
 dnl
 dnl
-define(PAC_MPI_LONG_LONG_INT,[
+AC_DEFUN([PAC_MPI_LONG_LONG_INT],[
   AC_MSG_CHECKING(if MPI_LONG_LONG_INT is defined in mpi.h)
   rm -f mpitest.c
   cat > mpitest.c <<EOF
@@ -494,7 +446,7 @@ dnl
 dnl Check that the compile accepts ANSI prototypes. 
 dnl PAC_CHECK_CC_PROTOTYPES()
 dnl
-define(PAC_CHECK_CC_PROTOTYPES,[
+AC_DEFUN([PAC_CHECK_CC_PROTOTYPES],[
 AC_MSG_CHECKING(that the compiler $CC accepts ANSI prototypes)
 AC_COMPILE_CHECK(,[int f(double a){return 0;}],,eval "ac_cv_ccworks=yes",eval "ac_cv_ccworks=no")
 AC_MSG_RESULT($ac_cv_ccworks)
@@ -509,7 +461,7 @@ dnl
 dnl tests if the compiler prints long long correctly and whether to use
 dnl %ld or %lld. Called from within PAC_LONG_LONG_64.
 dnl
-define(PAC_TEST_LONG_LONG,
+AC_DEFUN([PAC_TEST_LONG_LONG],
 [AC_MSG_CHECKING([if the compiler prints long longs correctly with %lld])
 rm -f conftestll
 AC_TEST_PROGRAM([#include <stdio.h>
@@ -563,7 +515,7 @@ dnl
 dnl
 dnl PAC_LONG_LONG_64: check if there is a 64-bit long long
 dnl
-define(PAC_LONG_LONG_64,[
+AC_DEFUN([PAC_LONG_LONG_64],[
 if test -n "$longlongsize" ; then
     if test "$longlongsize" = 8 ; then
        echo "defining MPI_Offset as long long in C and integer*8 in Fortran" 
@@ -635,7 +587,7 @@ fi
 ])dnl
 dnl
 dnl
-define(PAC_MPI_INFO,[
+AC_DEFUN([PAC_MPI_INFO],[
   AC_MSG_CHECKING(if MPI_Info functions are defined in the MPI implementation)
   rm -f mpitest.c
   cat > mpitest.c <<EOF
@@ -670,7 +622,7 @@ EOF
 ])dnl
 dnl
 dnl
-define(PAC_MPI_DARRAY_SUBARRAY,[
+AC_DEFUN([PAC_MPI_DARRAY_SUBARRAY],[
   AC_MSG_CHECKING(if darray and subarray constructors are defined in the MPI implementation)
   rm -f mpitest.c
   cat > mpitest.c <<EOF
@@ -713,7 +665,7 @@ EOF
 ])dnl
 dnl
 dnl
-define(PAC_CHECK_MPI_SGI_INFO_NULL,[
+AC_DEFUN([PAC_CHECK_MPI_SGI_INFO_NULL],[
   AC_MSG_CHECKING(if MPI_INFO_NULL is defined in mpi.h)
   rm -f mpitest.c
   cat > mpitest.c <<EOF
@@ -737,7 +689,7 @@ EOF
 dnl
 dnl
 dnl
-define(PAC_CHECK_MPIOF_H,[
+AC_DEFUN([PAC_CHECK_MPIOF_H],[
   AC_MSG_CHECKING(if mpiof.h is included in mpif.h)
   rm -f mpitest.f
   cat > mpitest.f <<EOF
@@ -763,7 +715,7 @@ dnl
 dnl
 dnl check if pread64 is defined in IRIX. needed on IRIX 6.5
 dnl
-define(PAC_HAVE_PREAD64,[
+AC_DEFUN([PAC_HAVE_PREAD64],[
   AC_MSG_CHECKING(if pread64 is defined)
   rm -f conftest.c
   cat > conftest.c <<EOF
@@ -787,7 +739,7 @@ rm -f conftest conftest.c
 ])dnl
 dnl
 dnl
-define(PAC_TEST_MPI_SGI_type_is_contig,[
+AC_DEFUN([PAC_TEST_MPI_SGI_type_is_contig],[
   AC_MSG_CHECKING(if MPI_SGI_type_is_contig is defined)
   rm -f mpitest.c
   cat > mpitest.c <<EOF
@@ -815,7 +767,7 @@ EOF
 dnl
 dnl
 dnl
-define(PAC_TEST_MPI_COMBINERS,[
+AC_DEFUN([PAC_TEST_MPI_COMBINERS],[
   AC_MSG_CHECKING(if MPI-2 combiners are defined in mpi.h)
   rm -f mpitest.c
   cat > mpitest.c <<EOF
@@ -845,7 +797,7 @@ dnl PAC_MPI_OFFSET_KIND()
 dnl
 dnl tries to determine the Fortran 90 kind parameter for 8-byte integers
 dnl
-define(PAC_MPI_OFFSET_KIND,
+AC_DEFUN([PAC_MPI_OFFSET_KIND],
 [AC_MSG_CHECKING([for Fortran 90 KIND parameter for 8-byte integers])
 rm -f kind.f kind.o kind
 cat <<EOF > kind.f
@@ -879,7 +831,7 @@ fi
 ])dnl
 dnl
 dnl
-define(PAC_TEST_MPI_HAVE_OFFSET_KIND,[
+AC_DEFUN([PAC_TEST_MPI_HAVE_OFFSET_KIND],[
   AC_MSG_CHECKING(if MPI_OFFSET_KIND is defined in mpif.h)
   rm -f mpitest.f
   cat > mpitest.f <<EOF
@@ -907,7 +859,7 @@ dnl
 dnl PAC_GET_XFS_MEMALIGN
 dnl 
 dnl
-define(PAC_GET_XFS_MEMALIGN,
+AC_DEFUN([PAC_GET_XFS_MEMALIGN],
 [AC_MSG_CHECKING([for memory alignment needed for direct I/O])
 /bin/rm -f memalignval
 /bin/rm -f /tmp/romio_tmp.bin
@@ -945,7 +897,7 @@ dnl Defines VPATH or .PATH with . $(srcdir)
 dnl Requires that vpath work with implicit targets
 dnl NEED TO DO: Check that $< works on explicit targets.
 dnl
-define(PAC_MAKE_VPATH,[
+AC_DEFUN([PAC_MAKE_VPATH],[
 AC_SUBST(VPATH)
 AC_MSG_CHECKING(for virtual path format)
 rm -rf conftest*
@@ -989,7 +941,7 @@ dnl which is a big problem for scripts like mpireconfig that are wrappers
 dnl around config.status).  The bug is in not recognizing that ./ and .//
 dnl are the same  directory as . (in fact, ./[/]* is the same).
 dnl
-define(PAC_FIXUP_SRCDIR,[
+AC_DEFUN([PAC_FIXUP_SRCDIR],[
 # Find the source files, if location was not specified.
 if test "$srcdirdefaulted" = "yes" ; then
   srcdir=""
@@ -1023,42 +975,7 @@ case $srcdir in
 esac
 ])
 dnl
-dnl
-dnl AC_TRY_LINK(INCLUDES, FUNCTION-BODY,
-dnl             ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
-define(AC_TRY_LINK,
-if test -z "$ac_ext" ; then 
-    ac_ext=c
-fi
-[cat > conftest.$ac_ext <<EOF
-dnl This sometimes fails to find confdefs.h, for some reason.
-dnl [#]line __oline__ "[$]0"
-dnl [#]line __oline__ "configure"
-#include "confdefs.h"
-[$1]
-int main() { return 0; }
-int t() {
-[$2]
-; return 0; }
-EOF
-rm -f conftest.out
-if test -z "$ac_link" ; then
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >conftest.out 2>&1'
-fi
-if eval $ac_link; then
-  ifelse([$3], , :, [rm -rf conftest*
-  $3])
-else
-  if test -s conftest.out ; then cat conftest.out >> config.log ; fi
-ifelse([$4], , , [rm -rf conftest*
-  $4
-])dnl
-fi
-rm -f conftest*]
-)dnl
-dnl
-dnl
-define(PAC_HAVE_MOUNT_NFS,[
+AC_DEFUN([PAC_HAVE_MOUNT_NFS],[
   AC_MSG_CHECKING([if MOUNT_NFS is defined in the include files])
   rm -f conftest.c
   cat > conftest.c <<EOF
@@ -1085,7 +1002,7 @@ dnl PAC_MPI_OFFSET_KIND_4BYTE()
 dnl
 dnl tries to determine the Fortran 90 kind parameter for 4-byte integers
 dnl
-define(PAC_MPI_OFFSET_KIND_4BYTE,
+AC_DEFUN([PAC_MPI_OFFSET_KIND_4BYTE],
 [AC_MSG_CHECKING([for Fortran 90 KIND parameter for 4-byte integers])
 rm -f kind.f kind.o kind
 cat <<EOF > kind.f
@@ -1119,7 +1036,7 @@ fi
 ])dnl
 dnl
 dnl
-define(PAC_FUNC_STRERROR,[
+AC_DEFUN([PAC_FUNC_STRERROR],[
   AC_MSG_CHECKING([for strerror()])
   rm -f conftest.c
   cat > conftest.c <<EOF
@@ -1162,7 +1079,7 @@ changequote([,])
 dnl
 dnl
 dnl
-define(PAC_C_INLINE,[
+AC_DEFUN([PAC_C_INLINE],[
 AC_MSG_CHECKING([for inline])
 if eval "test \"`echo '$''{'pac_cv_c_inline'+set}'`\" = set"; then
    AC_MSG_RESULT([(cached)])
@@ -1175,7 +1092,6 @@ if test "$pac_cv_c_inline" = "no" ; then
     AC_DEFINE(inline,,[Define if inline is not supported])
 fi
 ])dnl
-define(AC_MSG_WARN,[AC_MSG_RESULT([Warning: $1])])
 dnl
 dnl PAC_CHECK_HEADER(HEADER-FILE, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND],
 dnl PRE-REQ-HEADERS )
@@ -1191,7 +1107,7 @@ dnl For example
 dnl PAC_CHECK_HEADER(sys/vfs.h,AC_DEFINE(HAVE_SYS_VFS_H),,
 dnl                  [#include <sys/types.h>])
 dnl
-define(PAC_CHECK_HEADER,dnl
+AC_DEFUN([PAC_CHECK_HEADER],dnl
 [dnl Do the transliteration at runtime so arg 1 can be a shell variable.
 changequote(,)dnl
 ac_safe=`echo "$1" | tr '[a-z]./' '[A-Z]__'`
@@ -1212,7 +1128,7 @@ fi
 ])dnl
 dnl
 dnl PAC_CHECK_HEADERS(HEADER-FILE... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-define(PAC_CHECK_HEADERS,[for ac_hdr in $1
+AC_DEFUN([PAC_CHECK_HEADERS],[for ac_hdr in $1
 do
 PAC_CHECK_HEADER($ac_hdr,
 [changequote(, )dnl
@@ -1222,7 +1138,7 @@ changequote([, ])dnl
 done
 ])dnl
 dnl
-define(PAC_TEST_MPIR_STATUS_SET_BYTES,[
+AC_DEFUN([PAC_TEST_MPIR_STATUS_SET_BYTES],[
   AC_MSG_CHECKING(if MPIR_Status_set_bytes is defined)
   rm -f mpitest.c
   cat > mpitest.c <<EOF

src/mca/io/romio/romio-dist/adio/Makefile.am

@@ -2,23 +2,109 @@
 # $HEADER$
 #
 
-include $(top_srcdir)/config/Makefile.options
+include $(top_ompi_srcdir)/config/Makefile.options
 
 AM_CPPFLAGS = -DHAVE_MPI_INFO \
         -I$(top_ompi_builddir)/src/include \
         -I$(top_ompi_srcdir)/src \
         -I$(top_ompi_srcdir)/src/include
 
-SUBDIRS = common ad_ufs ad_nfs #ad_pvfs ad_xfs
+# Conditionals whether to build each subdir or not
+
+if BUILD_HFS
+HFS_DIR = ad_hfs
+HFS_LIB = ad_hfs/libadio_hfs.la
+else
+HFS_DIR =
+HFS_LIB =
+endif
+
+if BUILD_NFS
+NFS_DIR = ad_nfs
+NFS_LIB = ad_nfs/libadio_nfs.la
+else
+NFS_DIR =
+NFS_LIB =
+endif
+
+# Currently disabled
+#if BUILD_NTFS
+#NTFS_DIR = ad_ntfs
+#NTFS_LIB = ad_ntfs/libadio_ntfs.la
+#else
+#NTFS_DIR =
+#NTFS_LIB =
+#endif
+
+if BUILD_PFS
+PFS_DIR = ad_pfs
+PFS_LIB = ad_pfs/libadio_pfs.la
+else
+PFS_DIR =
+PFS_LIB =
+endif
+
+if BUILD_PIOFS
+PIOFS_DIR = ad_piofs
+PIOFS_LIB = ad_piofs/libadio_piofs.la
+else
+PIOFS_DIR =
+PIOFS_LIB =
+endif
+
+if BUILD_PVFS
+PVFS_DIR = ad_pvfs
+PVFS_LIB = ad_pvfs/libadio_pvfs.la
+else
+PVFS_DIR =
+PVFS_LIB =
+endif
+
+if BUILD_SFS
+SFS_DIR = ad_sfs
+SFS_LIB = ad_sfs/libadio_sfs.la
+else
+SFS_DIR =
+SFS_LIB =
+endif
+
+if BUILD_TESTFS
+TESTFS_DIR = ad_testfs
+TESTFS_LIB = ad_testfs/libadio_testfs.la
+else
+TESTFS_DIR =
+TESTFS_LIB =
+endif
+
+if BUILD_UFS
+UFS_DIR = ad_ufs
+UFS_LIB = ad_ufs/libadio_ufs.la
+else
+UFS_DIR =
+UFS_LIB =
+endif
+
+if BUILD_XFS
+XFS_DIR = ad_xfs
+XFS_LIB = ad_xfs/libadio_xfs.la
+else
+XFS_DIR =
+XFS_LIB =
+endif
+
+SUBDIRS = common include \
+        $(HFS_DIR) $(NFS_DIR) $(NTFS_DIR) $(PFS_DIR) $(PIOFS_DIR) \
+        $(PVFS_DIR) $(SFS_DIR) $(TESTFS_DIR) $(UFS_DIR) $(XFS_DIR)
+DIST_SUBDIRS = common include \
+        ad_hfs ad_nfs ad_ntfs ad_pfs ad_piofs ad_pvfs \
+        ad_sfs ad_testfs ad_ufs ad_xfs include
 
 # Library
-noinst_LTLIBRARIES = libmca_io_romio_romio_dist_adio.la
-libmca_io_romio_romio_dist_adio_la_SOURCES =
-libmca_io_romio_romio_dist_adio_la_LIBADD = \
-        common/libmca_io_romio_romio_dist_adio_common.la \
-        ad_ufs/libmca_io_romio_romio_dist_adio_ad_ufs.la \
-        ad_nfs/libmca_io_romio_romio_dist_adio_ad_nfs.la 
-	
-libmca_io_romio_romio_dist_adio_la_DEPENDENCIES = \
-        $(libmca_io_romio_romio_dist_adio_la_LIBADD)
-
+noinst_LTLIBRARIES = libadio.la
+libadio_la_SOURCES =
+libadio_la_LIBADD = \
+        common/libadio_common.la \
+        $(HFS_LIB) $(NFS_LIB) $(NTFS_LIB) $(PFS_LIB) $(PIOFS_LIB) \
+        $(PVFS_LIB) $(SFS_LIB) $(TESTFS_LIB) $(UFS_LIB) $(XFS_LIB)
+libadio_la_DEPENDENCIES = \
+        $(adio_la_LIBADD)

src/mca/io/romio/romio-dist/adio/Makefile.in

@@ -0,0 +1,643 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $HEADER$
+#
+
+SOURCES = $(libadio_la_SOURCES)
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = adio
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+@BUILD_HFS_TRUE@am__DEPENDENCIES_1 = ad_hfs/libadio_hfs.la
+@BUILD_NFS_TRUE@am__DEPENDENCIES_2 = ad_nfs/libadio_nfs.la
+@BUILD_PFS_TRUE@am__DEPENDENCIES_3 = ad_pfs/libadio_pfs.la
+@BUILD_PIOFS_TRUE@am__DEPENDENCIES_4 = ad_piofs/libadio_piofs.la
+@BUILD_PVFS_TRUE@am__DEPENDENCIES_5 = ad_pvfs/libadio_pvfs.la
+@BUILD_SFS_TRUE@am__DEPENDENCIES_6 = ad_sfs/libadio_sfs.la
+@BUILD_TESTFS_TRUE@am__DEPENDENCIES_7 = ad_testfs/libadio_testfs.la
+@BUILD_UFS_TRUE@am__DEPENDENCIES_8 = ad_ufs/libadio_ufs.la
+@BUILD_XFS_TRUE@am__DEPENDENCIES_9 = ad_xfs/libadio_xfs.la
+am_libadio_la_OBJECTS =
+libadio_la_OBJECTS = $(am_libadio_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libadio_la_SOURCES)
+DIST_SOURCES = $(libadio_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+AM_CPPFLAGS = -DHAVE_MPI_INFO \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+@BUILD_HFS_FALSE@HFS_DIR = 
+
+# Conditionals whether to build each subdir or not
+@BUILD_HFS_TRUE@HFS_DIR = ad_hfs
+@BUILD_HFS_FALSE@HFS_LIB = 
+@BUILD_HFS_TRUE@HFS_LIB = ad_hfs/libadio_hfs.la
+@BUILD_NFS_FALSE@NFS_DIR = 
+@BUILD_NFS_TRUE@NFS_DIR = ad_nfs
+@BUILD_NFS_FALSE@NFS_LIB = 
+@BUILD_NFS_TRUE@NFS_LIB = ad_nfs/libadio_nfs.la
+@BUILD_PFS_FALSE@PFS_DIR = 
+
+# Currently disabled
+#if BUILD_NTFS
+#NTFS_DIR = ad_ntfs
+#NTFS_LIB = ad_ntfs/libadio_ntfs.la
+#else
+#NTFS_DIR =
+#NTFS_LIB =
+#endif
+@BUILD_PFS_TRUE@PFS_DIR = ad_pfs
+@BUILD_PFS_FALSE@PFS_LIB = 
+@BUILD_PFS_TRUE@PFS_LIB = ad_pfs/libadio_pfs.la
+@BUILD_PIOFS_FALSE@PIOFS_DIR = 
+@BUILD_PIOFS_TRUE@PIOFS_DIR = ad_piofs
+@BUILD_PIOFS_FALSE@PIOFS_LIB = 
+@BUILD_PIOFS_TRUE@PIOFS_LIB = ad_piofs/libadio_piofs.la
+@BUILD_PVFS_FALSE@PVFS_DIR = 
+@BUILD_PVFS_TRUE@PVFS_DIR = ad_pvfs
+@BUILD_PVFS_FALSE@PVFS_LIB = 
+@BUILD_PVFS_TRUE@PVFS_LIB = ad_pvfs/libadio_pvfs.la
+@BUILD_SFS_FALSE@SFS_DIR = 
+@BUILD_SFS_TRUE@SFS_DIR = ad_sfs
+@BUILD_SFS_FALSE@SFS_LIB = 
+@BUILD_SFS_TRUE@SFS_LIB = ad_sfs/libadio_sfs.la
+@BUILD_TESTFS_FALSE@TESTFS_DIR = 
+@BUILD_TESTFS_TRUE@TESTFS_DIR = ad_testfs
+@BUILD_TESTFS_FALSE@TESTFS_LIB = 
+@BUILD_TESTFS_TRUE@TESTFS_LIB = ad_testfs/libadio_testfs.la
+@BUILD_UFS_FALSE@UFS_DIR = 
+@BUILD_UFS_TRUE@UFS_DIR = ad_ufs
+@BUILD_UFS_FALSE@UFS_LIB = 
+@BUILD_UFS_TRUE@UFS_LIB = ad_ufs/libadio_ufs.la
+@BUILD_XFS_FALSE@XFS_DIR = 
+@BUILD_XFS_TRUE@XFS_DIR = ad_xfs
+@BUILD_XFS_FALSE@XFS_LIB = 
+@BUILD_XFS_TRUE@XFS_LIB = ad_xfs/libadio_xfs.la
+SUBDIRS = common include \
+        $(HFS_DIR) $(NFS_DIR) $(NTFS_DIR) $(PFS_DIR) $(PIOFS_DIR) \
+        $(PVFS_DIR) $(SFS_DIR) $(TESTFS_DIR) $(UFS_DIR) $(XFS_DIR)
+
+DIST_SUBDIRS = common include \
+        ad_hfs ad_nfs ad_ntfs ad_pfs ad_piofs ad_pvfs \
+        ad_sfs ad_testfs ad_ufs ad_xfs include
+
+
+# Library
+noinst_LTLIBRARIES = libadio.la
+libadio_la_SOURCES = 
+libadio_la_LIBADD = \
+        common/libadio_common.la \
+        $(HFS_LIB) $(NFS_LIB) $(NTFS_LIB) $(PFS_LIB) $(PIOFS_LIB) \
+        $(PVFS_LIB) $(SFS_LIB) $(TESTFS_LIB) $(UFS_LIB) $(XFS_LIB)
+
+libadio_la_DEPENDENCIES = \
+        $(adio_la_LIBADD)
+
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  adio/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  adio/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libadio.la: $(libadio_la_OBJECTS) $(libadio_la_DEPENDENCIES) 
+	$(LINK)  $(libadio_la_LDFLAGS) $(libadio_la_OBJECTS) $(libadio_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $$MAKEFLAGS; amf=$$2; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || mkdir "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="../$(top_distdir)" \
+	        distdir="../$(distdir)/$$subdir" \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	clean-recursive ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-recursive distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am

@@ -0,0 +1,31 @@
+#
+# $HEADER$
+#
+
+include $(top_ompi_srcdir)/config/Makefile.options
+
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_hfs.la
+libadio_hfs_la_SOURCES = \
+        ad_hfs.c \
+        ad_hfs.h \
+        ad_hfs_close.c \
+        ad_hfs_done.c \
+        ad_hfs_fcntl.c \
+        ad_hfs_flush.c \
+        ad_hfs_hints.c \
+        ad_hfs_iread.c \
+        ad_hfs_iwrite.c \
+        ad_hfs_open.c \
+        ad_hfs_rdcoll.c \
+        ad_hfs_read.c \
+        ad_hfs_resize.c \
+        ad_hfs_seek.c \
+        ad_hfs_wait.c \
+        ad_hfs_wrcoll.c \
+        ad_hfs_write.c

src/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.in

@@ -1,26 +1,557 @@
-CC          = @CC@
-AR          = @AR@
-LIBNAME     = @LIBNAME@
-srcdir      = @srcdir@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-CFLAGS      = @CFLAGS@ $(INCLUDE_DIR)
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-@VPATH@
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-AD_HFS_OBJECTS = ad_hfs_close.o ad_hfs_read.o  \
-      ad_hfs_wrcoll.o ad_hfs_open.o ad_hfs_write.o ad_hfs_done.o \
-      ad_hfs_fcntl.o ad_hfs_iread.o ad_hfs_iwrite.o ad_hfs_wait.o \
-      ad_hfs_resize.o ad_hfs_seek.o \
-      ad_hfs.o
+@SET_MAKE@
 
-default: $(LIBNAME)
+#
+# $HEADER$
+#
+
+SOURCES = $(libadio_hfs_la_SOURCES)
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = adio/ad_hfs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libadio_hfs_la_LIBADD =
+am_libadio_hfs_la_OBJECTS = ad_hfs.lo ad_hfs_close.lo ad_hfs_done.lo \
+	ad_hfs_fcntl.lo ad_hfs_flush.lo ad_hfs_hints.lo \
+	ad_hfs_iread.lo ad_hfs_iwrite.lo ad_hfs_open.lo \
+	ad_hfs_rdcoll.lo ad_hfs_read.lo ad_hfs_resize.lo \
+	ad_hfs_seek.lo ad_hfs_wait.lo ad_hfs_wrcoll.lo ad_hfs_write.lo
+libadio_hfs_la_OBJECTS = $(am_libadio_hfs_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ad_hfs.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_close.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_done.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_fcntl.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_flush.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_hints.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_iread.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_iwrite.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_open.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_rdcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_read.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_resize.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_seek.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_wait.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_wrcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hfs_write.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libadio_hfs_la_SOURCES)
+DIST_SOURCES = $(libadio_hfs_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_hfs.la
+libadio_hfs_la_SOURCES = \
+        ad_hfs.c \
+        ad_hfs.h \
+        ad_hfs_close.c \
+        ad_hfs_done.c \
+        ad_hfs_fcntl.c \
+        ad_hfs_flush.c \
+        ad_hfs_hints.c \
+        ad_hfs_iread.c \
+        ad_hfs_iwrite.c \
+        ad_hfs_open.c \
+        ad_hfs_rdcoll.c \
+        ad_hfs_read.c \
+        ad_hfs_resize.c \
+        ad_hfs_seek.c \
+        ad_hfs_wait.c \
+        ad_hfs_wrcoll.c \
+        ad_hfs_write.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  adio/ad_hfs/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  adio/ad_hfs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libadio_hfs.la: $(libadio_hfs_la_OBJECTS) $(libadio_hfs_la_DEPENDENCIES) 
+	$(LINK)  $(libadio_hfs_la_LDFLAGS) $(libadio_hfs_la_OBJECTS) $(libadio_hfs_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_done.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_fcntl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_hints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_iread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_iwrite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_rdcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_resize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_seek.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_wait.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_wrcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hfs_write.Plo@am__quote@
 
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
-$(LIBNAME): $(AD_HFS_OBJECTS)
-	$(AR) $(LIBNAME) $(AD_HFS_OBJECTS)
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-clean:
-	@rm -f *.o
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am

@@ -1,21 +1,34 @@
-# -*- makefile -*-
 #
 # $HEADER$
 #
 
 include $(top_ompi_srcdir)/config/Makefile.options
 
-AM_CPPFLAGS = -DHAVE_MPI_INFO \
-        -DNO_AIO -DNFS -I$(top_ompi_builddir)/src/include \
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
-        -I../../adio/include -I../../include -I../../../src
+        -I$(top_ompi_srcdir)/src/include
 
-noinst_LTLIBRARIES = libmca_io_romio_romio_dist_adio_ad_nfs.la
-libmca_io_romio_romio_dist_adio_ad_nfs_la_SOURCES = \
-    ad_nfs.c ad_nfs_close.c ad_nfs_done.c ad_nfs_fcntl.c           \
-    ad_nfs_flush.c ad_nfs_getsh.c ad_nfs_hints.c ad_nfs_iread.c    \
-    ad_nfs_iwrite.c ad_nfs_open.c ad_nfs_rdcoll.c ad_nfs_read.c    \
-    ad_nfs_resize.c ad_nfs_seek.c ad_nfs_setsh.c ad_nfs_wait.c     \
-    ad_nfs_wrcoll.c ad_nfs_write.c
+noinst_LTLIBRARIES = libadio_nfs.la
+libadio_nfs_la_SOURCES = \
+        ad_nfs.c \
+        ad_nfs.h \
+        ad_nfs_close.c \
+        ad_nfs_done.c \
+        ad_nfs_fcntl.c \
+        ad_nfs_flush.c \
+        ad_nfs_getsh.c \
+        ad_nfs_hints.c \
+        ad_nfs_iread.c \
+        ad_nfs_iwrite.c \
+        ad_nfs_open.c \
+        ad_nfs_rdcoll.c \
+        ad_nfs_read.c \
+        ad_nfs_resize.c \
+        ad_nfs_seek.c \
+        ad_nfs_setsh.c \
+        ad_nfs_wait.c \
+        ad_nfs_wrcoll.c \
+        ad_nfs_write.c
 

src/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.in

@@ -1,26 +1,566 @@
-CC          = @CC@
-AR          = @AR@
-LIBNAME     = @LIBNAME@
-srcdir      = @srcdir@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-CFLAGS      = @CFLAGS@ $(INCLUDE_DIR)
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-@VPATH@
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-AD_NFS_OBJECTS = ad_nfs_close.o ad_nfs_read.o \
-      ad_nfs_open.o ad_nfs_write.o ad_nfs_done.o \
-      ad_nfs_fcntl.o ad_nfs_iread.o ad_nfs_iwrite.o ad_nfs_wait.o \
-      ad_nfs_resize.o \
-      ad_nfs_setsh.o ad_nfs_getsh.o ad_nfs.o
+@SET_MAKE@
 
-default: $(LIBNAME)
+#
+# $HEADER$
+#
+
+SOURCES = $(libadio_nfs_la_SOURCES)
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = adio/ad_nfs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libadio_nfs_la_LIBADD =
+am_libadio_nfs_la_OBJECTS = ad_nfs.lo ad_nfs_close.lo ad_nfs_done.lo \
+	ad_nfs_fcntl.lo ad_nfs_flush.lo ad_nfs_getsh.lo \
+	ad_nfs_hints.lo ad_nfs_iread.lo ad_nfs_iwrite.lo \
+	ad_nfs_open.lo ad_nfs_rdcoll.lo ad_nfs_read.lo \
+	ad_nfs_resize.lo ad_nfs_seek.lo ad_nfs_setsh.lo ad_nfs_wait.lo \
+	ad_nfs_wrcoll.lo ad_nfs_write.lo
+libadio_nfs_la_OBJECTS = $(am_libadio_nfs_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ad_nfs.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_close.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_done.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_fcntl.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_flush.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_getsh.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_hints.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_iread.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_iwrite.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_open.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_rdcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_read.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_resize.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_seek.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_setsh.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_wait.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_wrcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_nfs_write.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libadio_nfs_la_SOURCES)
+DIST_SOURCES = $(libadio_nfs_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_nfs.la
+libadio_nfs_la_SOURCES = \
+        ad_nfs.c \
+        ad_nfs.h \
+        ad_nfs_close.c \
+        ad_nfs_done.c \
+        ad_nfs_fcntl.c \
+        ad_nfs_flush.c \
+        ad_nfs_getsh.c \
+        ad_nfs_hints.c \
+        ad_nfs_iread.c \
+        ad_nfs_iwrite.c \
+        ad_nfs_open.c \
+        ad_nfs_rdcoll.c \
+        ad_nfs_read.c \
+        ad_nfs_resize.c \
+        ad_nfs_seek.c \
+        ad_nfs_setsh.c \
+        ad_nfs_wait.c \
+        ad_nfs_wrcoll.c \
+        ad_nfs_write.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  adio/ad_nfs/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  adio/ad_nfs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libadio_nfs.la: $(libadio_nfs_la_OBJECTS) $(libadio_nfs_la_DEPENDENCIES) 
+	$(LINK)  $(libadio_nfs_la_LDFLAGS) $(libadio_nfs_la_OBJECTS) $(libadio_nfs_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_done.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_fcntl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_getsh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_hints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_iread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_iwrite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_rdcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_resize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_seek.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_setsh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_wait.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_wrcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_nfs_write.Plo@am__quote@
 
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
-$(LIBNAME): $(AD_NFS_OBJECTS)
-	$(AR) $(LIBNAME) $(AD_NFS_OBJECTS)
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-clean:
-	@rm -f *.o
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am

@@ -0,0 +1,31 @@
+#
+# $HEADER$
+#
+
+include $(top_ompi_srcdir)/config/Makefile.options
+
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_ntfs.la
+libadio_ntfs_la_SOURCES = \
+        ad_ntfs.c \
+        ad_ntfs.h \
+        ad_ntfs_close.c \
+        ad_ntfs_done.c \
+        ad_ntfs_fcntl.c \
+        ad_ntfs_flush.c \
+        ad_ntfs_hints.c \
+        ad_ntfs_iread.c \
+        ad_ntfs_iwrite.c \
+        ad_ntfs_open.c \
+        ad_ntfs_rdcoll.c \
+        ad_ntfs_read.c \
+        ad_ntfs_resize.c \
+        ad_ntfs_seek.c \
+        ad_ntfs_wait.c \
+        ad_ntfs_wrcoll.c \
+        ad_ntfs_write.c

src/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am

@@ -0,0 +1,31 @@
+#
+# $HEADER$
+#
+
+include $(top_ompi_srcdir)/config/Makefile.options
+
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_pfs.la
+libadio_pfs_la_SOURCES = \
+        ad_pfs.c \
+        ad_pfs_close.c \
+        ad_pfs_done.c \
+        ad_pfs_fcntl.c \
+        ad_pfs_flush.c \
+        ad_pfs.h \
+        ad_pfs_hints.c \
+        ad_pfs_iread.c \
+        ad_pfs_iwrite.c \
+        ad_pfs_open.c \
+        ad_pfs_rdcoll.c \
+        ad_pfs_read.c \
+        ad_pfs_resize.c \
+        ad_pfs_seek.c \
+        ad_pfs_wait.c \
+        ad_pfs_wrcoll.c \
+        ad_pfs_write.c

src/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.in

@@ -1,27 +1,557 @@
-CC          = @CC@
-AR          = @AR@
-LIBNAME     = @LIBNAME@
-srcdir      = @srcdir@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@  -I${srcdir}/../include -I../include
-CFLAGS      = @CFLAGS@ $(INCLUDE_DIR)
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-@VPATH@
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-AD_PFS_OBJECTS = ad_pfs_close.o ad_pfs_read.o \
-      ad_pfs_open.o ad_pfs_write.o ad_pfs_done.o \
-      ad_pfs_fcntl.o ad_pfs_iread.o ad_pfs_iwrite.o ad_pfs_wait.o \
-      ad_pfs_flush.o ad_pfs_seek.o ad_pfs_resize.o ad_pfs_hints.o \
-      ad_pfs.o
+@SET_MAKE@
 
+#
+# $HEADER$
+#
 
-default: $(LIBNAME)
+SOURCES = $(libadio_pfs_la_SOURCES)
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = adio/ad_pfs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libadio_pfs_la_LIBADD =
+am_libadio_pfs_la_OBJECTS = ad_pfs.lo ad_pfs_close.lo ad_pfs_done.lo \
+	ad_pfs_fcntl.lo ad_pfs_flush.lo ad_pfs_hints.lo \
+	ad_pfs_iread.lo ad_pfs_iwrite.lo ad_pfs_open.lo \
+	ad_pfs_rdcoll.lo ad_pfs_read.lo ad_pfs_resize.lo \
+	ad_pfs_seek.lo ad_pfs_wait.lo ad_pfs_wrcoll.lo ad_pfs_write.lo
+libadio_pfs_la_OBJECTS = $(am_libadio_pfs_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ad_pfs.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_close.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_done.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_fcntl.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_flush.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_hints.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_iread.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_iwrite.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_open.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_rdcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_read.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_resize.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_seek.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_wait.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_wrcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pfs_write.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libadio_pfs_la_SOURCES)
+DIST_SOURCES = $(libadio_pfs_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_pfs.la
+libadio_pfs_la_SOURCES = \
+        ad_pfs.c \
+        ad_pfs_close.c \
+        ad_pfs_done.c \
+        ad_pfs_fcntl.c \
+        ad_pfs_flush.c \
+        ad_pfs.h \
+        ad_pfs_hints.c \
+        ad_pfs_iread.c \
+        ad_pfs_iwrite.c \
+        ad_pfs_open.c \
+        ad_pfs_rdcoll.c \
+        ad_pfs_read.c \
+        ad_pfs_resize.c \
+        ad_pfs_seek.c \
+        ad_pfs_wait.c \
+        ad_pfs_wrcoll.c \
+        ad_pfs_write.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  adio/ad_pfs/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  adio/ad_pfs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libadio_pfs.la: $(libadio_pfs_la_OBJECTS) $(libadio_pfs_la_DEPENDENCIES) 
+	$(LINK)  $(libadio_pfs_la_LDFLAGS) $(libadio_pfs_la_OBJECTS) $(libadio_pfs_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_done.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_fcntl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_hints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_iread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_iwrite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_rdcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_resize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_seek.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_wait.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_wrcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pfs_write.Plo@am__quote@
 
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
-$(LIBNAME): $(AD_PFS_OBJECTS)
-	$(AR) $(LIBNAME) $(AD_PFS_OBJECTS)
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-clean:
-	@rm -f *.o
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am

@@ -0,0 +1,31 @@
+#
+# $HEADER$
+#
+
+include $(top_ompi_srcdir)/config/Makefile.options
+
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_piofs.la
+libadio_piofs_la_SOURCES = \
+        ad_piofs.c \
+        ad_piofs.h \
+        ad_piofs_close.c \
+        ad_piofs_done.c \
+        ad_piofs_fcntl.c \
+        ad_piofs_flush.c \
+        ad_piofs_hints.c \
+        ad_piofs_iread.c \
+        ad_piofs_iwrite.c \
+        ad_piofs_open.c \
+        ad_piofs_rdcoll.c \
+        ad_piofs_read.c \
+        ad_piofs_resize.c \
+        ad_piofs_seek.c \
+        ad_piofs_wait.c \
+        ad_piofs_wrcoll.c \
+        ad_piofs_write.c

src/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.in

@@ -1,27 +1,558 @@
-CC          = @CC@
-AR          = @AR@
-LIBNAME     = @LIBNAME@
-srcdir      = @srcdir@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-CFLAGS      = @CFLAGS@ $(INCLUDE_DIR)
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-@VPATH@
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-AD_PIOFS_OBJECTS = ad_piofs_close.o ad_piofs_read.o \
-      ad_piofs_open.o ad_piofs_write.o ad_piofs_done.o \
-      ad_piofs_fcntl.o ad_piofs_iread.o ad_piofs_iwrite.o ad_piofs_wait.o \
-      ad_piofs_seek.o ad_piofs_resize.o ad_piofs_hints.o \
-      ad_piofs.o
+@SET_MAKE@
 
+#
+# $HEADER$
+#
 
-default: $(LIBNAME)
+SOURCES = $(libadio_piofs_la_SOURCES)
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = adio/ad_piofs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libadio_piofs_la_LIBADD =
+am_libadio_piofs_la_OBJECTS = ad_piofs.lo ad_piofs_close.lo \
+	ad_piofs_done.lo ad_piofs_fcntl.lo ad_piofs_flush.lo \
+	ad_piofs_hints.lo ad_piofs_iread.lo ad_piofs_iwrite.lo \
+	ad_piofs_open.lo ad_piofs_rdcoll.lo ad_piofs_read.lo \
+	ad_piofs_resize.lo ad_piofs_seek.lo ad_piofs_wait.lo \
+	ad_piofs_wrcoll.lo ad_piofs_write.lo
+libadio_piofs_la_OBJECTS = $(am_libadio_piofs_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ad_piofs.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_close.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_done.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_fcntl.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_flush.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_hints.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_iread.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_iwrite.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_open.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_rdcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_read.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_resize.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_seek.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_wait.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_wrcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_piofs_write.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libadio_piofs_la_SOURCES)
+DIST_SOURCES = $(libadio_piofs_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_piofs.la
+libadio_piofs_la_SOURCES = \
+        ad_piofs.c \
+        ad_piofs.h \
+        ad_piofs_close.c \
+        ad_piofs_done.c \
+        ad_piofs_fcntl.c \
+        ad_piofs_flush.c \
+        ad_piofs_hints.c \
+        ad_piofs_iread.c \
+        ad_piofs_iwrite.c \
+        ad_piofs_open.c \
+        ad_piofs_rdcoll.c \
+        ad_piofs_read.c \
+        ad_piofs_resize.c \
+        ad_piofs_seek.c \
+        ad_piofs_wait.c \
+        ad_piofs_wrcoll.c \
+        ad_piofs_write.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  adio/ad_piofs/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  adio/ad_piofs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libadio_piofs.la: $(libadio_piofs_la_OBJECTS) $(libadio_piofs_la_DEPENDENCIES) 
+	$(LINK)  $(libadio_piofs_la_LDFLAGS) $(libadio_piofs_la_OBJECTS) $(libadio_piofs_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_done.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_fcntl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_hints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_iread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_iwrite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_rdcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_resize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_seek.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_wait.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_wrcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_piofs_write.Plo@am__quote@
 
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
-$(LIBNAME): $(AD_PIOFS_OBJECTS)
-	$(AR) $(LIBNAME) $(AD_PIOFS_OBJECTS)
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-clean:
-	@rm -f *.o
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am

@@ -0,0 +1,32 @@
+#
+# $HEADER$
+#
+
+include $(top_ompi_srcdir)/config/Makefile.options
+
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_pvfs.la
+libadio_pvfs_la_SOURCES = \
+        ad_pvfs.c \
+        ad_pvfs.h \
+        ad_pvfs_close.c \
+        ad_pvfs_delete.c \
+        ad_pvfs_done.c \
+        ad_pvfs_fcntl.c \
+        ad_pvfs_flush.c \
+        ad_pvfs_hints.c \
+        ad_pvfs_iread.c \
+        ad_pvfs_iwrite.c \
+        ad_pvfs_open.c \
+        ad_pvfs_rdcoll.c \
+        ad_pvfs_read.c \
+        ad_pvfs_resize.c \
+        ad_pvfs_seek.c \
+        ad_pvfs_wait.c \
+        ad_pvfs_wrcoll.c \
+        ad_pvfs_write.c

src/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.in

@@ -1,26 +1,561 @@
-CC          = @CC@
-AR          = @AR@
-LIBNAME     = @LIBNAME@
-srcdir      = @srcdir@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-CFLAGS      = @CFLAGS@ $(INCLUDE_DIR)
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-@VPATH@
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-AD_PVFS_OBJECTS = ad_pvfs_close.o ad_pvfs_read.o ad_pvfs_rdcoll.o \
-      ad_pvfs_wrcoll.o ad_pvfs_open.o ad_pvfs_write.o ad_pvfs_done.o \
-      ad_pvfs_fcntl.o ad_pvfs_iread.o ad_pvfs_iwrite.o ad_pvfs_wait.o \
-      ad_pvfs_flush.o ad_pvfs_seek.o ad_pvfs_resize.o ad_pvfs_hints.o \
-      ad_pvfs_delete.o ad_pvfs.o
+@SET_MAKE@
 
-default: $(LIBNAME)
+#
+# $HEADER$
+#
+
+SOURCES = $(libadio_pvfs_la_SOURCES)
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = adio/ad_pvfs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libadio_pvfs_la_LIBADD =
+am_libadio_pvfs_la_OBJECTS = ad_pvfs.lo ad_pvfs_close.lo \
+	ad_pvfs_delete.lo ad_pvfs_done.lo ad_pvfs_fcntl.lo \
+	ad_pvfs_flush.lo ad_pvfs_hints.lo ad_pvfs_iread.lo \
+	ad_pvfs_iwrite.lo ad_pvfs_open.lo ad_pvfs_rdcoll.lo \
+	ad_pvfs_read.lo ad_pvfs_resize.lo ad_pvfs_seek.lo \
+	ad_pvfs_wait.lo ad_pvfs_wrcoll.lo ad_pvfs_write.lo
+libadio_pvfs_la_OBJECTS = $(am_libadio_pvfs_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ad_pvfs.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_close.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_delete.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_done.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_fcntl.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_flush.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_hints.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_iread.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_iwrite.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_open.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_rdcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_read.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_resize.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_seek.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_wait.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_wrcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_pvfs_write.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libadio_pvfs_la_SOURCES)
+DIST_SOURCES = $(libadio_pvfs_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_pvfs.la
+libadio_pvfs_la_SOURCES = \
+        ad_pvfs.c \
+        ad_pvfs.h \
+        ad_pvfs_close.c \
+        ad_pvfs_delete.c \
+        ad_pvfs_done.c \
+        ad_pvfs_fcntl.c \
+        ad_pvfs_flush.c \
+        ad_pvfs_hints.c \
+        ad_pvfs_iread.c \
+        ad_pvfs_iwrite.c \
+        ad_pvfs_open.c \
+        ad_pvfs_rdcoll.c \
+        ad_pvfs_read.c \
+        ad_pvfs_resize.c \
+        ad_pvfs_seek.c \
+        ad_pvfs_wait.c \
+        ad_pvfs_wrcoll.c \
+        ad_pvfs_write.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  adio/ad_pvfs/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  adio/ad_pvfs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libadio_pvfs.la: $(libadio_pvfs_la_OBJECTS) $(libadio_pvfs_la_DEPENDENCIES) 
+	$(LINK)  $(libadio_pvfs_la_LDFLAGS) $(libadio_pvfs_la_OBJECTS) $(libadio_pvfs_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_delete.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_done.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_fcntl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_hints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_iread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_iwrite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_rdcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_resize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_seek.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_wait.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_wrcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_pvfs_write.Plo@am__quote@
 
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
-$(LIBNAME): $(AD_PVFS_OBJECTS)
-	$(AR) $(LIBNAME) $(AD_PVFS_OBJECTS)
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-clean:
-	@rm -f *.o
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am

@@ -0,0 +1,31 @@
+#
+# $HEADER$
+#
+
+include $(top_ompi_srcdir)/config/Makefile.options
+
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_sfs.la
+libadio_sfs_la_SOURCES = \
+        ad_sfs.c \
+        ad_sfs.h \
+        ad_sfs_close.c \
+        ad_sfs_done.c \
+        ad_sfs_fcntl.c \
+        ad_sfs_flush.c \
+        ad_sfs_hints.c \
+        ad_sfs_iread.c \
+        ad_sfs_iwrite.c \
+        ad_sfs_open.c \
+        ad_sfs_rdcoll.c \
+        ad_sfs_read.c \
+        ad_sfs_resize.c \
+        ad_sfs_seek.c \
+        ad_sfs_wait.c \
+        ad_sfs_wrcoll.c \
+        ad_sfs_write.c

src/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.in

@@ -1,26 +1,557 @@
-CC          = @CC@
-AR          = @AR@
-LIBNAME     = @LIBNAME@
-srcdir      = @srcdir@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-CFLAGS      = @CFLAGS@ $(INCLUDE_DIR)
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-@VPATH@
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-AD_SFS_OBJECTS = ad_sfs_close.o ad_sfs_read.o \
-      ad_sfs_open.o ad_sfs_write.o ad_sfs_done.o \
-      ad_sfs_fcntl.o ad_sfs_iread.o ad_sfs_iwrite.o ad_sfs_wait.o \
-      ad_sfs_flush.o ad_sfs_resize.o \
-      ad_sfs.o
+@SET_MAKE@
 
-default: $(LIBNAME)
+#
+# $HEADER$
+#
+
+SOURCES = $(libadio_sfs_la_SOURCES)
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = adio/ad_sfs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libadio_sfs_la_LIBADD =
+am_libadio_sfs_la_OBJECTS = ad_sfs.lo ad_sfs_close.lo ad_sfs_done.lo \
+	ad_sfs_fcntl.lo ad_sfs_flush.lo ad_sfs_hints.lo \
+	ad_sfs_iread.lo ad_sfs_iwrite.lo ad_sfs_open.lo \
+	ad_sfs_rdcoll.lo ad_sfs_read.lo ad_sfs_resize.lo \
+	ad_sfs_seek.lo ad_sfs_wait.lo ad_sfs_wrcoll.lo ad_sfs_write.lo
+libadio_sfs_la_OBJECTS = $(am_libadio_sfs_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ad_sfs.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_close.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_done.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_fcntl.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_flush.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_hints.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_iread.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_iwrite.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_open.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_rdcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_read.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_resize.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_seek.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_wait.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_wrcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_sfs_write.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libadio_sfs_la_SOURCES)
+DIST_SOURCES = $(libadio_sfs_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_sfs.la
+libadio_sfs_la_SOURCES = \
+        ad_sfs.c \
+        ad_sfs.h \
+        ad_sfs_close.c \
+        ad_sfs_done.c \
+        ad_sfs_fcntl.c \
+        ad_sfs_flush.c \
+        ad_sfs_hints.c \
+        ad_sfs_iread.c \
+        ad_sfs_iwrite.c \
+        ad_sfs_open.c \
+        ad_sfs_rdcoll.c \
+        ad_sfs_read.c \
+        ad_sfs_resize.c \
+        ad_sfs_seek.c \
+        ad_sfs_wait.c \
+        ad_sfs_wrcoll.c \
+        ad_sfs_write.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  adio/ad_sfs/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  adio/ad_sfs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libadio_sfs.la: $(libadio_sfs_la_OBJECTS) $(libadio_sfs_la_DEPENDENCIES) 
+	$(LINK)  $(libadio_sfs_la_LDFLAGS) $(libadio_sfs_la_OBJECTS) $(libadio_sfs_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_done.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_fcntl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_hints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_iread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_iwrite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_rdcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_resize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_seek.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_wait.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_wrcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_sfs_write.Plo@am__quote@
 
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
-$(LIBNAME): $(AD_SFS_OBJECTS)
-	$(AR) $(LIBNAME) $(AD_SFS_OBJECTS)
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-clean:
-	@rm -f *.o
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am

@@ -0,0 +1,34 @@
+#
+# $HEADER$
+#
+
+include $(top_ompi_srcdir)/config/Makefile.options
+
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_testfs.la
+libadio_testfs_la_SOURCES = \
+        ad_testfs.c \
+        ad_testfs.h \
+        ad_testfs_close.c \
+        ad_testfs_delete.c \
+        ad_testfs_done.c \
+        ad_testfs_fcntl.c \
+        ad_testfs_flush.c \
+        ad_testfs_getsh.c \
+        ad_testfs_hints.c \
+        ad_testfs_iread.c \
+        ad_testfs_iwrite.c \
+        ad_testfs_open.c \
+        ad_testfs_rdcoll.c \
+        ad_testfs_read.c \
+        ad_testfs_resize.c \
+        ad_testfs_seek.c \
+        ad_testfs_setsh.c \
+        ad_testfs_wait.c \
+        ad_testfs_wrcoll.c \
+        ad_testfs_write.c

src/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.in

@@ -1,27 +1,568 @@
-CC          = @CC@
-AR          = @AR@
-LIBNAME     = @LIBNAME@
-srcdir      = @srcdir@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-CFLAGS      = @CFLAGS@ $(INCLUDE_DIR)
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-@VPATH@
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-AD_TESTFS_OBJECTS = ad_testfs_close.o ad_testfs_read.o ad_testfs_rdcoll.o \
-	ad_testfs_wrcoll.o ad_testfs_open.o ad_testfs_write.o \
-	ad_testfs_done.o ad_testfs_fcntl.o ad_testfs_iread.o \
-	ad_testfs_iwrite.o ad_testfs_wait.o ad_testfs_flush.o \
-	ad_testfs_seek.o ad_testfs_resize.o ad_testfs_hints.o \
-	ad_testfs_delete.o ad_testfs.o
+@SET_MAKE@
 
-default: $(LIBNAME)
+#
+# $HEADER$
+#
+
+SOURCES = $(libadio_testfs_la_SOURCES)
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = adio/ad_testfs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libadio_testfs_la_LIBADD =
+am_libadio_testfs_la_OBJECTS = ad_testfs.lo ad_testfs_close.lo \
+	ad_testfs_delete.lo ad_testfs_done.lo ad_testfs_fcntl.lo \
+	ad_testfs_flush.lo ad_testfs_getsh.lo ad_testfs_hints.lo \
+	ad_testfs_iread.lo ad_testfs_iwrite.lo ad_testfs_open.lo \
+	ad_testfs_rdcoll.lo ad_testfs_read.lo ad_testfs_resize.lo \
+	ad_testfs_seek.lo ad_testfs_setsh.lo ad_testfs_wait.lo \
+	ad_testfs_wrcoll.lo ad_testfs_write.lo
+libadio_testfs_la_OBJECTS = $(am_libadio_testfs_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ad_testfs.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_close.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_delete.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_done.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_fcntl.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_flush.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_getsh.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_hints.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_iread.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_iwrite.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_open.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_rdcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_read.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_resize.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_seek.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_setsh.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_wait.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_wrcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_testfs_write.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libadio_testfs_la_SOURCES)
+DIST_SOURCES = $(libadio_testfs_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_testfs.la
+libadio_testfs_la_SOURCES = \
+        ad_testfs.c \
+        ad_testfs.h \
+        ad_testfs_close.c \
+        ad_testfs_delete.c \
+        ad_testfs_done.c \
+        ad_testfs_fcntl.c \
+        ad_testfs_flush.c \
+        ad_testfs_getsh.c \
+        ad_testfs_hints.c \
+        ad_testfs_iread.c \
+        ad_testfs_iwrite.c \
+        ad_testfs_open.c \
+        ad_testfs_rdcoll.c \
+        ad_testfs_read.c \
+        ad_testfs_resize.c \
+        ad_testfs_seek.c \
+        ad_testfs_setsh.c \
+        ad_testfs_wait.c \
+        ad_testfs_wrcoll.c \
+        ad_testfs_write.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  adio/ad_testfs/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  adio/ad_testfs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libadio_testfs.la: $(libadio_testfs_la_OBJECTS) $(libadio_testfs_la_DEPENDENCIES) 
+	$(LINK)  $(libadio_testfs_la_LDFLAGS) $(libadio_testfs_la_OBJECTS) $(libadio_testfs_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_delete.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_done.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_fcntl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_getsh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_hints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_iread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_iwrite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_rdcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_resize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_seek.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_setsh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_wait.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_wrcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_testfs_write.Plo@am__quote@
 
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
-$(LIBNAME): $(AD_TESTFS_OBJECTS)
-	$(AR) $(LIBNAME) $(AD_TESTFS_OBJECTS)
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-clean:
-	@rm -f *.o
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am

@@ -1,20 +1,31 @@
-# -*- makefile -*-
 #
 # $HEADER$
 #
 
 include $(top_ompi_srcdir)/config/Makefile.options
 
-AM_CPPFLAGS = -DHAVE_MPI_INFO \
-        -DNO_AIO -DUFS -I$(top_ompi_builddir)/src/include \
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
-        -I../../adio/include -I../../include -I../../../src
-
-noinst_LTLIBRARIES = libmca_io_romio_romio_dist_adio_ad_ufs.la
-libmca_io_romio_romio_dist_adio_ad_ufs_la_SOURCES = \
-        ad_ufs.h ad_ufs_close.c ad_ufs_read.c \
-        ad_ufs_open.c ad_ufs_write.c ad_ufs_done.c \
-        ad_ufs_fcntl.c ad_ufs_iread.c ad_ufs_iwrite.c ad_ufs_wait.c \
-        ad_ufs_resize.c ad_ufs.c
+        -I$(top_ompi_srcdir)/src/include
 
+noinst_LTLIBRARIES = libadio_ufs.la
+libadio_ufs_la_SOURCES = \
+        ad_ufs.c \
+        ad_ufs_close.c \
+        ad_ufs_done.c \
+        ad_ufs_fcntl.c \
+        ad_ufs_flush.c \
+        ad_ufs.h \
+        ad_ufs_hints.c \
+        ad_ufs_iread.c \
+        ad_ufs_iwrite.c \
+        ad_ufs_open.c \
+        ad_ufs_rdcoll.c \
+        ad_ufs_read.c \
+        ad_ufs_resize.c \
+        ad_ufs_seek.c \
+        ad_ufs_wait.c \
+        ad_ufs_wrcoll.c \
+        ad_ufs_write.c

src/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.in

@@ -1,27 +1,559 @@
-CC          = @CC@
-AR          = @AR@
-LIBNAME     = @LIBNAME@
-srcdir      = @srcdir@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-CFLAGS      = @CFLAGS@ $(INCLUDE_DIR)
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-@VPATH@
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-AD_UFS_OBJECTS = ad_ufs_close.o ad_ufs_read.o \
-      ad_ufs_open.o ad_ufs_write.o ad_ufs_done.o \
-      ad_ufs_fcntl.o ad_ufs_iread.o ad_ufs_iwrite.o ad_ufs_wait.o \
-      ad_ufs_resize.o \
-      ad_ufs.o
+@SET_MAKE@
 
+#
+# $HEADER$
+#
 
-default: $(LIBNAME)
+SOURCES = $(libadio_ufs_la_SOURCES)
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = adio/ad_ufs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libadio_ufs_la_LIBADD =
+am_libadio_ufs_la_OBJECTS = ad_ufs.lo ad_ufs_close.lo ad_ufs_done.lo \
+	ad_ufs_fcntl.lo ad_ufs_flush.lo ad_ufs_hints.lo \
+	ad_ufs_iread.lo ad_ufs_iwrite.lo ad_ufs_open.lo \
+	ad_ufs_rdcoll.lo ad_ufs_read.lo ad_ufs_resize.lo \
+	ad_ufs_seek.lo ad_ufs_wait.lo ad_ufs_wrcoll.lo ad_ufs_write.lo
+libadio_ufs_la_OBJECTS = $(am_libadio_ufs_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ad_ufs.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_close.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_done.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_fcntl.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_flush.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_hints.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_iread.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_iwrite.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_open.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_rdcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_read.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_resize.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_seek.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_wait.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_wrcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ufs_write.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libadio_ufs_la_SOURCES)
+DIST_SOURCES = $(libadio_ufs_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_ufs.la
+libadio_ufs_la_SOURCES = \
+        ad_ufs.c \
+        ad_ufs_close.c \
+        ad_ufs_done.c \
+        ad_ufs_fcntl.c \
+        ad_ufs_flush.c \
+        ad_ufs.h \
+        ad_ufs_hints.c \
+        ad_ufs_iread.c \
+        ad_ufs_iwrite.c \
+        ad_ufs_open.c \
+        ad_ufs_rdcoll.c \
+        ad_ufs_read.c \
+        ad_ufs_resize.c \
+        ad_ufs_seek.c \
+        ad_ufs_wait.c \
+        ad_ufs_wrcoll.c \
+        ad_ufs_write.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  adio/ad_ufs/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  adio/ad_ufs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libadio_ufs.la: $(libadio_ufs_la_OBJECTS) $(libadio_ufs_la_DEPENDENCIES) 
+	$(LINK)  $(libadio_ufs_la_LDFLAGS) $(libadio_ufs_la_OBJECTS) $(libadio_ufs_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_done.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_fcntl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_hints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_iread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_iwrite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_rdcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_resize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_seek.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_wait.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_wrcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ufs_write.Plo@am__quote@
 
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
-$(LIBNAME): $(AD_UFS_OBJECTS)
-	$(AR) $(LIBNAME) $(AD_UFS_OBJECTS)
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-clean:
-	@rm -f *.o
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am

@@ -0,0 +1,31 @@
+#
+# $HEADER$
+#
+
+include $(top_ompi_srcdir)/config/Makefile.options
+
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_xfs.la
+libadio_xfs_la_SOURCES = \
+        ad_xfs.c \
+        ad_xfs.h \
+        ad_xfs_close.c \
+        ad_xfs_done.c \
+        ad_xfs_fcntl.c \
+        ad_xfs_flush.c \
+        ad_xfs_hints.c \
+        ad_xfs_iread.c \
+        ad_xfs_iwrite.c \
+        ad_xfs_open.c \
+        ad_xfs_rdcoll.c \
+        ad_xfs_read.c \
+        ad_xfs_resize.c \
+        ad_xfs_seek.c \
+        ad_xfs_wait.c \
+        ad_xfs_wrcoll.c \
+        ad_xfs_write.c

src/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.in

@@ -1,26 +1,557 @@
-CC          = @CC@
-AR          = @AR@
-LIBNAME     = @LIBNAME@
-srcdir      = @srcdir@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-CFLAGS      = @CFLAGS@ $(INCLUDE_DIR)
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-@VPATH@
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-AD_XFS_OBJECTS = ad_xfs_close.o ad_xfs_read.o \
-      ad_xfs_open.o ad_xfs_write.o ad_xfs_done.o \
-      ad_xfs_fcntl.o ad_xfs_iread.o ad_xfs_iwrite.o ad_xfs_wait.o \
-      ad_xfs_resize.o ad_xfs_seek.o ad_xfs_hints.o \
-      ad_xfs.o
+@SET_MAKE@
 
-default: $(LIBNAME)
+#
+# $HEADER$
+#
+
+SOURCES = $(libadio_xfs_la_SOURCES)
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = adio/ad_xfs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libadio_xfs_la_LIBADD =
+am_libadio_xfs_la_OBJECTS = ad_xfs.lo ad_xfs_close.lo ad_xfs_done.lo \
+	ad_xfs_fcntl.lo ad_xfs_flush.lo ad_xfs_hints.lo \
+	ad_xfs_iread.lo ad_xfs_iwrite.lo ad_xfs_open.lo \
+	ad_xfs_rdcoll.lo ad_xfs_read.lo ad_xfs_resize.lo \
+	ad_xfs_seek.lo ad_xfs_wait.lo ad_xfs_wrcoll.lo ad_xfs_write.lo
+libadio_xfs_la_OBJECTS = $(am_libadio_xfs_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ad_xfs.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_close.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_done.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_fcntl.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_flush.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_hints.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_iread.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_iwrite.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_open.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_rdcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_read.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_resize.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_seek.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_wait.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_wrcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_xfs_write.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libadio_xfs_la_SOURCES)
+DIST_SOURCES = $(libadio_xfs_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_xfs.la
+libadio_xfs_la_SOURCES = \
+        ad_xfs.c \
+        ad_xfs.h \
+        ad_xfs_close.c \
+        ad_xfs_done.c \
+        ad_xfs_fcntl.c \
+        ad_xfs_flush.c \
+        ad_xfs_hints.c \
+        ad_xfs_iread.c \
+        ad_xfs_iwrite.c \
+        ad_xfs_open.c \
+        ad_xfs_rdcoll.c \
+        ad_xfs_read.c \
+        ad_xfs_resize.c \
+        ad_xfs_seek.c \
+        ad_xfs_wait.c \
+        ad_xfs_wrcoll.c \
+        ad_xfs_write.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  adio/ad_xfs/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  adio/ad_xfs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libadio_xfs.la: $(libadio_xfs_la_OBJECTS) $(libadio_xfs_la_DEPENDENCIES) 
+	$(LINK)  $(libadio_xfs_la_LDFLAGS) $(libadio_xfs_la_OBJECTS) $(libadio_xfs_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_done.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_fcntl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_hints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_iread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_iwrite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_rdcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_resize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_seek.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_wait.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_wrcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_xfs_write.Plo@am__quote@
 
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
-$(LIBNAME): $(AD_XFS_OBJECTS)
-	$(AR) $(LIBNAME) $(AD_XFS_OBJECTS)
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-clean:
-	@rm -f *.o
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/adio/common/Makefile.am

@@ -1,23 +1,45 @@
-# -*- makefile -*-
 #
 # $HEADER$
 #
 
 include $(top_ompi_srcdir)/config/Makefile.options
 
-AM_CPPFLAGS = -DHAVE_MPI_INFO \
-        -DNO_AIO -I$(top_ompi_builddir)/src/include \
+AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
-        -I../../adio/include -I../../include -I../../../src
-
-noinst_LTLIBRARIES = libmca_io_romio_romio_dist_adio_common.la
-libmca_io_romio_romio_dist_adio_common_la_SOURCES = \
-        ad_close.c ad_init.c ad_end.c ad_open.c setfn.c flatten.c \
-        async_list.c req_malloc.c malloc.c ad_read_coll.c eof_offset.c \
-        ad_write_coll.c lock.c ad_read_str.c ad_write_str.c iscontig.c \
-        get_fp_posn.c ad_seek.c ad_delete.c ad_flush.c ad_hints.c error.c \
-        ad_fstype.c ad_get_sh_fp.c ad_set_sh_fp.c shfp_fname.c \
-        byte_offset.c status_setb.c ad_aggregate.c cb_config_list.c \
-        ad_read_str_naive.c gencheck.c ad_set_view.c
+        -I$(top_ompi_srcdir)/src/include
 
+noinst_LTLIBRARIES = libadio_common.la
+libadio_common_la_SOURCES = \
+        ad_aggregate.c \
+        ad_close.c \
+        ad_delete.c \
+        ad_end.c \
+        ad_flush.c \
+        ad_fstype.c \
+        ad_get_sh_fp.c \
+        ad_hints.c \
+        ad_init.c \
+        ad_open.c \
+        ad_read_coll.c \
+        ad_read_str.c \
+        ad_read_str_naive.c \
+        ad_seek.c \
+        ad_set_sh_fp.c \
+        ad_set_view.c \
+        ad_write_coll.c \
+        ad_write_str.c \
+        async_list.c \
+        byte_offset.c \
+        cb_config_list.c \
+        eof_offset.c \
+        error.c \
+        flatten.c \
+        gencheck.c \
+        get_fp_posn.c \
+        iscontig.c \
+        lock.c \
+        malloc.c \
+        req_malloc.c \
+        setfn.c \
+        shfp_fname.c \
+        status_setb.c

src/mca/io/romio/romio-dist/adio/common/Makefile.in

@@ -1,26 +1,603 @@
-CC          = @CC@
-AR          = @AR@
-LIBNAME     = @LIBNAME@
-MPI         = @MPI@
-srcdir      = @srcdir@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
-CFLAGS      = @CFLAGS@ $(INCLUDE_DIR)
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-@VPATH@
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-AD_OBJECTS = ad_close.o ad_init.o ad_end.o ad_open.o setfn.o flatten.o \
-      async_list.o req_malloc.o malloc.o ad_read_coll.o eof_offset.o \
-      ad_write_coll.o lock.o ad_read_str.o ad_write_str.o iscontig.o \
-      get_fp_posn.o ad_seek.o ad_delete.o ad_flush.o ad_hints.o error.o \
-      ad_fstype.o ad_get_sh_fp.o ad_set_sh_fp.o shfp_fname.o byte_offset.o \
-      status_setb.o ad_aggregate.o cb_config_list.o \
-      ad_read_str_naive.o gencheck.o ad_set_view.o
+@SET_MAKE@
 
-all: $(LIBNAME)
+#
+# $HEADER$
+#
+
+SOURCES = $(libadio_common_la_SOURCES)
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = adio/common
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libadio_common_la_LIBADD =
+am_libadio_common_la_OBJECTS = ad_aggregate.lo ad_close.lo \
+	ad_delete.lo ad_end.lo ad_flush.lo ad_fstype.lo \
+	ad_get_sh_fp.lo ad_hints.lo ad_init.lo ad_open.lo \
+	ad_read_coll.lo ad_read_str.lo ad_read_str_naive.lo ad_seek.lo \
+	ad_set_sh_fp.lo ad_set_view.lo ad_write_coll.lo \
+	ad_write_str.lo async_list.lo byte_offset.lo cb_config_list.lo \
+	eof_offset.lo error.lo flatten.lo gencheck.lo get_fp_posn.lo \
+	iscontig.lo lock.lo malloc.lo req_malloc.lo setfn.lo \
+	shfp_fname.lo status_setb.lo
+libadio_common_la_OBJECTS = $(am_libadio_common_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ad_aggregate.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_close.Plo ./$(DEPDIR)/ad_delete.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_end.Plo ./$(DEPDIR)/ad_flush.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_fstype.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_get_sh_fp.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_hints.Plo ./$(DEPDIR)/ad_init.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_open.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_read_coll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_read_str.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_read_str_naive.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_seek.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_set_sh_fp.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_set_view.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_write_coll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_write_str.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/async_list.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/byte_offset.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/cb_config_list.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/eof_offset.Plo ./$(DEPDIR)/error.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/flatten.Plo ./$(DEPDIR)/gencheck.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/get_fp_posn.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/iscontig.Plo ./$(DEPDIR)/lock.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/malloc.Plo ./$(DEPDIR)/req_malloc.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/setfn.Plo ./$(DEPDIR)/shfp_fname.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/status_setb.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libadio_common_la_SOURCES)
+DIST_SOURCES = $(libadio_common_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_common.la
+libadio_common_la_SOURCES = \
+        ad_aggregate.c \
+        ad_close.c \
+        ad_delete.c \
+        ad_end.c \
+        ad_flush.c \
+        ad_fstype.c \
+        ad_get_sh_fp.c \
+        ad_hints.c \
+        ad_init.c \
+        ad_open.c \
+        ad_read_coll.c \
+        ad_read_str.c \
+        ad_read_str_naive.c \
+        ad_seek.c \
+        ad_set_sh_fp.c \
+        ad_set_view.c \
+        ad_write_coll.c \
+        ad_write_str.c \
+        async_list.c \
+        byte_offset.c \
+        cb_config_list.c \
+        eof_offset.c \
+        error.c \
+        flatten.c \
+        gencheck.c \
+        get_fp_posn.c \
+        iscontig.c \
+        lock.c \
+        malloc.c \
+        req_malloc.c \
+        setfn.c \
+        shfp_fname.c \
+        status_setb.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  adio/common/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  adio/common/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libadio_common.la: $(libadio_common_la_OBJECTS) $(libadio_common_la_DEPENDENCIES) 
+	$(LINK)  $(libadio_common_la_LDFLAGS) $(libadio_common_la_OBJECTS) $(libadio_common_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_aggregate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_delete.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_end.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_fstype.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_get_sh_fp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_hints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_init.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_read_coll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_read_str.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_read_str_naive.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_seek.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_set_sh_fp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_set_view.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_write_coll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_write_str.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/async_list.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/byte_offset.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cb_config_list.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eof_offset.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flatten.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gencheck.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_fp_posn.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iscontig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lock.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/req_malloc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setfn.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shfp_fname.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/status_setb.Plo@am__quote@
 
 .c.o:
-	$(CC) $(CFLAGS) $(INC) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
-$(LIBNAME): $(AD_OBJECTS)
-	$(AR) $(LIBNAME) $(AD_OBJECTS)
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/adio/include/Makefile.am

@@ -0,0 +1,18 @@
+#
+# $HEADER$
+#
+
+include $(top_ompi_srcdir)/config/Makefile.options
+
+noinst_HEADERS = \
+        adio_cb_config_list.h \
+        adio_extern.h \
+        adio.h \
+        adioi_errmsg.h \
+        adioi_error.h \
+        adioi_fs_proto.h \
+        adioi.h \
+        mpio_error.h \
+        mpipr.h \
+        mpisgi2.h \
+        romioconf.h

src/mca/io/romio/romio-dist/adio/include/Makefile.in

@@ -0,0 +1,465 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $HEADER$
+#
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = adio/include
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/romioconf.h.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = romioconf.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+noinst_HEADERS = \
+        adio_cb_config_list.h \
+        adio_extern.h \
+        adio.h \
+        adioi_errmsg.h \
+        adioi_error.h \
+        adioi_fs_proto.h \
+        adioi.h \
+        mpio_error.h \
+        mpipr.h \
+        mpisgi2.h \
+        romioconf.h
+
+all: romioconf.h
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  adio/include/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  adio/include/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+romioconf.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/romioconf.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status adio/include/romioconf.h
+$(srcdir)/romioconf.h.in:  $(am__configure_deps) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f romioconf.h stamp-h1
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES) romioconf.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) romioconf.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES) romioconf.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) romioconf.h.in $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS) romioconf.h
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool ctags distclean distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/adio/include/mpipr.h

@@ -301,10 +301,13 @@
 #define MPI_Waitany PMPI_Waitany
 #undef MPI_Waitsome
 #define MPI_Waitsome PMPI_Waitsome
+/* Open MPI: these functions are not supposed to be profiled */
+#if 0
 #undef MPI_Wtick
 #define MPI_Wtick PMPI_Wtick
 #undef MPI_Wtime
 #define MPI_Wtime PMPI_Wtime
+#endif
 
 /* commented out because these could be macros themselves, as in MPICH 
 #undef MPI_Type_c2f

src/mca/io/romio/romio-dist/adio/include/romioconf.h.in

@@ -1,84 +1,222 @@
-/* adio/include/romioconf.h.in.  Generated automatically from .tmp by autoheader.  */
+/* adio/include/romioconf.h.in.  Generated from configure.in by autoheader.  */
 
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-#undef _ALL_SOURCE
-#endif
+/*
+ *  $HEADER$
+ *
+ *  (C) 2001 by Argonne National Laboratory.
+ *      See COPYRIGHT in top-level directory.
+ */
 
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-#undef CRAY_STACKSEG_END
-
-/* Define as the proper declaration for yytext.  */
-#undef DECLARE_YYTEXT
-
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
-
-/* Define if `sys_siglist' is declared by <signal.h>.  */
-#undef SYS_SIGLIST_DECLARED
 
+/* On RS600, set this if we have aio (?) */
 #undef AIO_HANDLE_IN_AIOCB
-#undef AIO_PRIORITY_DEFAULT
-#undef AIO_SIGNOTIFY_NONE
-#undef AIO_SUN
-#undef FREEBSD
-#undef HAVE_LONG_LONG_64
-#undef HAVE_MOUNT_NFS
-#undef HAVE_MPI_COMBINERS
-#undef HAVE_MPI_DARRAY_SUBARRAY
-#undef HAVE_MPI_INFO
-#undef HAVE_MPI_LONG_LONG_INT
-#undef HAVE_PRAGMA_CRI_DUP
-#undef HAVE_PRAGMA_HP_SEC_DEF
-#undef HAVE_PRAGMA_WEAK
-#undef HAVE_PREAD64
-#undef HAVE_STATUS_SET_BYTES
-#undef HAVE_STRERROR
-#undef HAVE_SYSERRLIST
-#undef HAVE_WEAK_SYMBOLS
-#undef HFS
-#undef HPUX
-#undef INT_LT_POINTER
-#undef IRIX
-#undef LINUX
-#undef MPICH
-#undef MPIHP
-#undef MPILAM
-#undef MPISGI
-#undef MPI_OFFSET_IS_INT
-#undef NEEDS_MPI_TEST
-#undef NFS
-#undef NO_AIO
-#undef NO_FD_IN_AIOCB
-#undef NO_MPI_SGI_type_is_contig
-#undef PARAGON
-#undef PFS
-#undef PIOFS
-#undef PRINT_ERR_MSG
-#undef ROMIO_PVFS
-#undef ROMIO_TESTFS
-#undef SFS
-#undef SOLARIS
-#undef SPPUX
-#undef SX4
-#undef UFS
-#undef XFS
-#undef NEEDS_AIOCB_T
 
-/* Define if you have memalign.  */
+/* Whether we have AIO priority default or not */
+#undef AIO_PRIORITY_DEFAULT
+
+/* Whether AIO has SIGNOTIFY or not */
+#undef AIO_SIGNOTIFY_NONE
+
+/* Whether we have Sun's libaio or not */
+#undef AIO_SUN
+
+/* Whether we're on AIX or not */
+#undef AIX
+
+/* Whether we are on Cray or not */
+#undef CRAY
+
+/* Whether we are on DEC or not */
+#undef DEC
+
+/* Whether we're on FreeBSD or not */
+#undef FREEBSD
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if long long is 64 bits */
+#undef HAVE_LONG_LONG_64
+
+/* Define to 1 if you have the `memalign' function. */
 #undef HAVE_MEMALIGN
 
-/* Define if you have the <unistd.h> header file.  */
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define if MOUNT_NFS defined */
+#undef HAVE_MOUNT_NFS
+
+/* Define if MPI combiners available */
+#undef HAVE_MPI_COMBINERS
+
+/* Define if MPI Darray available */
+#undef HAVE_MPI_DARRAY_SUBARRAY
+
+/* Define if MPI_Info available */
+#undef HAVE_MPI_INFO
+
+/* Define if mpi has long long it */
+#undef HAVE_MPI_LONG_LONG_INT
+
+/* Will always be defined / 1 */
+#undef HAVE_MPI_OFFSET
+
+/* Whether we have #pragma cri_dup or not */
+#undef HAVE_PRAGMA_CRI_DUP
+
+/* Whether we have #pragma sec_def or not */
+#undef HAVE_PRAGMA_HP_SEC_DEF
+
+/* Whether we have #pragma weak or not */
+#undef HAVE_PRAGMA_WEAK
+
+/* Define if pread64 available */
+#undef HAVE_PREAD64
+
+/* Define if status set bytes available */
+#undef HAVE_STATUS_SET_BYTES
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define if strerror available */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define if syserrlist available */
+#undef HAVE_SYSERRLIST
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define if you have the aio library (-laio).  */
-#undef HAVE_LIBAIO
+/* Whether we have weak symbols or not */
+#undef HAVE_WEAK_SYMBOLS
 
-/* Define if you have the pthread library (-lpthread).  */
-#undef HAVE_LIBPTHREAD
+/* Building HFS support or not */
+#undef HFS
 
-/* Define if you have the rt library (-lrt).  */
-#undef HAVE_LIBRT
+/* Whether we are on HPUX or not */
+#undef HPUX
+
+/* Define if int smaller than pointer */
+#undef INT_LT_POINTER
+
+/* Whether we are on IRIX or not */
+#undef IRIX
+
+/* Whether we're on Linux or not */
+#undef LINUX
+
+/* Will always be undefined / 0 */
+#undef MPICH
+
+/* Will always be undefined / 0 */
+#undef MPIHP
+
+/* Will always be undefined / 0 */
+#undef MPILAM
+
+/* Will always be undefined / 0 */
+#undef MPISGI
+
+/* Will always be undefined / 0 */
+#undef MPI_FILE_DEFINED
+
+/* Define if MPI_Offset is int */
+#undef MPI_OFFSET_IS_INT
+
+/* Whether we need to define aiocb_t type or not */
+#undef NEEDS_AIOCB_T
+
+/* Will always be undefined / 0 */
+#undef NEEDS_MPI_TEST
+
+/* Building NFS support or not */
+#undef NFS
+
+/* Whether we have/want to use libaio or not */
+#undef NO_AIO
+
+/* On RS600, set this if we have aio (?) */
+#undef NO_FD_IN_AIOCB
+
+/* Define if no MPI type is contig */
+#undef NO_MPI_SGI_type_is_contig
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Whether we're on Paragon or not */
+#undef PARAGON
+
+/* Building PFS support or not */
+#undef PFS
+
+/* Building PIOFS support or not */
+#undef PIOFS
+
+/* Will always be undefined */
+#undef PRINT_ERROR_MSG
+
+/* Will always be undefined / 0 */
+#undef PRINT_ERR_MSG
+
+/* Building PVFS support or not */
+#undef ROMIO_PVFS
+
+/* Building ROMIO testfs support or not */
+#undef ROMIO_TESTFS
+
+/* Building SFS support or not */
+#undef SFS
+
+/* Whether we're on Solaris or not */
+#undef SOLARIS
+
+/* Whether we are on SPPUX or not */
+#undef SPPUX
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Whether we are on SX4 or not */
+#undef SX4
+
+/* Building UFS support or not */
+#undef UFS
+
+/* Building XFS support or not */
+#undef XFS
+
+/* Define if inline is not supported */
+#undef inline

src/mca/io/romio/romio-dist/configure.in

@@ -1,3 +1,105 @@
+# Open MPI: Modifications to this file were done on an "let's do the
+# minimum possible" basis, not so that we can skip on the work or
+# provide any less functionality, but more from a perspective that we
+# want to be able to import new versions of ROMIO in as easy a fashion
+# as possible.  Hence, there are some things in this file that are
+# irrelevant / unnecessary in an Open MPI environment, but are
+# harmless and are left here solely for the sake of ease of future
+# patching/importing.
+
+# Open MPI: added AC#INIT, AC#PREREQ, and AM#INIT_AUTOMAKE
+AC_INIT
+AC_PREREQ(2.58)
+AM_INIT_AUTOMAKE(io-romio, 1.0.0, 'no')
+
+# Open MPI: added AH_TOP
+AH_TOP([/*
+ *  $HEADER$
+ *
+ *  (C) 2001 by Argonne National Laboratory.
+ *      See COPYRIGHT in top-level directory.
+ */
+])
+
+# Open MPI: added a bunch of AH templates.  Could go manually edit all
+# AC_DEFINE's down below, but this approach will be significantly
+# easier to port forward to future versions of ROMIO.
+
+AH_TEMPLATE([NO_AIO], [Whether we have/want to use libaio or not])
+AH_TEMPLATE([AIO_SUN], [Whether we have Sun's libaio or not])
+AH_TEMPLATE([SOLARIS], [Whether we're on Solaris or not])
+AH_TEMPLATE([NO_FD_IN_AIOCB], [On RS600, set this if we have aio (?)])
+AH_TEMPLATE([AIO_HANDLE_IN_AIOCB], [On RS600, set this if we have aio (?)])
+AH_TEMPLATE([AIX], [Whether we're on AIX or not])
+AH_TEMPLATE([PARAGON], [Whether we're on Paragon or not])
+AH_TEMPLATE([FREEBSD], [Whether we're on FreeBSD or not])
+AH_TEMPLATE([LINUX], [Whether we're on Linux or not])
+AH_TEMPLATE([NEEDS_AIOCB_T], [Whether we need to define aiocb_t type or not])
+AH_TEMPLATE([SX4], [Whether we are on SX4 or not])
+AH_TEMPLATE([HPUX], [Whether we are on HPUX or not])
+AH_TEMPLATE([SPPUX], [Whether we are on SPPUX or not])
+AH_TEMPLATE([AIO_PRIORITY_DEFAULT], [Whether we have AIO priority default or not])
+AH_TEMPLATE([DEC], [Whether we are on DEC or not])
+AH_TEMPLATE([CRAY], [Whether we are on Cray or not])
+AH_TEMPLATE([MPISGI], [Will always be undefined / 0])
+AH_TEMPLATE([HAVE_MPI_COMBINERS], [Whether we have SGI MPI or not])
+AH_TEMPLATE([NO_MPI_SGI_type_is_contig], [Whether we have SGI MPI or not])
+AH_TEMPLATE([IRIX], [Whether we are on IRIX or not])
+AH_TEMPLATE([AIO_SIGNOTIFY_NONE], [Whether AIO has SIGNOTIFY or not])
+AH_TEMPLATE([HAVE_MPI_LONG_LONG_INT], [Whether Open MPI has MPI_LONG_LONG_INT or not])
+AH_TEMPLATE([HAVE_MPI_INFO], [Whether Open MPI has MPI_INFO or not])
+AH_TEMPLATE([HAVE_MPI_DARRAY_SUBARRAY], [Whether Open MPI has MPI_DARRAY_SUBARRAY or not])
+AH_TEMPLATE([HAVE_WEAK_SYMBOLS], [Whether we have weak symbols or not])
+AH_TEMPLATE([HAVE_PRAGMA_WEAK], [Whether we have #pragma weak or not])
+AH_TEMPLATE([HAVE_PRAGMA_HP_SEC_DEF], [Whether we have #pragma sec_def or not])
+AH_TEMPLATE([HAVE_PRAGMA_CRI_DUP], [Whether we have #pragma cri_dup or not])
+AH_TEMPLATE([NFS], [Building NFS support or not])
+AH_TEMPLATE([UFS], [Building UFS support or not])
+AH_TEMPLATE([HFS], [Building HFS support or not])
+AH_TEMPLATE([SFS], [Building SFS support or not])
+AH_TEMPLATE([XFS], [Building XFS support or not])
+AH_TEMPLATE([ROMIO_PVFS], [Building PVFS support or not])
+AH_TEMPLATE([PFS], [Building PFS support or not])
+AH_TEMPLATE([ROMIO_TESTFS], [Building ROMIO testfs support or not])
+AH_TEMPLATE([PIOFS], [Building PIOFS support or not])
+AH_TEMPLATE([NEEDS_MPI_TEST], [Will always be undefined / 0])
+AH_TEMPLATE([MPICH], [Will always be undefined / 0])
+AH_TEMPLATE([MPILAM], [Will always be undefined / 0])
+AH_TEMPLATE([MPIHP], [Will always be undefined / 0])
+AH_TEMPLATE([HAVE_STATUS_SET_BYTES], [Will always be defined / 1])
+AH_TEMPLATE([PRINT_ERR_MSG], [Will always be undefined / 0])
+
+AH_TEMPLATE([HAVE_MPI_OFFSET], [Will always be defined / 1])
+AH_TEMPLATE([MPI_FILE_DEFINED], [Will always be undefined / 0])
+AH_TEMPLATE([PRINT_ERROR_MSG], [Will always be undefined])
+
+# Open MPI: this configure script doesn't seem to define these
+# anywhere, so just do them manually here because "we know better"
+# (i.e., Open MPI can be hard-wired to these values).
+AC_DEFINE(HAVE_MPI_OFFSET, 1)
+
+# Open MPI: look for top Open MPI directory
+AC_MSG_CHECKING([for Open MPI support files])
+if test -f "$srcdir/../../../../../config/mca_configure.ac"; then
+
+    # This is needed for VPATH builds, so that it will -I the
+    # appropriate include directory (don't know why automake
+    # doesn't do this # automatically).
+
+    top_ompi_srcdir='$(top_srcdir)/../../../../..'
+    top_ompi_builddir='$(top_builddir)/../../../../..'
+    OMPI_CFLAGS='-I$(top_ompi_srcdir)/src -I$(top_ompi_srcdir)/include -I$(top_ompi_builddir)/src'
+    found_ompi_headers=1
+    AC_MSG_RESULT([in Open MPI source tree -- good])
+    AC_SUBST(top_ompi_srcdir)
+    AC_SUBST(top_ompi_builddir)
+else
+    AC_MSG_RESULT([not found])
+    AC_MSG_WARN([*** Could not find Open MPI support files])
+    AC_MSG_WARN([*** Can only build this version of ROMIO in an Open MPI source tree])
+    AC_MSG_ERROR([*** Cannot continue])
+fi
+
 dnl This is an autoconf script. To rebuild the "configure" script 
 dnl from this, execute the command "autoconf" in the directory containing 
 dnl this script.  You must have autoconf version 1.4 or later, 
@@ -120,12 +222,15 @@ available, for building the profiling interface.
 "
 #
 echo " "
-echo "Configuring ROMIO Version 1.2.3"
+# Open MPI: fix version number and append "(Open MPI)"
+echo "Configuring ROMIO Version 1.2.5.1 (Open MPI)"
 echo " "
-CONFIGURE_ARGS="$*"
-if test -n "$CONFIGURE_ARGS" ; then
-    echo "Configuring with args $CONFIGURE_ARGS"
-fi
+# Open MPI: modern versions of GNU auto tools pass in some parameters
+# that we don't want to see, so don't look at them at all.
+#CONFIGURE_ARGS="$*"
+#if test -n "$CONFIGURE_ARGS" ; then
+#    echo "Configuring with args $CONFIGURE_ARGS"
+#fi
 #
 # rm -f include/*.h
 #
@@ -184,12 +289,25 @@ TEST_F77=""
 TRY_WEAK_SYMBOLS=1
 #
 known_filesystems="nfs ufs pfs piofs pvfs testfs xfs hfs sfs"
-known_mpi_impls="mpich_mpi sgi_mpi hp_mpi cray_mpi lam_mpi"
+# Open MPI: added "open_mpi"
+known_mpi_impls="mpich_mpi sgi_mpi hp_mpi cray_mpi lam_mpi open_mpi"
 #
 # Defaults
 enable_aio=notgiven
-#
-for arg
+# Open MPI: rather than update the below to use modern GNU auto tools
+# options for getting command line params, just set the defaults that
+# we want here
+FROM_MPICH=1
+MPI="open_mpi"
+NOF77=1
+NOPROFILE=1
+TRY_WEAK_SYMBOLS=0
+# Open MPI: Original form would traverse through $*.  But since modern
+# GNU auto tools pass in opaque command line params that we should not
+# see, add "in $bogus" so that this big statement traverses through
+# nothing (and is effectively ignored).
+#for arg
+for arg in $bogus
 do
 case $arg in
   -arch=* | --arch=*)
@@ -353,7 +471,8 @@ done
 ]
 #
 rm -f config.log
-AC_PREPARE()
+# Open MPI: removed AC#PREPARE
+#AC#_PREPARE()
 #
 dnl
 dnl Place the definitions into a configuration file, rather than sedding
@@ -364,13 +483,17 @@ dnl comment out the line that follows it (CFLAGS="$CFLAGS -DHAVE_ROMIOCONF_H").
 dnl
 AC_CONFIG_HEADER(adio/include/romioconf.h)
 #
-PAC_FIXUP_SRCDIR
+# Open MPI: machinations with the srcdir are no longer necessary in
+# modern versions of the GNU auto tools
+dnl PAC_FIXUP_SRCDIR
 # Get top_srcdir
-if test -z "$top_srcdir" ; then
-    top_srcdir=$srcdir
-fi
+#if test -z "$top_srcdir" ; then
+#    top_srcdir=$srcdir
+#fi
 #
-PAC_MAKE_VPATH
+# Open MPI: machinations with VPATH are no longer necessary in modern
+# versions of the GNU auto tools.
+dnl PAC_MAKE_VPATH
 #
 # Check that an arch was set
 # If it wasn't set, try to guess using "util/tarch"
@@ -407,35 +530,37 @@ fi
 echo "ROMIO home directory is $ROMIO_HOME_TRIAL"
 ROMIO_HOME=$ROMIO_HOME_TRIAL
 #
+# Open MPI: These are no longer necessary with modern versions of the
+# GNU auto tools.
 # Create the "autoconf" style directory names...
 #
-if test -z "$prefix" ; then prefix=$PREFIX ; fi
-if test -z "$prefix" ; then
-    prefix=$ROMIO_HOME
-fi
-AC_SUBST(prefix)
-if test -z "$exec_prefix" ; then exec_prefix='${prefix}' ; fi
+# if test -z "$prefix" ; then prefix=$PREFIX ; fi
+# if test -z "$prefix" ; then
+#     prefix=$ROMIO_HOME
+# fi
+dnl AC_SUBST(prefix)
+# if test -z "$exec_prefix" ; then exec_prefix='${prefix}' ; fi
 # exec_prefix is the prefix for directories containing machine-specific
 # files such as libraries and executables.  For the USER
-AC_SUBST(exec_prefix)
-includedir="${prefix}/include"
-AC_SUBST(includedir)
+dnl AC_SUBST(exec_prefix)
+#includedir="${prefix}/include"
+dnl AC_SUBST(includedir)
 # bindir is for executable programs for the USER
-if test -z "$bindir" ; then bindir='${exec_prefix}/bin' ; fi
-AC_SUBST(bindir)
+#if test -z "$bindir" ; then bindir='${exec_prefix}/bin' ; fi
+dnl AC_SUBST(bindir)
 # sbindir is for executable programs for the ADMINISTRATOR
-if test -z "$sbindir" ; then sbindir='${exec_prefix}/sbin' ; fi
-AC_SUBST(sbindir)
+#if test -z "$sbindir" ; then sbindir='${exec_prefix}/sbin' ; fi
+dnl AC_SUBST(sbindir)
 # libdir is for libraries for the USER
-if test -z "$libdir" ; then libdir='${exec_prefix}/lib' ; fi
-AC_SUBST(libdir)
+#if test -z "$libdir" ; then libdir='${exec_prefix}/lib' ; fi
+dnl AC_SUBST(libdir)
 # mandir is the root for the man pages
-if test -z "$mandir" ; then mandir='${prefix}/man' ; fi
-AC_SUBST(mandir)
-if test -z "$docdir" ; then docdir='${prefix}/doc' ; fi
-AC_SUBST(docdir)
-if test -z "$htmldir" ; then htmldir='${prefix}/www' ; fi
-AC_SUBST(htmldir) 
+#if test -z "$mandir" ; then mandir='${prefix}/man' ; fi
+dnl AC_SUBST(mandir)
+# if test -z "$docdir" ; then docdir='${prefix}/doc' ; fi
+dnl AC_SUBST(docdir)
+#if test -z "$htmldir" ; then htmldir='${prefix}/www' ; fi
+dnl AC_SUBST(htmldir) 
 #
 # check for valid file system
 if test -n "$FILE_SYSTEM" ; then
@@ -493,20 +618,28 @@ if test $FROM_MPICH = 0 ; then
    fi
 fi
 #
-#
-AR="${AR:-ar} cr$AR_LOCAL"
-if test -z "$RANLIB" ; then
+# Open MPI: need to actually get the C compiler
+CFLAGS_save="$CFLAGS"
+AC_PROG_CC
+CFLAGS="$CFLAGS_save"
+
+# Open MPI: this stuff is not necessary with modern versions of the
+# GNU auto tools.
+#AR="${AR:-ar} cr$AR_LOCAL"
+#if test -z "$RANLIB" ; then
     AC_PROG_RANLIB
-fi
-MAKE=${MAKE:-make}
+#fi
+# Open MPI: We should not be using this.
+#MAKE=${MAKE:-make}
 #
 # USER_CFLAGS and USER_FFLAGS are used only in test/Makefile.in
 if test $DEBUG = "yes"; then
     USER_CFLAGS="$CFLAGS -g"
     USER_FFLAGS="$FFLAGS -g"
-else
-    USER_CFLAGS="$CFLAGS -O"
-    USER_FFLAGS="$FFLAGS -O"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#else
+#    USER_CFLAGS="$CFLAGS -O"
+#    USER_FFLAGS="$FFLAGS -O"
 fi
 #
 if test -n "$arch_sun4" ; then 
@@ -515,10 +648,13 @@ if test -n "$arch_sun4" ; then
     if test $DEBUG = "yes"; then
 	if test "$CC" = "gcc"; then
            dnl CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
-           CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
-	else
-           dnl CFLAGS="$CFLAGS -g -DAIO_SUN"
-           CFLAGS="$CFLAGS -g"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#           CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
+           CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#    else 
+#        dnl CFLAGS="$CFLAGS -O -DAIO_SUN"
+#        CFLAGS="$CFLAGS -O"
         fi
     else 
         dnl CFLAGS="$CFLAGS -O -DAIO_SUN"
@@ -547,10 +683,13 @@ if test -n "$arch_solaris" || test -n "$arch_solaris86" ; then
     if test $DEBUG = "yes"; then
         if test "$CC" = "gcc" ; then
             dnl CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
-            CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
-        else 
-            dnl CFLAGS="$CFLAGS -g -v -DAIO_SUN"
-            CFLAGS="$CFLAGS -g -v"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#            CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
+            CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#    else 
+#        dnl CFLAGS="$CFLAGS -O -DAIO_SUN"
+#        CFLAGS="$CFLAGS -O"
         fi
     else 
         dnl CFLAGS="$CFLAGS -O -DAIO_SUN"
@@ -603,9 +742,10 @@ if test -n "$arch_rs6000"; then
     if test $DEBUG = "yes"; then
         dnl CFLAGS="$CFLAGS -g -DNO_FD_IN_AIOCB -DAIO_HANDLE_IN_AIOCB"
         CFLAGS="$CFLAGS -g"
-    else 
-        dnl CFLAGS="$CFLAGS -O -DNO_FD_IN_AIOCB -DAIO_HANDLE_IN_AIOCB"
-        CFLAGS="$CFLAGS -O"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#    else 
+#        dnl CFLAGS="$CFLAGS -O -DNO_FD_IN_AIOCB -DAIO_HANDLE_IN_AIOCB"
+#        CFLAGS="$CFLAGS -O"
     fi
     # Check that aio is available (many systems appear to have aio
     # either installed improperly or turned off).
@@ -661,9 +801,12 @@ if test -n "$arch_paragon"; then
         CFLAGS="$CFLAGS -g"
     else 
 	if test "$CC" = "icc"; then
-           CFLAGS="$CFLAGS -Knoieee -Mvect -O3"
-	else
-           CFLAGS="$CFLAGS -O"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#           CFLAGS="$CFLAGS -Knoieee -Mvect -O3"
+           CFLAGS="$CFLAGS -Knoieee -Mvect"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#	else
+#           CFLAGS="$CFLAGS -O"
         fi
     fi
     AR="ar860 cr$AR_LOCAL"
@@ -697,9 +840,12 @@ if test -n "$arch_tflop" || test -n "$arch_tflops"; then
         CFLAGS="$CFLAGS -g $TFLOP_FLAGS"
     else
        if test "$CC" = "pgcc"; then
-           CFLAGS="$CFLAGS -Knoieee -Mvect -O3 $TFLOP_FLAGS"
-       else
-           CFLAGS="$CFLAGS -O $TFLOP_FLAGS"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#           CFLAGS="$CFLAGS -Knoieee -Mvect -O3 $TFLOP_FLAGS"
+           CFLAGS="$CFLAGS -Knoieee -Mvect $TFLOP_FLAGS"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#       else
+#           CFLAGS="$CFLAGS -O $TFLOP_FLAGS"
        fi
     fi
     AR="xar cr$AR_LOCAL"
@@ -723,6 +869,26 @@ if test -n "$arch_freebsd" || test -n "$arch_LINUX" || test -n "$arch_LINUX_ALPH
        dnl CFLAGS="$CFLAGS -DFREEBSD"
        AC_DEFINE(FREEBSD)
        PAC_HAVE_MOUNT_NFS
+       # Open MPI: Added the following to check for struct
+       # fsbuf.f_fstypename.  The previous approach did not work on
+       # OpenBSD 2.8.
+       if test "$ROMIO_HAVE_MOUNT_NFS" = "1"; then
+            AC_MSG_CHECKING(struct statfs.f_fstypename)
+            AC_COMPILE_CHECK([for language syntax],[#include <sys/param.h>
+#include <sys/mount.h>
+#include <string.h>],[
+  struct statfs f;
+  memset(&f, 0, sizeof(f));
+  strncmp("nfs", f.f_fstypename, 3);],
+  HAVE_STATFS_F_FSTYPENAME=1)
+            if test "$HAVE_STATFS_F_FSTYPENAME" = "1"; then
+                AC_MSG_RESULT([yes])
+            else
+                AC_MSG_RESULT([no])
+            fi
+        fi
+# Open MPI: section end
+
        longlongsize=${longlongsize:-0}
 # printf doesn't work properly and no integer*8 as far as I can tell
     else 
@@ -733,14 +899,17 @@ if test -n "$arch_freebsd" || test -n "$arch_LINUX" || test -n "$arch_LINUX_ALPH
     if test $DEBUG = "yes" ; then
 	if test "$CC" = "gcc" ; then
             dnl CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DNO_AIO"
-            CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#            CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
+            CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
         else
 	    dnl CFLAGS="$CFLAGS -g -DNO_AIO"
 	    CFLAGS="$CFLAGS -g"
         fi
-    else 
-        dnl CFLAGS="$CFLAGS -O -DNO_AIO"
-        CFLAGS="$CFLAGS -O"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#    else 
+#        dnl CFLAGS="$CFLAGS -O -DNO_AIO"
+#        CFLAGS="$CFLAGS -O"
     fi
     if test "$enable_aio" != "yes" ; then
         AC_DEFINE(NO_AIO)
@@ -795,7 +964,8 @@ if test -n "$arch_SX4" ; then
     else
         USER_FFLAGS="$FFLAGS -Chopt"
         dnl CFLAGS="$CFLAGS -O -DNO_AIO -DSX4"
-        CFLAGS="$CFLAGS -O"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#        CFLAGS="$CFLAGS -O"
         FFLAGS="$FFLAGS -Chopt"
     fi
     AC_DEFINE(NO_AIO)
@@ -818,9 +988,11 @@ if test -n "$arch_hpux" || test -n "$arch_sppux" ; then
     if test $DEBUG = "yes"; then
         dnl CFLAGS="$CFLAGS -g +w1 -DNO_AIO"
         CFLAGS="$CFLAGS -g +w1"
-    else 
         dnl CFLAGS="$CFLAGS -O -DNO_AIO"
-        CFLAGS="$CFLAGS -O"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#    else 
+#        dnl CFLAGS="$CFLAGS -O -DNO_AIO"
+#        CFLAGS="$CFLAGS -O"
     fi
     AC_DEFINE(NO_AIO)
     RANLIB=":"
@@ -895,10 +1067,14 @@ if test -n "$arch_alpha" || test -n "$arch_ALPHA" ; then
     F77=${FC:-f77}
     if test $DEBUG = "yes"; then
         dnl CFLAGS="$CFLAGS -g -std1 -warnprotos -verbose -DAIO_PRIORITY_DEFAULT"
-        CFLAGS="$CFLAGS -g -std1 -warnprotos -verbose"
-    else 
-        dnl CFLAGS="$CFLAGS -O -DAIO_PRIORITY_DEFAULT"
-        CFLAGS="$CFLAGS -O"
+# Open MPI: it is not a valid assumption that on Alpha architectures
+# you are always using the alpha compilers
+#        CFLAGS="$CFLAGS -g -std1 -warnprotos -verbose"
+        CFLAGS="$CFLAGS -g -verbose"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#    else 
+#        dnl CFLAGS="$CFLAGS -O -DAIO_PRIORITY_DEFAULT"
+#        CFLAGS="$CFLAGS -O"
     fi
     AC_DEFINE(AIO_PRIORITY_DEFAULT)
     MPI_LIB="$MPI_LIB -laio"
@@ -928,9 +1104,10 @@ if test -n "$arch_CRAY" ; then
     if test $DEBUG = "yes"; then
         dnl CFLAGS="$CFLAGS -g -DNO_AIO"
         CFLAGS="$CFLAGS -g"
-    else 
-        dnl CFLAGS="$CFLAGS -O -DNO_AIO"
-        CFLAGS="$CFLAGS -O"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#    else 
+#        dnl CFLAGS="$CFLAGS -O -DNO_AIO"
+#        CFLAGS="$CFLAGS -O"
     fi
     AC_DEFINE(NO_AIO)
     RANLIB=":"
@@ -1000,8 +1177,9 @@ if test -n "$arch_IRIX"; then
     F77=${FC:-f77}
     if test $DEBUG = "yes"; then
         CFLAGS="$CFLAGS -g -fullwarn"
-    else 
-        CFLAGS="$CFLAGS -O"
+# Open MPI: Don't add any optflags; they come in from the top-level configure
+#    else 
+#        CFLAGS="$CFLAGS -O"
     fi
    if test $osversion = 4 ; then
 	RANLIB="ar ts"
@@ -1380,8 +1558,29 @@ TEST_LIBNAME=$LIBNAME
 MPIRUN=mpirun
 #
 # if MPICH, use mpicc in test programs
+# Open MPI: Force extra if clause for simiplified stuff in Open MPI
 #
-if test $FROM_MPICH = 1 ; then
+if test "$MPI" = "open_mpi"; then
+
+   # Open MPI does have the status set bytes functionality
+
+   AC_DEFINE(HAVE_STATUS_SET_BYTES)
+
+   # Used in the tests/ subdirectory for after ROMIO is built
+
+   TEST_CC=mpicc
+   TEST_F77=mpif77
+   MPIRUN=mpirun
+   MPI_LIB=
+   ROMIO_INCLUDE=
+   USER_CFLAGS=
+   USER_FFLAGS=
+   TEST_LIBNAME=
+
+#
+# if MPICH, use mpicc in test programs
+#
+elif test $FROM_MPICH = 1 ; then
    MPICH_HOME=`dirname $ROMIO_HOME`
    if test -z "$MPI_BIN_DIR" ; then MPI_BIN_DIR=$MPICH_HOME/bin ; fi
    TEST_CC=$MPI_BIN_DIR/mpicc
@@ -1416,6 +1615,20 @@ fi
 dnl CFLAGS="$CFLAGS $DEFS"
 CFLAGS="$CFLAGS -DHAVE_ROMIOCONF_H"
 #
+# Open MPI: we need libtool
+AM_PROG_LIBTOOL
+
+# Open MPI: setup the AM_CONDITIONALs to build the different adio devices
+AM_CONDITIONAL(BUILD_HFS, [test -n "`echo $FILE_SYSTEM | grep hfs`"])
+AM_CONDITIONAL(BUILD_NFS, test -n "`echo $FILE_SYSTEM | grep nfs`")
+AM_CONDITIONAL(BUILD_PFS, test -n "`echo $FILE_SYSTEM | grep pfs`")
+AM_CONDITIONAL(BUILD_PIOFS, test -n "`echo $FILE_SYSTEM | grep piofs`")
+AM_CONDITIONAL(BUILD_PVFS, test -n "`echo $FILE_SYSTEM | grep pvfs`")
+AM_CONDITIONAL(BUILD_SFS, test -n "`echo $FILE_SYSTEM | grep sfs`")
+AM_CONDITIONAL(BUILD_TESTFS, test -n "`echo $FILE_SYSTEM | grep testfs`")
+AM_CONDITIONAL(BUILD_UFS, test -n "`echo $FILE_SYSTEM | grep ufs`")
+AM_CONDITIONAL(BUILD_XFS, test -n "`echo $FILE_SYSTEM | grep xfs`")
+
 echo "setting CC to $CC"
 echo "setting F77 to $F77"
 echo "setting TEST_CC to $TEST_CC"
@@ -1423,7 +1636,11 @@ echo "setting TEST_F77 to $TEST_F77"
 echo "setting CFLAGS to $CFLAGS"
 echo "setting USER_CFLAGS to $USER_CFLAGS"
 echo "setting USER_FFLAGS to $USER_FFLAGS"
-#
+
+# Open MPI: Add on CFLAGS that we figured out up top.  They have
+# makefile macros in them, so we couldn't substitute them until now.
+CFLAGS="$CFLAGS $OMPI_CFLAGS "'-I$(top_builddir)/include'
+
 AC_SUBST(ARCH)
 AC_SUBST(FILE_SYSTEM)
 AC_SUBST(CC)
@@ -1481,36 +1698,66 @@ AC_SUBST(ROMIO_TCPPFLAGS)
 AC_SUBST(ROMIO_TFFLAGS)
 AC_SUBST(MPIRUN)
 AC_SUBST(FORTRAN_TEST)
-if test ! -d adio ; then mkdir adio ; fi
-if test ! -d adio/include ; then mkdir adio/include ; fi
-if test ! -d mpi2-other ; then mkdir mpi2-other ; fi
+# Open MPI: This is no longer necessary with modern versions of the
+# GNU auto tools.
+#if test ! -d adio ; then mkdir adio ; fi
+#if test ! -d adio/include ; then mkdir adio/include ; fi
+#if test ! -d mpi2-other ; then mkdir mpi2-other ; fi
 # 
+
 # Make sure we remove any configuration file incase there is out-of-date data.
 # We remove the version in include in case this is a vpath build
-rm -f adio/include/romioconf.h ${top_srcdir}/adio/include/romioconf.h 
+# Open MPI: This is no longer necessary with modern versions of the
+# GNU auto tools.
+#rm -f adio/include/romioconf.h ${top_srcdir}/adio/include/romioconf.h 
 #
 # Create makefiles for all of the adio devices.  Only the ones that 
 # are active will be called by the top level ROMIO make
-AC_OUTPUT(Makefile mpi-io/Makefile mpi2-other/info/Makefile \
-		   mpi2-other/array/Makefile adio/common/Makefile \
-		   test/Makefile test/misc.c test/large_file.c \
-		   test/runtests util/romioinstall include/mpio.h \
-		   include/mpiof.h \
-		   adio/ad_nfs/Makefile adio/ad_ufs/Makefile \
-		   adio/ad_xfs/Makefile adio/ad_hfs/Makefile \
-		   adio/ad_sfs/Makefile adio/ad_pfs/Makefile \
-		   adio/ad_testfs/Makefile adio/ad_pvfs/Makefile \
-		   adio/ad_piofs/Makefile )
-if test "$NOF77" = 0; then
-    CONFIG_FILES="$CONFIG_FILES mpi-io/fortran/Makefile mpi2-other/info/fortran/Makefile mpi2-other/array/fortran/Makefile test/fmisc.f test/fcoll_test.f test/pfcoll_test.f test/fperf.f"
-fi
-export CONFIG_FILES
-./config.status
-CONFIG_FILES=""
+# Open MPI: revamped the AC_OUTPUT lines to fit our Makefile.am's
+AC_CONFIG_FILES([
+	Makefile 
+	adio/Makefile
+	adio/ad_nfs/Makefile
+	adio/ad_ufs/Makefile
+	adio/ad_xfs/Makefile
+	adio/ad_hfs/Makefile
+	adio/ad_sfs/Makefile
+	adio/ad_pfs/Makefile
+	adio/ad_testfs/Makefile
+	adio/ad_pvfs/Makefile
+	adio/ad_piofs/Makefile
+	adio/common/Makefile
+	adio/include/Makefile
+
+	doc/Makefile
+
+	include/Makefile
+	include/mpio.h
+	include/mpiof.h
+
+	mpi-io/Makefile 
+
+	test/Makefile 
+	test/misc.c 
+	test/large_file.c
+	test/runtests 
+
+	util/Makefile
+])
+AC_OUTPUT
+# Open MPI: This is no longer necessary with modern versions of the
+# GNU auto tools.
+#if test "$NOF77" = 0; then
+#    CONFIG_FILES="$CONFIG_FILES mpi-io/fortran/Makefile mpi2-other/info/fortran/Makefile mpi2-other/array/fortran/Makefile test/fmisc.f test/fcoll_test.f test/pfcoll_test.f test/fperf.f"
+#fi
+#export CONFIG_FILES
+#./config.status
+#CONFIG_FILES=""
 # delete the first line created by configure in some files
-sed 1d util/romioinstall > util/tmp
-mv util/tmp util/romioinstall
-chmod 755 util/romioinstall
+# Open MPI: we're not using romioinstall
+#sed 1d util/romioinstall > util/tmp
+#mv util/tmp util/romioinstall
+#chmod 755 util/romioinstall
 if test "$NOF77" = 0; then
    sed 1d test/fcoll_test.f > test/tmp
    mv test/tmp test/fcoll_test.f

src/mca/io/romio/romio-dist/doc/Makefile.am

@@ -1,3 +1,11 @@
+#
+# $HEADER$
+#
+# Portions taken from original ROMIO Makefile*
+#
+
+EXTRA_DIST = users-build.bbl users-guide.ps.gz users-guide.tex
+
 all:
 	latex users-guide.tex
 	latex users-guide.tex
@@ -12,6 +20,6 @@ bib:
 	latex users-guide.tex
 	dvips -o users-guide.ps users-guide.dvi
 
-clean:
+clean-local:
 	-rm -f users-guide.toc users-guide.log users-guide.dvi \
 	       users-guide.aux

src/mca/io/romio/romio-dist/doc/Makefile.in

@@ -0,0 +1,404 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $HEADER$
+#
+# Portions taken from original ROMIO Makefile*
+#
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = doc
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+EXTRA_DIST = users-build.bbl users-guide.ps.gz users-guide.tex
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  doc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	clean-local distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-info-am
+
+
+all:
+	latex users-guide.tex
+	latex users-guide.tex
+	latex users-guide.tex
+	dvips -o users-guide.ps users-guide.dvi
+	gzip -f users-guide.ps
+
+bib:
+	latex users-guide.tex
+	bibtex users-guide
+	latex users-guide.tex
+	latex users-guide.tex
+	dvips -o users-guide.ps users-guide.dvi
+
+clean-local:
+	-rm -f users-guide.toc users-guide.log users-guide.dvi \
+	       users-guide.aux
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/include/Makefile.am

@@ -2,8 +2,7 @@
 # $HEADER$
 #
 
-include $(top_srcdir)/config/Makefile.options
+include $(top_ompi_srcdir)/config/Makefile.options
 
-include_HEADERS = \
-          mpio_def.h mpio.h
+noinst_HEADERS = mpio.h mpio.h
 

src/mca/io/romio/romio-dist/include/Makefile.in

@@ -0,0 +1,439 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $HEADER$
+#
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = include
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/mpio.h.in $(srcdir)/mpiof.h.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES = mpio.h mpiof.h
+SOURCES =
+DIST_SOURCES =
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+noinst_HEADERS = mpio.h mpio.h
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  include/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  include/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+mpio.h: $(top_builddir)/config.status $(srcdir)/mpio.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+mpiof.h: $(top_builddir)/config.status $(srcdir)/mpiof.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool ctags distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/include/io_romio_conv.h

@@ -1,5 +1,12 @@
-#ifndef MCA_ROMIO_IO_H
-#define MCA_ROMIO_IO_H
+/*
+ * $HEADER$
+ */
+
+#ifndef MCA_IO_ROMIO_CONV_H
+#define MCA_IO_ROMIO_CONV_H
+
+/* Prefix that we add to all ROMIO symbols */
+#define ROMIO_PREFIX(foo) mca_io_romio_dist_##foo
 
 /* Section 9.2 */
 /* Begin Prototypes */
@@ -76,14 +83,13 @@
 #define MPI_File_get_errhandler ROMIO_PREFIX(MPI_File_get_errhandler)
 /* End Prototypes */
 
-#if 0
 /* Section 4.14.4 */
 #define MPI_Type_create_subarray ROMIO_PREFIX(MPI_Type_create_subarray)
 
 /* Section 4.14.5 */
 #define MPI_Type_create_darray ROMIO_PREFIX(MPI_Type_create_darray)
-#endif
 
+/* JMS these don't seem to work... */
 #define MPI_File_f2c ROMIO_PREFIX(MPI_File_f2c)
 #define MPI_File_c2f ROMIO_PREFIX(MPI_File_c2f)
 
@@ -97,36 +103,8 @@
 #define MPI_File ROMIO_PREFIX(MPI_File)
 #define MPIO_Request ROMIO_PREFIX(MPIO_Request)
 
-/* info functions if not defined in the MPI implementation */
-#if 0
-#ifndef HAVE_MPI_INFO
-int         MPI_Info_create (MPI_Info * info);
-int         MPI_Info_set (MPI_Info info,
-                          char *key,
-                          char *value);
-int         MPI_Info_delete (MPI_Info info,
-                             char *key);
-int         MPI_Info_get (MPI_Info info,
-                          char *key,
-                          int valuelen,
-                          char *value,
-                          int *flag);
-int         MPI_Info_get_valuelen (MPI_Info info,
-                                   char *key,
-                                   int *valuelen,
-                                   int *flag);
-int         MPI_Info_get_nkeys (MPI_Info info,
-                                int *nkeys);
-int         MPI_Info_get_nthkey (MPI_Info info,
-                                 int n,
-                                 char *key);
-int         MPI_Info_dup (MPI_Info info,
-                          MPI_Info * newinfo);
-int         MPI_Info_free (MPI_Info * info);
+/* Open MPI's mpi.h #define's MPI_FILE_NULL, so we need to undef it
+   here and allow it to be re-assigned to whatever ROMIO wants */
+#undef MPI_FILE_NULL
 
-MPI_Fint    MPI_Info_c2f (MPI_Info info);
-MPI_Info    MPI_Info_f2c (MPI_Fint info);
-#endif
-#endif
-
-#endif
+#endif /* MCA_IO_ROMIO_CONV_H */

src/mca/io/romio/romio-dist/include/mpio.h.in

@@ -13,6 +13,10 @@
 
 #include "mpi.h"
 
+/* Open MPI: We need to rename almost all of these functions, as well
+   a the types to be names that conform to the prefix rule */
+#include "io_romio_conv.h"
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -231,8 +235,12 @@ int MPI_Type_create_darray(int size, int rank, int ndims,
 #endif
 #endif
 /* above needed for some versions of mpi.h in MPICH!! */
+/* Open MPI: I can't seem to make these #define properly.  Oh well --
+   we don't need them anyway :-( */
+#if 0
 MPI_File MPI_File_f2c(MPI_Fint fh);
 MPI_Fint MPI_File_c2f(MPI_File fh);
+#endif
 
 
 /* The foll. functions are required, because an MPIO_Request object
@@ -271,15 +279,20 @@ int MPI_Info_free(MPI_Info *info);
 #endif
 #endif
 /* above needed for some versions of mpi.h in MPICH!! */
+/* Open MPI: we don't need these in ROMIO */
+#if 0
 MPI_Fint MPI_Info_c2f(MPI_Info info);
 MPI_Info MPI_Info_f2c(MPI_Fint info);
 #endif
+#endif
 
 #endif   /* HAVE_PRAGMA_HP_SEC_DEF */
 
 
 /**************** BINDINGS FOR THE PROFILING INTERFACE ***************/
 
+/* Open MPI: We don't want any of the profiling layer */
+#if 0
 
 /* Section 9.2 */
 int PMPI_File_open(MPI_Comm comm, char *filename, int amode, 
@@ -441,4 +454,6 @@ MPI_Info PMPI_Info_f2c(MPI_Fint info);
 }
 #endif
 
+#endif /* Open MPI: We don't want any of the profiling layer */
+
 #endif

src/mca/io/romio/romio-dist/mpi-io/Makefile.am

@@ -1,38 +1,78 @@
 #
 # $HEADER$
 #
-
-include $(top_srcdir)/config/Makefile.options
-
-AM_CPPFLAGS = -DHAVE_MPI_INFO \
-        -DNO_AIO -I$(top_ompi_builddir)/src/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include \
-        -I../adio/include -I../include -I../../src
-
-#SUBDIRS = fortran 
-
-noinst_LTLIBRARIES = libmca_io_romio_romio_dist_mpi_io.la
-
-libmca_io_romio_romio_dist_mpi_io_la_SOURCES = \
-      mpioimpl.h mpioprof.h close.c read.c open.c write.c set_view.c \
-      iread.c iwrite.c iotest.c iowait.c seek.c get_posn.c \
-      delete.c read_all.c read_at.c \
-      read_atall.c iread_at.c iwrite_at.c write_all.c get_bytoff.c \
-      write_at.c write_atall.c get_view.c get_group.c get_amode.c \
-      get_extent.c fsync.c get_atom.c set_atom.c \
-      set_size.c get_size.c prealloc.c file_f2c.c file_c2f.c \
-      ioreq_f2c.c ioreq_c2f.c set_info.c get_info.c \
-      rd_atallb.c rd_atalle.c read_allb.c read_alle.c wr_atallb.c \
-      wr_atalle.c write_allb.c write_alle.c \
-      get_posn_sh.c iread_sh.c read_sh.c write_sh.c \
-      iwrite_sh.c seek_sh.c read_ord.c read_orde.c write_ordb.c \
-      read_ordb.c write_ord.c write_orde.c get_errh.c set_errh.c
-
-#libmca_io_romio_dist_mpi_io_la_LIBADD  = \
-#  fortran/libmca_io_romio_dist_mpio_fortran.la \
-#$(MCA_io_romio_STATIC_LTLIBS)
+# Open MPI: Note that we ignore the fortran subdirectory here; we only
+# need C bindings.  We also ignore the f2c / c2f source files; we
+# don't need them.
 #
-#libmca_io_romio_dist_mpi_io_la_DEPENDENCIES = \
-# $(libmca_io_romio_dist_mpi_io_la_LIBADD)
 
+include $(top_ompi_srcdir)/config/Makefile.options
+
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libmpi-io.la
+
+libmpi_io_la_SOURCES = \
+        close.c \
+        delete.c \
+        fsync.c \
+        get_amode.c \
+        get_atom.c \
+        get_bytoff.c \
+        get_errh.c \
+        get_extent.c \
+        get_group.c \
+        get_info.c \
+        get_posn.c \
+        get_posn_sh.c \
+        get_size.c \
+        get_view.c \
+        ioreq_c2f.c \
+        ioreq_f2c.c \
+        iotest.c \
+        iowait.c \
+        iread_at.c \
+        iread.c \
+        iread_sh.c \
+        iwrite_at.c \
+        iwrite.c \
+        iwrite_sh.c \
+        mpioimpl.h \
+        mpioprof.h \
+        open.c \
+        prealloc.c \
+        rd_atallb.c \
+        rd_atalle.c \
+        read_allb.c \
+        read_all.c \
+        read_alle.c \
+        read_atall.c \
+        read_at.c \
+        read.c \
+        read_ordb.c \
+        read_ord.c \
+        read_orde.c \
+        read_sh.c \
+        seek.c \
+        seek_sh.c \
+        set_atom.c \
+        set_errh.c \
+        set_info.c \
+        set_size.c \
+        set_view.c \
+        wr_atallb.c \
+        wr_atalle.c \
+        write_allb.c \
+        write_all.c \
+        write_alle.c \
+        write_atall.c \
+        write_at.c \
+        write.c \
+        write_ordb.c \
+        write_ord.c \
+        write_orde.c \
+        write_sh.c

src/mca/io/romio/romio-dist/mpi-io/Makefile.in

@@ -1,76 +1,675 @@
-CC          = @CC@
-AR          = @AR@
-LIBNAME     = @LIBNAME@
-RANLIB      = @RANLIB@
-srcdir      = @srcdir@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir} -I../include -I${srcdir}/../adio/include -I../adio/include
-CFLAGS      = @CFLAGS@ $(MPIOPROFILE) $(INCLUDE_DIR)
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-@VPATH@
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-MPIO_OBJECTS = close.o read.o open.o write.o set_view.o \
-      iread.o iwrite.o iotest.o iowait.o seek.o get_posn.o \
-      delete.o read_all.o read_at.o \
-      read_atall.o iread_at.o iwrite_at.o write_all.o get_bytoff.o \
-      write_at.o write_atall.o get_view.o get_group.o get_amode.o \
-      get_extent.o fsync.o get_atom.o set_atom.o \
-      set_size.o get_size.o prealloc.o file_f2c.o file_c2f.o \
-      ioreq_f2c.o ioreq_c2f.o set_info.o get_info.o \
-      rd_atallb.o rd_atalle.o read_allb.o read_alle.o wr_atallb.o \
-      wr_atalle.o write_allb.o write_alle.o \
-      get_posn_sh.o iread_sh.o read_sh.o write_sh.o \
-      iwrite_sh.o seek_sh.o read_ord.o read_orde.o write_ordb.o \
-      read_ordb.o write_ord.o write_orde.o get_errh.o set_errh.o
+@SET_MAKE@
 
-MPIO_TMP_POBJECTS = close.p read.p open.p write.p get_extent.p \
-      iread.p iwrite.p iotest.p iowait.p seek.p \
-      delete.p read_all.p read_at.p \
-      read_atall.p iread_at.p iwrite_at.p get_posn.p \
-      write_all.p write_at.p write_atall.p get_bytoff.p \
-      set_view.p get_view.p get_group.p get_amode.p \
-      fsync.p get_atom.p set_atom.p set_size.p get_size.p prealloc.p \
-      file_f2c.p file_c2f.p ioreq_f2c.p ioreq_c2f.p set_info.p get_info.p \
-      rd_atallb.p rd_atalle.p read_allb.p read_alle.p wr_atallb.p \
-      wr_atalle.p write_allb.p write_alle.p \
-      get_posn_sh.p iread_sh.p read_sh.p write_sh.p \
-      iwrite_sh.p seek_sh.p read_ord.p read_orde.p write_ordb.p \
-      read_ordb.p write_ord.p write_orde.p get_errh.p set_errh.p
+#
+# $HEADER$
+#
+# Open MPI: Note that we ignore the fortran subdirectory here; we only
+# need C bindings.  We also ignore the f2c / c2f source files; we
+# don't need them.
+#
 
-MPIO_REAL_POBJECTS = _close.o _read.o _open.o _get_extent.o \
-      _write.o _set_view.o _seek.o _read_at.o _prealloc.o \
-      _iread.o _iwrite.o _iotest.o _iowait.o _get_posn.o \
-      _delete.o _read_all.o _get_bytoff.o \
-      _read_atall.o _iread_at.o _iwrite_at.o _get_group.o _get_amode.o \
-      _write_all.o _write_at.o _write_atall.o _get_view.o \
-      _fsync.o _get_atom.o _set_atom.o _set_size.o _get_size.o \
-      _file_f2c.o _file_c2f.o _ioreq_f2c.o _ioreq_c2f.o \
-      _set_info.o _get_info.o \
-      _rd_atallb.o _rd_atalle.o _read_allb.o _read_alle.o _wr_atallb.o \
-      _wr_atalle.o _write_allb.o _write_alle.o \
-      _get_posn_sh.o _iread_sh.o _read_sh.o _write_sh.o \
-      _iwrite_sh.o _seek_sh.o _read_ord.o _read_orde.o _write_ordb.o \
-      _read_ordb.o _write_ord.o _write_orde.o _get_errh.o \
-      _set_errh.o
+SOURCES = $(libmpi_io_la_SOURCES)
 
-all: $(LIBNAME)
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = mpi-io
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmpi_io_la_LIBADD =
+am_libmpi_io_la_OBJECTS = close.lo delete.lo fsync.lo get_amode.lo \
+	get_atom.lo get_bytoff.lo get_errh.lo get_extent.lo \
+	get_group.lo get_info.lo get_posn.lo get_posn_sh.lo \
+	get_size.lo get_view.lo ioreq_c2f.lo ioreq_f2c.lo iotest.lo \
+	iowait.lo iread_at.lo iread.lo iread_sh.lo iwrite_at.lo \
+	iwrite.lo iwrite_sh.lo open.lo prealloc.lo rd_atallb.lo \
+	rd_atalle.lo read_allb.lo read_all.lo read_alle.lo \
+	read_atall.lo read_at.lo read.lo read_ordb.lo read_ord.lo \
+	read_orde.lo read_sh.lo seek.lo seek_sh.lo set_atom.lo \
+	set_errh.lo set_info.lo set_size.lo set_view.lo wr_atallb.lo \
+	wr_atalle.lo write_allb.lo write_all.lo write_alle.lo \
+	write_atall.lo write_at.lo write.lo write_ordb.lo write_ord.lo \
+	write_orde.lo write_sh.lo
+libmpi_io_la_OBJECTS = $(am_libmpi_io_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/close.Plo ./$(DEPDIR)/delete.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/fsync.Plo ./$(DEPDIR)/get_amode.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/get_atom.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/get_bytoff.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/get_errh.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/get_extent.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/get_group.Plo ./$(DEPDIR)/get_info.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/get_posn.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/get_posn_sh.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/get_size.Plo ./$(DEPDIR)/get_view.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ioreq_c2f.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ioreq_f2c.Plo ./$(DEPDIR)/iotest.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/iowait.Plo ./$(DEPDIR)/iread.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/iread_at.Plo ./$(DEPDIR)/iread_sh.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/iwrite.Plo ./$(DEPDIR)/iwrite_at.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/iwrite_sh.Plo ./$(DEPDIR)/open.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/prealloc.Plo ./$(DEPDIR)/rd_atallb.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/rd_atalle.Plo ./$(DEPDIR)/read.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/read_all.Plo ./$(DEPDIR)/read_allb.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/read_alle.Plo ./$(DEPDIR)/read_at.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/read_atall.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/read_ord.Plo ./$(DEPDIR)/read_ordb.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/read_orde.Plo ./$(DEPDIR)/read_sh.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/seek.Plo ./$(DEPDIR)/seek_sh.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/set_atom.Plo ./$(DEPDIR)/set_errh.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/set_info.Plo ./$(DEPDIR)/set_size.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/set_view.Plo ./$(DEPDIR)/wr_atallb.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/wr_atalle.Plo ./$(DEPDIR)/write.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/write_all.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/write_allb.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/write_alle.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/write_at.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/write_atall.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/write_ord.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/write_ordb.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/write_orde.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/write_sh.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libmpi_io_la_SOURCES)
+DIST_SOURCES = $(libmpi_io_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
 
-.SUFFIXES: $(SUFFIXES) .p
+noinst_LTLIBRARIES = libmpi-io.la
+libmpi_io_la_SOURCES = \
+        close.c \
+        delete.c \
+        fsync.c \
+        get_amode.c \
+        get_atom.c \
+        get_bytoff.c \
+        get_errh.c \
+        get_extent.c \
+        get_group.c \
+        get_info.c \
+        get_posn.c \
+        get_posn_sh.c \
+        get_size.c \
+        get_view.c \
+        ioreq_c2f.c \
+        ioreq_f2c.c \
+        iotest.c \
+        iowait.c \
+        iread_at.c \
+        iread.c \
+        iread_sh.c \
+        iwrite_at.c \
+        iwrite.c \
+        iwrite_sh.c \
+        mpioimpl.h \
+        mpioprof.h \
+        open.c \
+        prealloc.c \
+        rd_atallb.c \
+        rd_atalle.c \
+        read_allb.c \
+        read_all.c \
+        read_alle.c \
+        read_atall.c \
+        read_at.c \
+        read.c \
+        read_ordb.c \
+        read_ord.c \
+        read_orde.c \
+        read_sh.c \
+        seek.c \
+        seek_sh.c \
+        set_atom.c \
+        set_errh.c \
+        set_info.c \
+        set_size.c \
+        set_view.c \
+        wr_atallb.c \
+        wr_atalle.c \
+        write_allb.c \
+        write_all.c \
+        write_alle.c \
+        write_atall.c \
+        write_at.c \
+        write.c \
+        write_ordb.c \
+        write_ord.c \
+        write_orde.c \
+        write_sh.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  mpi-io/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  mpi-io/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libmpi-io.la: $(libmpi_io_la_OBJECTS) $(libmpi_io_la_DEPENDENCIES) 
+	$(LINK)  $(libmpi_io_la_LDFLAGS) $(libmpi_io_la_OBJECTS) $(libmpi_io_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/delete.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsync.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_amode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_atom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_bytoff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_errh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_extent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_group.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_info.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_posn.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_posn_sh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_size.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_view.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioreq_c2f.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioreq_f2c.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iotest.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iowait.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iread_at.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iread_sh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iwrite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iwrite_at.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iwrite_sh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prealloc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rd_atallb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rd_atalle.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_all.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_allb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_alle.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_at.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_atall.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_ord.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_ordb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_orde.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_sh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seek.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seek_sh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set_atom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set_errh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set_info.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set_size.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set_view.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wr_atallb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wr_atalle.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write_all.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write_allb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write_alle.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write_at.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write_atall.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write_ord.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write_ordb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write_orde.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write_sh.Plo@am__quote@
 
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
-.c.p:
-	@cp $(srcdir)/$*.c _$*.c
-	$(CC) $(CFLAGS) -c _$*.c
-	@rm -f _$*.c
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
-profile: $(MPIO_TMP_POBJECTS)
-	$(AR) $(LIBNAME) $(MPIO_REAL_POBJECTS)
-	@rm -f _*.o
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-$(LIBNAME): $(MPIO_OBJECTS)
-	$(AR) $(LIBNAME) $(MPIO_OBJECTS)
+mostlyclean-libtool:
+	-rm -f *.lo
 
-clean:
-	@rm -f *.o
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/romio-dist/test/noncontig_coll2.c

@@ -5,6 +5,10 @@
 #include <string.h>
 #include <stdlib.h>
 
+/* Open MPI: include our printf.h to ensure that we get an snprintf()
+   that works on this platform */
+#include "util/printf.h"
+
 /* tests noncontiguous reads/writes using collective I/O */
 
 /* this test is almost exactly like noncontig_coll.c with the following changes:

src/mca/io/romio/romio-dist/util/Makefile.am

@@ -0,0 +1,5 @@
+#
+# $HEADER$
+#
+
+EXTRA_DIST = romioinstall.in tarch

src/mca/io/romio/romio-dist/util/Makefile.in

@@ -0,0 +1,384 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $HEADER$
+#
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = util
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+EXTRA_DIST = romioinstall.in tarch
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  util/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  util/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

src/mca/io/romio/src/Makefile.am

@@ -7,16 +7,17 @@ include $(top_ompi_srcdir)/config/Makefile.options
 AM_CPPFLAGS = \
         -I$(top_ompi_builddir)/src/include \
         -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
+        -I$(top_ompi_srcdir)/src/include \
+        -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmca_io_romio.la
 libmca_io_romio_la_SOURCES = \
 	io_romio.h \
 	io_romio_conv.h \
-	io_romio_global.c \
 	io_romio_component.c \
 	io_romio_file_open.c \
 	io_romio_file_read.c \
 	io_romio_file_request.c \
-	io_romio_file_write.c
+	io_romio_file_write.c \
+	io_romio_module.c
 

src/mca/io/romio/src/io_romio.h

@@ -8,263 +8,264 @@
 #include "request/request.h"
 #include "file/file.h"
 #include "threads/mutex.h"
-#include "../romio-dist/include/mpio_def.h"
+#include "romio-dist/adio/include/romioconf.h"
+#include "romio-dist/include/mpio.h"
+#include "mca/io/io.h"
+#include "mca/io/base/io_base_request.h"
 
-/* global variables, instantiated in global.c  */
+
+/*
+ * global variables, instantiated in module.c  
+ */
 extern ompi_mutex_t mca_io_romio_mutex;
-extern mca_io_1_0_0_t mca_io_romio_ops;
+extern mca_io_base_module_1_0_0_t mca_io_romio_module;
+
 
 /* 
- * MPI_Request:  "inherit" the ompi_request, and add more stuff:
- * (romio module will instantiate)
+ * The romio component will "inherit" from the mca_io_base_request_t,
+ * adding its own stuff on to the end.
  */
 struct mca_io_romio_request_t {
-    ompi_request_t super;
+    mca_io_base_request_t super;
     ROMIO_PREFIX (MPIO_Request) romio_rq;
 };
 typedef struct mca_io_romio_request_t mca_io_romio_request_t;
 
+
 /* 
- * MPI_File:  "inherit" the ompi_file_t, and add more stuff
- * (romio module will instantiate)
+ * Private data for ROMIO modules
  */
-struct mca_io_romio_file_t {
-    ompi_file_t super;
+struct mca_io_romio_data_t {
     ROMIO_PREFIX (MPI_File) romio_fh;
 };
-typedef struct mca_io_romio_file_t mca_io_romio_file_t;
+typedef struct mca_io_romio_data_t mca_io_romio_data_t;
 
-/* function prototypes 
+
+/*
+ * Module functions
  *
  *  mca->ROMIO module routines:    
- *    ROMIO_PREFIX(File_XXX)
+ *    ROMIO_PREFIX(file_XXX)
  *  ROMIO operations names:
  *    ROMIO_PREFIX(MPI_File_XXX)
  */
 /* Section 9.2 */
-int         mca_io_romio_File_open (MPI_Comm comm,
+int         mca_io_romio_file_open (ompi_communicator_t *comm,
                                     char *filename,
                                     int amode,
-                                    MPI_Info info,
-                                    MPI_File * fh);
-int         mca_io_romio_File_close (MPI_File * fh);
-int         mca_io_romio_File_delete (char *filename,
-                                      MPI_Info info);
-int         mca_io_romio_File_set_size (MPI_File fh,
+                                    ompi_info_t *info,
+                                    ompi_file_t *fh);
+int         mca_io_romio_file_close (ompi_file_t *fh);
+int         mca_io_romio_file_delete (char *filename,
+                                      ompi_info_t *info);
+int         mca_io_romio_file_set_size (ompi_file_t *fh,
                                         MPI_Offset size);
-int         mca_io_romio_File_preallocate (MPI_File fh,
+int         mca_io_romio_file_preallocate (ompi_file_t *fh,
                                            MPI_Offset size);
-int         mca_io_romio_File_get_size (MPI_File fh,
+int         mca_io_romio_file_get_size (ompi_file_t *fh,
                                         MPI_Offset * size);
-int         mca_io_romio_File_get_group (MPI_File fh,
-                                         MPI_Group * group);
-int         mca_io_romio_File_get_amode (MPI_File fh,
+int         mca_io_romio_file_get_amode (ompi_file_t *fh,
                                          int *amode);
-int         mca_io_romio_File_set_info (MPI_File fh,
-                                        MPI_Info info);
-int         mca_io_romio_File_get_info (MPI_File fh,
-                                        MPI_Info * info_used);
+int         mca_io_romio_file_set_info (ompi_file_t *fh,
+                                        ompi_info_t *info);
+int         mca_io_romio_file_get_info (ompi_file_t *fh,
+                                        ompi_info_t ** info_used);
 
 /* Section 9.3 */
-int         mca_io_romio_File_set_view (MPI_File fh,
+int         mca_io_romio_file_set_view (ompi_file_t *fh,
                                         MPI_Offset disp,
-                                        MPI_Datatype etype,
-                                        MPI_Datatype filetype,
+                                        ompi_datatype_t *etype,
+                                        ompi_datatype_t *filetype,
                                         char *datarep,
-                                        MPI_Info info);
-int         mca_io_romio_File_get_view (MPI_File fh,
+                                        ompi_info_t *info);
+int         mca_io_romio_file_get_view (ompi_file_t *fh,
                                         MPI_Offset * disp,
-                                        MPI_Datatype * etype,
-                                        MPI_Datatype * filetype,
+                                        ompi_datatype_t ** etype,
+                                        ompi_datatype_t ** filetype,
                                         char *datarep);
 
 /* Section 9.4.2 */
-int         mca_io_romio_File_read_at (MPI_File fh,
+int         mca_io_romio_file_read_at (ompi_file_t *fh,
                                        MPI_Offset offset,
                                        void *buf,
                                        int count,
-                                       MPI_Datatype datatype,
-                                       MPI_Status * status);
-int         mca_io_romio_File_read_at_all (MPI_File fh,
+                                       ompi_datatype_t *datatype,
+                                       ompi_status_public_t * status);
+int         mca_io_romio_file_read_at_all (ompi_file_t *fh,
                                            MPI_Offset offset,
                                            void *buf,
                                            int count,
-                                           MPI_Datatype datatype,
-                                           MPI_Status * status);
-int         mca_io_romio_File_write_at (MPI_File fh,
+                                           ompi_datatype_t *datatype,
+                                           ompi_status_public_t * status);
+int         mca_io_romio_file_write_at (ompi_file_t *fh,
                                         MPI_Offset offset,
                                         void *buf,
                                         int count,
-                                        MPI_Datatype datatype,
-                                        MPI_Status * status);
-int         mca_io_romio_File_write_at_all (MPI_File fh,
+                                        ompi_datatype_t *datatype,
+                                        ompi_status_public_t * status);
+int         mca_io_romio_file_write_at_all (ompi_file_t *fh,
                                             MPI_Offset offset,
                                             void *buf,
                                             int count,
-                                            MPI_Datatype datatype,
-                                            MPI_Status * status);
-int         mca_io_romio_File_iread_at (MPI_File fh,
+                                            ompi_datatype_t *datatype,
+                                            ompi_status_public_t * status);
+int         mca_io_romio_file_iread_at (ompi_file_t *fh,
                                         MPI_Offset offset,
                                         void *buf,
                                         int count,
-                                        MPI_Datatype datatype,
-                                        MPI_Request * request);
-int         mca_io_romio_File_iwrite_at (MPI_File fh,
+                                        ompi_datatype_t *datatype,
+                                        mca_io_base_request_t * request);
+int         mca_io_romio_file_iwrite_at (ompi_file_t *fh,
                                          MPI_Offset offset,
                                          void *buf,
                                          int count,
-                                         MPI_Datatype datatype,
-                                         MPI_Request * request);
+                                         ompi_datatype_t *datatype,
+                                         mca_io_base_request_t * request);
 
 /* Section 9.4.3 */
-int         mca_io_romio_File_read (MPI_File fh,
+int         mca_io_romio_file_read (ompi_file_t *fh,
                                     void *buf,
                                     int count,
-                                    MPI_Datatype datatype,
-                                    MPI_Status * status);
-int         mca_io_romio_File_read_all (MPI_File fh,
+                                    ompi_datatype_t *datatype,
+                                    ompi_status_public_t * status);
+int         mca_io_romio_file_read_all (ompi_file_t *fh,
                                         void *buf,
                                         int count,
-                                        MPI_Datatype datatype,
-                                        MPI_Status * status);
-int         mca_io_romio_File_write (MPI_File fh,
+                                        ompi_datatype_t *datatype,
+                                        ompi_status_public_t * status);
+int         mca_io_romio_file_write (ompi_file_t *fh,
                                      void *buf,
                                      int count,
-                                     MPI_Datatype datatype,
-                                     MPI_Status * status);
-int         mca_io_romio_File_write_all (MPI_File fh,
+                                     ompi_datatype_t *datatype,
+                                     ompi_status_public_t * status);
+int         mca_io_romio_file_write_all (ompi_file_t *fh,
                                          void *buf,
                                          int count,
-                                         MPI_Datatype datatype,
-                                         MPI_Status * status);
-int         mca_io_romio_File_iread (MPI_File fh,
+                                         ompi_datatype_t *datatype,
+                                         ompi_status_public_t * status);
+int         mca_io_romio_file_iread (ompi_file_t *fh,
                                      void *buf,
                                      int count,
-                                     MPI_Datatype datatype,
-                                     MPI_Request * request);
-int         mca_io_romio_File_iwrite (MPI_File fh,
+                                     ompi_datatype_t *datatype,
+                                     mca_io_base_request_t * request);
+int         mca_io_romio_file_iwrite (ompi_file_t *fh,
                                       void *buf,
                                       int count,
-                                      MPI_Datatype datatype,
-                                      ompi_request_t ** request);
-int         mca_io_romio_File_seek (MPI_File fh,
+                                      ompi_datatype_t *datatype,
+                                      mca_io_base_request_t * request);
+int         mca_io_romio_file_seek (ompi_file_t *fh,
                                     MPI_Offset offset,
                                     int whence);
-int         mca_io_romio_File_get_position (MPI_File fh,
+int         mca_io_romio_file_get_position (ompi_file_t *fh,
                                             MPI_Offset * offset);
-int         mca_io_romio_File_get_byte_offset (MPI_File fh,
+int         mca_io_romio_file_get_byte_offset (ompi_file_t *fh,
                                                MPI_Offset offset,
                                                MPI_Offset * disp);
 
 /* Section 9.4.4 */
-int         mca_io_romio_File_read_shared (MPI_File fh,
+int         mca_io_romio_file_read_shared (ompi_file_t *fh,
                                            void *buf,
                                            int count,
-                                           MPI_Datatype datatype,
-                                           MPI_Status * status);
-int         mca_io_romio_File_write_shared (MPI_File fh,
+                                           ompi_datatype_t *datatype,
+                                           ompi_status_public_t * status);
+int         mca_io_romio_file_write_shared (ompi_file_t *fh,
                                             void *buf,
                                             int count,
-                                            MPI_Datatype datatype,
-                                            MPI_Status * status);
-int         mca_io_romio_File_iread_shared (MPI_File fh,
+                                            ompi_datatype_t *datatype,
+                                            ompi_status_public_t * status);
+int         mca_io_romio_file_iread_shared (ompi_file_t *fh,
                                             void *buf,
                                             int count,
-                                            MPI_Datatype datatype,
-                                            MPI_Request * request);
-int         mca_io_romio_File_iwrite_shared (MPI_File fh,
+                                            ompi_datatype_t *datatype,
+                                            mca_io_base_request_t * request);
+int         mca_io_romio_file_iwrite_shared (ompi_file_t *fh,
                                              void *buf,
                                              int count,
-                                             MPI_Datatype datatype,
-                                             MPI_Request * request);
-int         mca_io_romio_File_read_ordered (MPI_File fh,
+                                             ompi_datatype_t *datatype,
+                                             mca_io_base_request_t * request);
+int         mca_io_romio_file_read_ordered (ompi_file_t *fh,
                                             void *buf,
                                             int count,
-                                            MPI_Datatype datatype,
-                                            MPI_Status * status);
-int         mca_io_romio_File_write_ordered (MPI_File fh,
+                                            ompi_datatype_t *datatype,
+                                            ompi_status_public_t * status);
+int         mca_io_romio_file_write_ordered (ompi_file_t *fh,
                                              void *buf,
                                              int count,
-                                             MPI_Datatype datatype,
-                                             MPI_Status * status);
-int         mca_io_romio_File_seek_shared (MPI_File fh,
+                                             ompi_datatype_t *datatype,
+                                             ompi_status_public_t * status);
+int         mca_io_romio_file_seek_shared (ompi_file_t *fh,
                                            MPI_Offset offset,
                                            int whence);
-int         mca_io_romio_File_get_position_shared (MPI_File fh,
+int         mca_io_romio_file_get_position_shared (ompi_file_t *fh,
                                                    MPI_Offset * offset);
 
 /* Section 9.4.5 */
-int         mca_io_romio_File_read_at_all_begin (MPI_File fh,
+int         mca_io_romio_file_read_at_all_begin (ompi_file_t *fh,
                                                  MPI_Offset offset,
                                                  void *buf,
                                                  int count,
-                                                 MPI_Datatype datatype);
-int         mca_io_romio_File_read_at_all_end (MPI_File fh,
+                                                 ompi_datatype_t *datatype);
+int         mca_io_romio_file_read_at_all_end (ompi_file_t *fh,
                                                void *buf,
-                                               MPI_Status * status);
-int         mca_io_romio_File_write_at_all_begin (MPI_File fh,
+                                               ompi_status_public_t * status);
+int         mca_io_romio_file_write_at_all_begin (ompi_file_t *fh,
                                                   MPI_Offset offset,
                                                   void *buf,
                                                   int count,
-                                                  MPI_Datatype datatype);
-int         mca_io_romio_File_write_at_all_end (MPI_File fh,
+                                                  ompi_datatype_t *datatype);
+int         mca_io_romio_file_write_at_all_end (ompi_file_t *fh,
                                                 void *buf,
-                                                MPI_Status * status);
-int         mca_io_romio_File_read_all_begin (MPI_File fh,
+                                                ompi_status_public_t * status);
+int         mca_io_romio_file_read_all_begin (ompi_file_t *fh,
                                               void *buf,
                                               int count,
-                                              MPI_Datatype datatype);
-int         mca_io_romio_File_read_all_end (MPI_File fh,
+                                              ompi_datatype_t *datatype);
+int         mca_io_romio_file_read_all_end (ompi_file_t *fh,
                                             void *buf,
-                                            MPI_Status * status);
-int         mca_io_romio_File_write_all_begin (MPI_File fh,
+                                            ompi_status_public_t * status);
+int         mca_io_romio_file_write_all_begin (ompi_file_t *fh,
                                                void *buf,
                                                int count,
-                                               MPI_Datatype datatype);
-int         mca_io_romio_File_write_all_end (MPI_File fh,
+                                               ompi_datatype_t *datatype);
+int         mca_io_romio_file_write_all_end (ompi_file_t *fh,
                                              void *buf,
-                                             MPI_Status * status);
-int         mca_io_romio_File_read_ordered_begin (MPI_File fh,
+                                             ompi_status_public_t * status);
+int         mca_io_romio_file_read_ordered_begin (ompi_file_t *fh,
                                                   void *buf,
                                                   int count,
-                                                  MPI_Datatype datatype);
-int         mca_io_romio_File_read_ordered_end (MPI_File fh,
+                                                  ompi_datatype_t *datatype);
+int         mca_io_romio_file_read_ordered_end (ompi_file_t *fh,
                                                 void *buf,
-                                                MPI_Status * status);
-int         mca_io_romio_File_write_ordered_begin (MPI_File fh,
+                                                ompi_status_public_t * status);
+int         mca_io_romio_file_write_ordered_begin (ompi_file_t *fh,
                                                    void *buf,
                                                    int count,
-                                                   MPI_Datatype datatype);
-int         mca_io_romio_File_write_ordered_end (MPI_File fh,
+                                                   ompi_datatype_t *datatype);
+int         mca_io_romio_file_write_ordered_end (ompi_file_t *fh,
                                                  void *buf,
-                                                 MPI_Status * status);
+                                                 ompi_status_public_t * status);
 
 /* Section 9.5.1 */
-int         mca_io_romio_File_get_type_extent (MPI_File fh,
-                                               MPI_Datatype datatype,
+int         mca_io_romio_file_get_type_extent (ompi_file_t *fh,
+                                               ompi_datatype_t *datatype,
                                                MPI_Aint * extent);
 
 /* Section 9.6.1 */
-int         mca_io_romio_File_set_atomicity (MPI_File fh,
+int         mca_io_romio_file_set_atomicity (ompi_file_t *fh,
                                              int flag);
-int         mca_io_romio_File_get_atomicity (MPI_File fh,
+int         mca_io_romio_file_get_atomicity (ompi_file_t *fh,
                                              int *flag);
-int         mca_io_romio_File_sync (MPI_File fh);
+int         mca_io_romio_file_sync (ompi_file_t *fh);
 
-/* Section 4.13.3 */
-int         mca_io_romio_File_set_errhandler (MPI_File,
-                                              MPI_Errhandler);
-int         mca_io_romio_File_get_errhandler (MPI_File,
-                                              MPI_Errhandler *);
 /* End Prototypes */
 
 /* The funtions will not be called by users, but by OMPI's 
  * MPI_Test/Wait functions when they are called with an I/O request. 
  */
-int         mca_io_romio_Test (MPI_Request * request,
+int         mca_io_romio_test (mca_io_base_request_t * request,
                                int *flag,
-                               MPI_Status * status);
-int         mca_io_romio_Wait (MPI_Request * request,
-                               MPI_Status * status);
+                               ompi_status_public_t * status);
+int         mca_io_romio_wait (mca_io_base_request_t * request,
+                               ompi_status_public_t * status);
 
 #endif                          /* MCA_IO_ROMIO_H */

src/mca/io/romio/src/io_romio_component.c

@@ -7,9 +7,24 @@
 #include "io_romio.h"
 
 
-mca_io_1_0_0_t *mca_io_romio_component_init (int *priority,
-                                          int *min_thread,
-                                          int *max_thread);
+/*
+ * Private functions
+ */
+static int init_query(bool *enable_multi_user_threads,
+                      bool *have_hidden_threads);
+static const struct mca_io_base_module_1_0_0_t *
+  file_query(struct ompi_file_t *file, 
+             struct mca_io_base_file_t **private_data,
+             int *priority);
+static int file_unquery(struct ompi_file_t *file, 
+                        struct mca_io_base_file_t *private_data);
+
+static int delete_query(char *filename, struct ompi_info_t *info, 
+                        struct mca_io_base_delete_t **private_data,
+                        bool *usable, int *priorty);
+static int delete_select(char *filename, struct ompi_info_t *info,
+                         struct mca_io_base_delete_t *private_data);
+
 
 mca_io_base_component_1_0_0_t mca_io_romio_component = {
     /* First, the mca_base_component_t struct containing meta information
@@ -34,18 +49,89 @@ mca_io_base_component_1_0_0_t mca_io_romio_component = {
         false
     },
 
-    mca_io_romio_component_init    /* component init */
+    /* Initial configuration / Open a new file */
+
+    init_query,
+    file_query,
+    file_unquery,
+
+    /* Delete a file */
+
+    delete_query,
+    NULL,
+    delete_select
 };
 
 
-mca_io_1_0_0_t *
-mca_io_romio_component_init (int *priority,
-                             int *min_thread,
-                             int *max_thread)
+static int init_query(bool *allow_multi_user_threads,
+                      bool *have_hidden_threads)
 {
-    *priority = 10;
-    *min_thread = MPI_THREAD_SINGLE;
-    *max_thread = MPI_THREAD_SERIALIZED;
+    *allow_multi_user_threads = false;
+    *have_hidden_threads = false;
 
-    return &mca_io_romio_ops;
+    return OMPI_SUCCESS;
+}
+
+
+static const struct mca_io_base_module_1_0_0_t *
+file_query(struct ompi_file_t *file, 
+           struct mca_io_base_file_t **private_data,
+           int *priority)
+{
+    mca_io_romio_data_t *data;
+
+    /* Allocate a space for this module to hang private data (e.g.,
+       the ROMIO file handle) */
+
+    data = malloc(sizeof(mca_io_romio_data_t));
+    if (NULL == data) {
+        return NULL;
+    }
+    data->romio_fh = NULL;
+    *private_data = (struct mca_io_base_file_t*) data;
+
+    /* The priority level of 20 is pretty arbitrary, since this
+       component is likely to be the only one in io v1.x */
+
+    *priority = 20;
+    return &mca_io_romio_module;
+}
+
+
+static int file_unquery(struct ompi_file_t *file, 
+                        struct mca_io_base_file_t *private_data)
+{
+    /* Free the romio module-specific data that was allocated in
+       _file_query(), above */
+
+    if (NULL != private_data) {
+        free(private_data);
+    }
+
+    return OMPI_SUCCESS;
+}
+
+
+static int delete_query(char *filename, struct ompi_info_t *info, 
+                        struct mca_io_base_delete_t **private_data,
+                        bool *usable, int *priority)
+{
+    *usable = true;
+    *priority = 10;
+    *private_data = NULL;
+
+    return OMPI_SUCCESS;
+}
+
+
+static int delete_select(char *filename, struct ompi_info_t *info,
+                         struct mca_io_base_delete_t *private_data)
+{
+    int ret;
+
+    OMPI_THREAD_LOCK (&mca_io_romio_mutex);
+    ret = ROMIO_PREFIX(MPI_File_delete)(filename, info);
+    OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
+
+    return ret;
 }

src/mca/io/romio/src/io_romio_file_open.c

@@ -2,36 +2,30 @@
  *  $HEADER$
  */
 
-#include "mpi.h"
+#include "ompi_config.h"
+
+#include "communicator/communicator.h"
+#include "info/info.h"
 #include "file/file.h"
-#include "io_romio.h"
 #include "request/request.h"
-#include <string.h>
+
+#include "io_romio.h"
+
 
 int
-mca_io_romio_File_open (MPI_Comm comm,
+mca_io_romio_file_open (ompi_communicator_t *comm,
                         char *filename,
                         int amode,
-                        MPI_Info info,
-                        MPI_File * fh)
+                        ompi_info_t *info,
+                        ompi_file_t *fh)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* create a new ompi_file_t */
-    mca_romio_fh = malloc (sizeof (mca_io_romio_file_t));
-    (*fh) = (ompi_file_t *) mca_romio_fh;
-    strncpy ((*fh)->f_name, filename, MPI_MAX_OBJECT_NAME);
-    (*fh)->ompi_io_version = OMPI_IO_1_0_0;
-    (*fh)->mca_io_functions.f_io = mca_io_romio_ops;
-
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret =
-        mca_io_romio_MPI_File_open (comm, filename, amode, info,
-                                    &romio_fh);
+    ret = ROMIO_PREFIX(MPI_File_open)(comm, filename, amode, info, 
+                                      &data->romio_fh);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -39,34 +33,15 @@ mca_io_romio_File_open (MPI_Comm comm,
 
 
 int
-mca_io_romio_File_close (MPI_File * fh)
+mca_io_romio_file_close (ompi_file_t *fh)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
+    mca_io_romio_data_t *data;
 
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) (*fh);
-    romio_fh = mca_romio_fh->romio_fh;
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
 
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_close (&romio_fh);
-    OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
-
-    free (*fh);
-
-    return ret;
-}
-
-
-int
-mca_io_romio_File_delete (char *filename,
-                          MPI_Info info)
-{
-    int         ret;
-
-    OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_delete (filename, info);
+    ret = ROMIO_PREFIX(MPI_File_close) (&data->romio_fh);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -74,38 +49,30 @@ mca_io_romio_File_delete (char *filename,
 
 
 int
-mca_io_romio_File_set_size (MPI_File fh,
+mca_io_romio_file_set_size (ompi_file_t *fh,
                             MPI_Offset size)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_set_size (romio_fh, size);
+    ret = ROMIO_PREFIX(MPI_File_set_size) (data->romio_fh, size);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
 }
 
 int
-mca_io_romio_File_preallocate (MPI_File fh,
+mca_io_romio_file_preallocate (ompi_file_t *fh,
                                MPI_Offset size)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_preallocate (romio_fh, size);
+    ret = ROMIO_PREFIX(MPI_File_preallocate) (data->romio_fh, size);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -113,19 +80,15 @@ mca_io_romio_File_preallocate (MPI_File fh,
 
 
 int
-mca_io_romio_File_get_size (MPI_File fh,
+mca_io_romio_file_get_size (ompi_file_t *fh,
                             MPI_Offset * size)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_get_size (romio_fh, size);
+    ret = ROMIO_PREFIX(MPI_File_get_size) (data->romio_fh, size);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -133,39 +96,15 @@ mca_io_romio_File_get_size (MPI_File fh,
 
 
 int
-mca_io_romio_File_get_group (MPI_File fh,
-                             MPI_Group * group)
-{
-    int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
-
-    OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_get_group (romio_fh, group);
-    OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
-
-    return ret;
-}
-
-
-int
-mca_io_romio_File_get_amode (MPI_File fh,
+mca_io_romio_file_get_amode (ompi_file_t *fh,
                              int *amode)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_get_amode (romio_fh, amode);
+    ret = ROMIO_PREFIX(MPI_File_get_amode) (data->romio_fh, amode);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -173,19 +112,15 @@ mca_io_romio_File_get_amode (MPI_File fh,
 
 
 int
-mca_io_romio_File_set_info (MPI_File fh,
-                            MPI_Info info)
+mca_io_romio_file_set_info (ompi_file_t *fh,
+                            ompi_info_t *info)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_set_info (romio_fh, info);
+    ret = ROMIO_PREFIX(MPI_File_set_info) (data->romio_fh, info);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -193,19 +128,15 @@ mca_io_romio_File_set_info (MPI_File fh,
 
 
 int
-mca_io_romio_File_get_info (MPI_File fh,
-                            MPI_Info * info_used)
+mca_io_romio_file_get_info (ompi_file_t *fh,
+                            ompi_info_t ** info_used)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_get_info (romio_fh, info_used);
+    ret = ROMIO_PREFIX(MPI_File_get_info) (data->romio_fh, info_used);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -213,24 +144,20 @@ mca_io_romio_File_get_info (MPI_File fh,
 
 
 int
-mca_io_romio_File_set_view (MPI_File fh,
+mca_io_romio_file_set_view (ompi_file_t *fh,
                             MPI_Offset disp,
-                            MPI_Datatype etype,
-                            MPI_Datatype filetype,
+                            ompi_datatype_t *etype,
+                            ompi_datatype_t *filetype,
                             char *datarep,
-                            MPI_Info info)
+                            ompi_info_t *info)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_set_view (romio_fh, disp, etype, filetype,
+        ROMIO_PREFIX(MPI_File_set_view) (data->romio_fh, disp, etype, filetype,
                                         datarep, info);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -239,23 +166,19 @@ mca_io_romio_File_set_view (MPI_File fh,
 
 
 int
-mca_io_romio_File_get_view (MPI_File fh,
+mca_io_romio_file_get_view (ompi_file_t *fh,
                             MPI_Offset * disp,
-                            MPI_Datatype * etype,
-                            MPI_Datatype * filetype,
+                            ompi_datatype_t ** etype,
+                            ompi_datatype_t ** filetype,
                             char *datarep)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_get_view (romio_fh, disp, etype, filetype,
+        ROMIO_PREFIX(MPI_File_get_view) (data->romio_fh, disp, etype, filetype,
                                         datarep);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -265,21 +188,17 @@ mca_io_romio_File_get_view (MPI_File fh,
 
 
 int
-mca_io_romio_File_get_type_extent (MPI_File fh,
-                                   MPI_Datatype datatype,
+mca_io_romio_file_get_type_extent (ompi_file_t *fh,
+                                   ompi_datatype_t *datatype,
                                    MPI_Aint * extent)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_get_type_extent (romio_fh, datatype, extent);
+        ROMIO_PREFIX(MPI_File_get_type_extent) (data->romio_fh, datatype, extent);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -287,56 +206,44 @@ mca_io_romio_File_get_type_extent (MPI_File fh,
 
 
 int
-mca_io_romio_File_set_atomicity (MPI_File fh,
+mca_io_romio_file_set_atomicity (ompi_file_t *fh,
                                  int flag)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_set_atomicity (romio_fh, flag);
+    ret = ROMIO_PREFIX(MPI_File_set_atomicity) (data->romio_fh, flag);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
 }
 
 int
-mca_io_romio_File_get_atomicity (MPI_File fh,
+mca_io_romio_file_get_atomicity (ompi_file_t *fh,
                                  int *flag)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_get_atomicity (romio_fh, flag);
+    ret = ROMIO_PREFIX(MPI_File_get_atomicity) (data->romio_fh, flag);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
 }
 
 int
-mca_io_romio_File_sync (MPI_File fh)
+mca_io_romio_file_sync (ompi_file_t *fh)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_sync (romio_fh);
+    ret = ROMIO_PREFIX(MPI_File_sync) (data->romio_fh);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -344,20 +251,16 @@ mca_io_romio_File_sync (MPI_File fh)
 
 
 int
-mca_io_romio_File_seek_shared (MPI_File fh,
+mca_io_romio_file_seek_shared (ompi_file_t *fh,
                                MPI_Offset offset,
                                int whence)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_seek_shared (romio_fh, offset, whence);
+    ret = ROMIO_PREFIX(MPI_File_seek_shared) (data->romio_fh, offset, whence);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -365,19 +268,15 @@ mca_io_romio_File_seek_shared (MPI_File fh,
 
 
 int
-mca_io_romio_File_get_position_shared (MPI_File fh,
+mca_io_romio_file_get_position_shared (ompi_file_t *fh,
                                        MPI_Offset * offset)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_get_position_shared (romio_fh, offset);
+    ret = ROMIO_PREFIX(MPI_File_get_position_shared) (data->romio_fh, offset);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -385,20 +284,16 @@ mca_io_romio_File_get_position_shared (MPI_File fh,
 
 
 int
-mca_io_romio_File_seek (MPI_File fh,
+mca_io_romio_file_seek (ompi_file_t *fh,
                         MPI_Offset offset,
                         int whence)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_seek (romio_fh, offset, whence);
+    ret = ROMIO_PREFIX(MPI_File_seek) (data->romio_fh, offset, whence);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -406,19 +301,15 @@ mca_io_romio_File_seek (MPI_File fh,
 
 
 int
-mca_io_romio_File_get_position (MPI_File fh,
+mca_io_romio_file_get_position (ompi_file_t *fh,
                                 MPI_Offset * offset)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_get_position (romio_fh, offset);
+    ret = ROMIO_PREFIX(MPI_File_get_position) (data->romio_fh, offset);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -426,60 +317,16 @@ mca_io_romio_File_get_position (MPI_File fh,
 
 
 int
-mca_io_romio_File_get_byte_offset (MPI_File fh,
+mca_io_romio_file_get_byte_offset (ompi_file_t *fh,
                                    MPI_Offset offset,
                                    MPI_Offset * disp)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_get_byte_offset (romio_fh, offset, disp);
-    OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
-
-    return ret;
-}
-
-
-int
-mca_io_romio_File_set_errhandler (MPI_File fh,
-                                  MPI_Errhandler eh)
-{
-    int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
-
-    OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_set_errhandler (romio_fh, eh);
-    OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
-
-    return ret;
-}
-
-
-int
-mca_io_romio_File_get_errhandler (MPI_File fh,
-                                  MPI_Errhandler * eh)
-{
-    int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
-
-    OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_get_errhandler (romio_fh, eh);
+    ret = ROMIO_PREFIX(MPI_File_get_byte_offset) (data->romio_fh, offset, disp);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;

src/mca/io/romio/src/io_romio_file_read.c

@@ -7,25 +7,22 @@
 #include "request/request.h"
 #include "io_romio.h"
 
+
 int
-mca_io_romio_File_read_at (MPI_File fh,
+mca_io_romio_file_read_at (ompi_file_t *fh,
                            MPI_Offset offset,
                            void *buf,
                            int count,
-                           MPI_Datatype datatype,
-                           MPI_Status * status)
+                           ompi_datatype_t *datatype,
+                           ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_read_at (romio_fh, offset, buf, count,
+        ROMIO_PREFIX(MPI_File_read_at) (data->romio_fh, offset, buf, count,
                                        datatype, status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -34,24 +31,20 @@ mca_io_romio_File_read_at (MPI_File fh,
 
 
 int
-mca_io_romio_File_read_at_all (MPI_File fh,
+mca_io_romio_file_read_at_all (ompi_file_t *fh,
                                MPI_Offset offset,
                                void *buf,
                                int count,
-                               MPI_Datatype datatype,
-                               MPI_Status * status)
+                               ompi_datatype_t *datatype,
+                               ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_read_at_all (romio_fh, offset, buf, count,
+        ROMIO_PREFIX(MPI_File_read_at_all) (data->romio_fh, offset, buf, count,
                                            datatype, status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -60,34 +53,23 @@ mca_io_romio_File_read_at_all (MPI_File fh,
 
 
 int
-mca_io_romio_File_iread_at (MPI_File fh,
+mca_io_romio_file_iread_at (ompi_file_t *fh,
                             MPI_Offset offset,
                             void *buf,
                             int count,
-                            MPI_Datatype datatype,
-                            MPI_Request * request)
+                            ompi_datatype_t *datatype,
+                            mca_io_base_request_t *request)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    mca_io_romio_request_t *rq;
-    mca_io_romio_MPIO_Request romio_rq;
-
-    /* create MPI_request */
-    rq = malloc (sizeof (mca_io_romio_request_t));
-    (*request) = (ompi_request_t *) rq;
-    (*request)->req_type = OMPI_REQUEST_IO;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
-
+    mca_io_romio_data_t *data;
+    mca_io_romio_request_t *req;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
+    req = (mca_io_romio_request_t *) request;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_iread_at (romio_fh, offset, buf, count,
-                                        datatype, &romio_rq);
+        ROMIO_PREFIX(MPI_File_iread_at) (data->romio_fh, offset, buf, count,
+                                        datatype, &req->romio_rq);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -95,23 +77,19 @@ mca_io_romio_File_iread_at (MPI_File fh,
 
 
 int
-mca_io_romio_File_read (MPI_File fh,
+mca_io_romio_file_read (ompi_file_t *fh,
                         void *buf,
                         int count,
-                        MPI_Datatype datatype,
-                        MPI_Status * status)
+                        ompi_datatype_t *datatype,
+                        ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_read (romio_fh, buf, count, datatype,
+        ROMIO_PREFIX(MPI_File_read) (data->romio_fh, buf, count, datatype,
                                     status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -120,23 +98,19 @@ mca_io_romio_File_read (MPI_File fh,
 
 
 int
-mca_io_romio_File_read_all (MPI_File fh,
+mca_io_romio_file_read_all (ompi_file_t *fh,
                             void *buf,
                             int count,
-                            MPI_Datatype datatype,
-                            MPI_Status * status)
+                            ompi_datatype_t *datatype,
+                            ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_read_all (romio_fh, buf, count, datatype,
+        ROMIO_PREFIX(MPI_File_read_all) (data->romio_fh, buf, count, datatype,
                                         status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -145,36 +119,22 @@ mca_io_romio_File_read_all (MPI_File fh,
 
 
 int
-mca_io_romio_File_iread (MPI_File fh,
+mca_io_romio_file_iread (ompi_file_t *fh,
                          void *buf,
                          int count,
-                         MPI_Datatype datatype,
-                         MPI_Request * request)
+                         ompi_datatype_t *datatype,
+                         mca_io_base_request_t * request)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    mca_io_romio_request_t *rq;
-    mca_io_romio_MPIO_Request romio_rq;
-
-    /* create MPI_request */
-    rq = malloc (sizeof (mca_io_romio_request_t));
-    (*request) = (ompi_request_t *) rq;
-    (*request)->req_type = OMPI_REQUEST_IO;
-
-    /* extract the ROMIO request */
-    romio_rq = rq->romio_rq;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
-
+    mca_io_romio_data_t *data;
+    mca_io_romio_request_t *req;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
+    req = (mca_io_romio_request_t *) request;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_iread (romio_fh, buf, count, datatype,
-                                     &romio_rq);
+        ROMIO_PREFIX(MPI_File_iread) (data->romio_fh, buf, count, datatype,
+                                     &req->romio_rq);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -182,24 +142,20 @@ mca_io_romio_File_iread (MPI_File fh,
 
 
 int
-mca_io_romio_File_read_shared (MPI_File fh,
+mca_io_romio_file_read_shared (ompi_file_t *fh,
                                void *buf,
                                int count,
-                               MPI_Datatype datatype,
-                               MPI_Status * status)
+                               ompi_datatype_t *datatype,
+                               ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_read_shared (romio_fh, buf, count, datatype,
-                                           status);
+        ROMIO_PREFIX(MPI_File_read_shared) (data->romio_fh, buf, count, 
+                                            datatype, status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -207,36 +163,22 @@ mca_io_romio_File_read_shared (MPI_File fh,
 
 
 int
-mca_io_romio_File_iread_shared (MPI_File fh,
+mca_io_romio_file_iread_shared (ompi_file_t *fh,
                                 void *buf,
                                 int count,
-                                MPI_Datatype datatype,
-                                MPI_Request * request)
+                                ompi_datatype_t *datatype,
+                                mca_io_base_request_t * request)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    mca_io_romio_request_t *rq;
-    mca_io_romio_MPIO_Request romio_rq;
-
-    /* create MPI_request */
-    rq = malloc (sizeof (mca_io_romio_request_t));
-    (*request) = (ompi_request_t *) rq;
-    (*request)->req_type = OMPI_REQUEST_IO;
-
-    /* extract the ROMIO request */
-    romio_rq = rq->romio_rq;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
-
+    mca_io_romio_data_t *data;
+    mca_io_romio_request_t *req;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
+    req = (mca_io_romio_request_t *) request;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_iread_shared (romio_fh, buf, count, datatype,
-                                            &romio_rq);
+        ROMIO_PREFIX(MPI_File_iread_shared) (data->romio_fh, buf, count, 
+                                             datatype, &req->romio_rq);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -244,24 +186,20 @@ mca_io_romio_File_iread_shared (MPI_File fh,
 
 
 int
-mca_io_romio_File_read_ordered (MPI_File fh,
+mca_io_romio_file_read_ordered (ompi_file_t *fh,
                                 void *buf,
                                 int count,
-                                MPI_Datatype datatype,
-                                MPI_Status * status)
+                                ompi_datatype_t *datatype,
+                                ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_read_ordered (romio_fh, buf, count, datatype,
-                                            status);
+        ROMIO_PREFIX(MPI_File_read_ordered) (data->romio_fh, buf, count,
+                                             datatype, status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -269,23 +207,19 @@ mca_io_romio_File_read_ordered (MPI_File fh,
 
 
 int
-mca_io_romio_File_read_at_all_begin (MPI_File fh,
+mca_io_romio_file_read_at_all_begin (ompi_file_t *fh,
                                      MPI_Offset offset,
                                      void *buf,
                                      int count,
-                                     MPI_Datatype datatype)
+                                     ompi_datatype_t *datatype)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_read_at_all_begin (romio_fh, offset, buf,
+        ROMIO_PREFIX(MPI_File_read_at_all_begin) (data->romio_fh, offset, buf,
                                                  count, datatype);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -294,20 +228,16 @@ mca_io_romio_File_read_at_all_begin (MPI_File fh,
 
 
 int
-mca_io_romio_File_read_at_all_end (MPI_File fh,
+mca_io_romio_file_read_at_all_end (ompi_file_t *fh,
                                    void *buf,
-                                   MPI_Status * status)
+                                   ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_read_at_all_end (romio_fh, buf, status);
+    ret = ROMIO_PREFIX(MPI_File_read_at_all_end) (data->romio_fh, buf, status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -315,22 +245,18 @@ mca_io_romio_File_read_at_all_end (MPI_File fh,
 
 
 int
-mca_io_romio_File_read_all_begin (MPI_File fh,
+mca_io_romio_file_read_all_begin (ompi_file_t *fh,
                                   void *buf,
                                   int count,
-                                  MPI_Datatype datatype)
+                                  ompi_datatype_t *datatype)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_read_all_begin (romio_fh, buf, count,
+        ROMIO_PREFIX(MPI_File_read_all_begin) (data->romio_fh, buf, count,
                                               datatype);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -339,20 +265,16 @@ mca_io_romio_File_read_all_begin (MPI_File fh,
 
 
 int
-mca_io_romio_File_read_all_end (MPI_File fh,
+mca_io_romio_file_read_all_end (ompi_file_t *fh,
                                 void *buf,
-                                MPI_Status * status)
+                                ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_read_all_end (romio_fh, buf, status);
+    ret = ROMIO_PREFIX(MPI_File_read_all_end) (data->romio_fh, buf, status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -360,22 +282,18 @@ mca_io_romio_File_read_all_end (MPI_File fh,
 
 
 int
-mca_io_romio_File_read_ordered_begin (MPI_File fh,
+mca_io_romio_file_read_ordered_begin (ompi_file_t *fh,
                                       void *buf,
                                       int count,
-                                      MPI_Datatype datatype)
+                                      ompi_datatype_t *datatype)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_read_ordered_begin (romio_fh, buf, count,
+        ROMIO_PREFIX(MPI_File_read_ordered_begin) (data->romio_fh, buf, count,
                                                   datatype);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -384,20 +302,17 @@ mca_io_romio_File_read_ordered_begin (MPI_File fh,
 
 
 int
-mca_io_romio_File_read_ordered_end (MPI_File fh,
+mca_io_romio_file_read_ordered_end (ompi_file_t *fh,
                                     void *buf,
-                                    MPI_Status * status)
+                                    ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_read_ordered_end (romio_fh, buf, status);
+    ret = ROMIO_PREFIX(MPI_File_read_ordered_end) (data->romio_fh, buf, 
+                                                   status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;

src/mca/io/romio/src/io_romio_file_request.c

@@ -4,54 +4,69 @@
 
 #include "mpi.h"
 #include "file/file.h"
-#include "io_romio.h"
 #include "request/request.h"
-#include <string.h>
+#include "io_romio.h"
+#include "mca/io/base/io_base_request.h"
 
 
+/*
+ * JMS This function is pretty incomplete and depends on discussions
+ * with Tim about asynchronous progress.  Keep watching this space...
+ */
 int
-mca_io_romio_Test (MPI_Request * request,
+mca_io_romio_test (mca_io_base_request_t * request,
                    int *flag,
-                   MPI_Status * status)
+                   ompi_status_public_t * status)
 {
+#if 0
     int         ret;
     mca_io_romio_request_t *rq;
-    mca_io_romio_MPIO_Request romio_rq;
+    ROMIO_PREFIX(MPIO_Request) romio_rq;
 
-    /* extract the ROMIO request */
     rq = (mca_io_romio_request_t *) (*request);
     romio_rq = rq->romio_rq;
 
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPIO_Test (&romio_rq, flag, status);
+    ret = ROMIO_PREFIX(MPIO_Test)(&romio_rq, flag, status);
+    OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
+
     if (*flag) {
         free (*request);
         *request = MPI_REQUEST_NULL;
     }
-    OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
+#else
+    return OMPI_ERR_NOT_IMPLEMENTED;
+#endif
 }
 
 
+/*
+ * JMS This function is pretty incomplete and depends on discussions
+ * with Tim about asynchronous progress.  Keep watching this space...
+ */
 int
-mca_io_romio_Wait (MPI_Request * request,
-                   MPI_Status * status)
+mca_io_romio_wait (mca_io_base_request_t * request,
+                   ompi_status_public_t * status)
 {
+#if 0
     int         ret;
     mca_io_romio_request_t *rq;
-    mca_io_romio_MPIO_Request romio_rq;
+    ROMIO_PREFIX(MPIO_Request) romio_rq;
 
-    /* extract the ROMIO request */
     rq = (mca_io_romio_request_t *) (*request);
     romio_rq = rq->romio_rq;
 
 
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPIO_Wait (&romio_rq, status);
+    ret = ROMIO_PREFIX(MPIO_Wait)(&romio_rq, status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     free (*request);
     *request = MPI_REQUEST_NULL;
     return ret;
+#else
+    return OMPI_ERR_NOT_IMPLEMENTED;
+#endif
 }

src/mca/io/romio/src/io_romio_file_write.c

@@ -9,24 +9,20 @@
 
 
 int
-mca_io_romio_File_write_at (MPI_File fh,
+mca_io_romio_file_write_at (ompi_file_t *fh,
                             MPI_Offset offset,
                             void *buf,
                             int count,
-                            MPI_Datatype datatype,
-                            MPI_Status * status)
+                            ompi_datatype_t *datatype,
+                            ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_write_at (romio_fh, offset, buf, count,
+        ROMIO_PREFIX(MPI_File_write_at) (data->romio_fh, offset, buf, count,
                                         datatype, status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -36,25 +32,21 @@ mca_io_romio_File_write_at (MPI_File fh,
 
 
 int
-mca_io_romio_File_write_at_all (MPI_File fh,
+mca_io_romio_file_write_at_all (ompi_file_t *fh,
                                 MPI_Offset offset,
                                 void *buf,
                                 int count,
-                                MPI_Datatype datatype,
-                                MPI_Status * status)
+                                ompi_datatype_t *datatype,
+                                ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_write_at_all (romio_fh, offset, buf, count,
-                                            datatype, status);
+        ROMIO_PREFIX(MPI_File_write_at_all) (data->romio_fh, offset, buf, 
+                                             count, datatype, status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -63,36 +55,23 @@ mca_io_romio_File_write_at_all (MPI_File fh,
 
 
 int
-mca_io_romio_File_iwrite_at (MPI_File fh,
+mca_io_romio_file_iwrite_at (ompi_file_t *fh,
                              MPI_Offset offset,
                              void *buf,
                              int count,
-                             MPI_Datatype datatype,
-                             MPI_Request * request)
+                             ompi_datatype_t *datatype,
+                             mca_io_base_request_t * request)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    mca_io_romio_request_t *rq;
-    mca_io_romio_MPIO_Request romio_rq;
-
-    /* create MPI_request */
-    rq = malloc (sizeof (mca_io_romio_request_t));
-    (*request) = (ompi_request_t *) rq;
-    (*request)->req_type = OMPI_REQUEST_IO;
-    /* extract the ROMIO request */
-    romio_rq = rq->romio_rq;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
-
+    mca_io_romio_data_t *data;
+    mca_io_romio_request_t *req;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
+    req = (mca_io_romio_request_t *) request;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_iwrite_at (romio_fh, offset, buf, count,
-                                         datatype, &romio_rq);
+        ROMIO_PREFIX(MPI_File_iwrite_at) (data->romio_fh, offset, buf, count,
+                                          datatype, &req->romio_rq);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
@@ -103,23 +82,19 @@ mca_io_romio_File_iwrite_at (MPI_File fh,
 
 
 int
-mca_io_romio_File_write (MPI_File fh,
+mca_io_romio_file_write (ompi_file_t *fh,
                          void *buf,
                          int count,
-                         MPI_Datatype datatype,
-                         MPI_Status * status)
+                         ompi_datatype_t *datatype,
+                         ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_write (romio_fh, buf, count, datatype,
+        ROMIO_PREFIX(MPI_File_write) (data->romio_fh, buf, count, datatype,
                                      status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -127,23 +102,19 @@ mca_io_romio_File_write (MPI_File fh,
 }
 
 int
-mca_io_romio_File_write_all (MPI_File fh,
+mca_io_romio_file_write_all (ompi_file_t *fh,
                              void *buf,
                              int count,
-                             MPI_Datatype datatype,
-                             MPI_Status * status)
+                             ompi_datatype_t *datatype,
+                             ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_write_all (romio_fh, buf, count, datatype,
+        ROMIO_PREFIX(MPI_File_write_all) (data->romio_fh, buf, count, datatype,
                                          status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -151,111 +122,41 @@ mca_io_romio_File_write_all (MPI_File fh,
 }
 
 int
-mca_io_romio_File_iwrite (MPI_File fh,
+mca_io_romio_file_iwrite (ompi_file_t *fh,
                           void *buf,
                           int count,
-                          MPI_Datatype datatype,
-                          ompi_request_t ** request)
+                          ompi_datatype_t *datatype,
+                          mca_io_base_request_t * request)
 {
-    mca_io_romio_request_t *rq;
-    mca_io_romio_MPIO_Request romio_rq;
-    mca_io_romio_MPI_File romio_fh;
-    int         ret;
-
-    /* create MPI_request */
-    rq = malloc (sizeof (mca_io_romio_request_t));
-    *request = (ompi_request_t *) rq;
-    (*request)->req_type = OMPI_REQUEST_IO;
-    /* extract the ROMIO request */
-    romio_rq = rq->romio_rq;
-
-    romio_fh = ((mca_io_romio_file_t *) fh)->romio_fh;
+    int ret;
+    mca_io_romio_data_t *data;
+    mca_io_romio_request_t *req;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
+    req = (mca_io_romio_request_t *) request;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_iwrite (romio_fh, buf, count, datatype,
-                                      &romio_rq);
+        ROMIO_PREFIX(MPI_File_iwrite) (data->romio_fh, buf, count, datatype,
+                                       &req->romio_rq);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
     return ret;
 }
 
 
 int
-mca_io_romio_File_write_shared (MPI_File fh,
+mca_io_romio_file_write_shared (ompi_file_t *fh,
                                 void *buf,
                                 int count,
-                                MPI_Datatype datatype,
-                                MPI_Status * status)
+                                ompi_datatype_t *datatype,
+                                ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
     ret =
-        mca_io_romio_MPI_File_write_shared (romio_fh, buf, count, datatype,
-                                            status);
-    OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
-
-    return ret;
-}
-
-int
-mca_io_romio_File_iwrite_shared (MPI_File fh,
-                                 void *buf,
-                                 int count,
-                                 MPI_Datatype datatype,
-                                 MPI_Request * request)
-{
-    int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    mca_io_romio_request_t *rq;
-    mca_io_romio_MPIO_Request romio_rq;
-
-    /* create MPI_request */
-    rq = malloc (sizeof (mca_io_romio_request_t));
-    (*request) = (ompi_request_t *) rq;
-    (*request)->req_type = OMPI_REQUEST_IO;
-    /* extract the ROMIO request */
-    romio_rq = rq->romio_rq;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
-
-    OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret =
-        mca_io_romio_MPI_File_iwrite_shared (romio_fh, buf, count,
-                                             datatype, &romio_rq);
-    OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
-
-    return ret;
-}
-
-int
-mca_io_romio_File_write_ordered (MPI_File fh,
-                                 void *buf,
-                                 int count,
-                                 MPI_Datatype datatype,
-                                 MPI_Status * status)
-{
-    int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
-
-    OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret =
-        mca_io_romio_MPI_File_write_ordered (romio_fh, buf, count,
+        ROMIO_PREFIX(MPI_File_write_shared) (data->romio_fh, buf, count, 
                                              datatype, status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -263,64 +164,95 @@ mca_io_romio_File_write_ordered (MPI_File fh,
 }
 
 int
-mca_io_romio_File_write_at_all_begin (MPI_File fh,
+mca_io_romio_file_iwrite_shared (ompi_file_t *fh,
+                                 void *buf,
+                                 int count,
+                                 ompi_datatype_t *datatype,
+                                 mca_io_base_request_t * request)
+{
+    int         ret;
+    mca_io_romio_data_t *data;
+    mca_io_romio_request_t *req;
+
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
+    req = (mca_io_romio_request_t *) request;
+    OMPI_THREAD_LOCK (&mca_io_romio_mutex);
+    ret =
+        ROMIO_PREFIX(MPI_File_iwrite_shared) (data->romio_fh, buf, count,
+                                              datatype, &req->romio_rq);
+    OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
+
+    return ret;
+}
+
+int
+mca_io_romio_file_write_ordered (ompi_file_t *fh,
+                                 void *buf,
+                                 int count,
+                                 ompi_datatype_t *datatype,
+                                 ompi_status_public_t * status)
+{
+    int         ret;
+    mca_io_romio_data_t *data;
+
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
+    OMPI_THREAD_LOCK (&mca_io_romio_mutex);
+    ret =
+        ROMIO_PREFIX(MPI_File_write_ordered) (data->romio_fh, buf, count,
+                                             datatype, status);
+    OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
+
+    return ret;
+}
+
+int
+mca_io_romio_file_write_at_all_begin (ompi_file_t *fh,
                                       MPI_Offset offset,
                                       void *buf,
                                       int count,
-                                      MPI_Datatype datatype)
+                                      ompi_datatype_t *datatype)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_write_at_all_begin (romio_fh, offset, buf,
-                                                    count, datatype);
+    ret = ROMIO_PREFIX(MPI_File_write_at_all_begin) (data->romio_fh, offset, 
+                                                     buf, count, datatype);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
 }
 
 int
-mca_io_romio_File_write_at_all_end (MPI_File fh,
+mca_io_romio_file_write_at_all_end (ompi_file_t *fh,
                                     void *buf,
-                                    MPI_Status * status)
+                                    ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_write_at_all_end (romio_fh, buf, status);
+    ret = ROMIO_PREFIX(MPI_File_write_at_all_end) (data->romio_fh, buf, 
+                                                   status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
 }
 
 int
-mca_io_romio_File_write_all_begin (MPI_File fh,
+mca_io_romio_file_write_all_begin (ompi_file_t *fh,
                                    void *buf,
                                    int count,
-                                   MPI_Datatype datatype)
+                                   ompi_datatype_t *datatype)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_write_all_begin (romio_fh, buf, count,
+    ret = ROMIO_PREFIX(MPI_File_write_all_begin) (data->romio_fh, buf, count,
                                                  datatype);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -328,41 +260,33 @@ mca_io_romio_File_write_all_begin (MPI_File fh,
 }
 
 int
-mca_io_romio_File_write_all_end (MPI_File fh,
+mca_io_romio_file_write_all_end (ompi_file_t *fh,
                                  void *buf,
-                                 MPI_Status * status)
+                                 ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_write_all_end (romio_fh, buf, status);
+    ret = ROMIO_PREFIX(MPI_File_write_all_end) (data->romio_fh, buf, status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;
 }
 
 int
-mca_io_romio_File_write_ordered_begin (MPI_File fh,
+mca_io_romio_file_write_ordered_begin (ompi_file_t *fh,
                                        void *buf,
                                        int count,
-                                       MPI_Datatype datatype)
+                                       ompi_datatype_t *datatype)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_write_ordered_begin (romio_fh, buf,
+    ret = ROMIO_PREFIX(MPI_File_write_ordered_begin) (data->romio_fh, buf,
                                                      count, datatype);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
@@ -370,20 +294,17 @@ mca_io_romio_File_write_ordered_begin (MPI_File fh,
 }
 
 int
-mca_io_romio_File_write_ordered_end (MPI_File fh,
+mca_io_romio_file_write_ordered_end (ompi_file_t *fh,
                                      void *buf,
-                                     MPI_Status * status)
+                                     ompi_status_public_t * status)
 {
     int         ret;
-    mca_io_romio_MPI_File romio_fh;
-    mca_io_romio_file_t *mca_romio_fh;
-
-    /* extract the ROMIO file handle: */
-    mca_romio_fh = (mca_io_romio_file_t *) fh;
-    romio_fh = mca_romio_fh->romio_fh;
+    mca_io_romio_data_t *data;
 
+    data = (mca_io_romio_data_t *) fh->f_io_selected_data;
     OMPI_THREAD_LOCK (&mca_io_romio_mutex);
-    ret = mca_io_romio_MPI_File_write_ordered_end (romio_fh, buf, status);
+    ret = ROMIO_PREFIX(MPI_File_write_ordered_end) (data->romio_fh, buf, 
+                                                    status);
     OMPI_THREAD_UNLOCK (&mca_io_romio_mutex);
 
     return ret;

src/mca/io/romio/src/io_romio_global.c

@@ -1,82 +0,0 @@
-/*
- * $HEADER
- */
-#include "threads/mutex.h"
-#include "io_romio.h"
-
-ompi_mutex_t mca_io_romio_mutex;
-
-mca_io_1_0_0_t mca_io_romio_ops = {
-
-    /* manage functions */
-    ROMIO_PREFIX (File_open),
-    ROMIO_PREFIX (File_close),
-
-    ROMIO_PREFIX (File_delete),
-    ROMIO_PREFIX (File_set_size),
-    ROMIO_PREFIX (File_preallocate),
-    ROMIO_PREFIX (File_get_size),
-    ROMIO_PREFIX (File_get_group),
-    ROMIO_PREFIX (File_get_amode),
-    ROMIO_PREFIX (File_set_info),
-    ROMIO_PREFIX (File_get_info),
-    ROMIO_PREFIX (File_set_view),
-    ROMIO_PREFIX (File_get_view),
-
-    /* Index IO operations */
-    ROMIO_PREFIX (File_read_at),
-    ROMIO_PREFIX (File_read_at_all),
-    ROMIO_PREFIX (File_write_at),
-    ROMIO_PREFIX (File_write_at_all),
-    ROMIO_PREFIX (File_iread_at),
-    ROMIO_PREFIX (File_iwrite_at),
-
-    /* non-indexed IO operations */
-    ROMIO_PREFIX (File_read),
-    ROMIO_PREFIX (File_read_all),
-    ROMIO_PREFIX (File_write),
-    ROMIO_PREFIX (File_write_all),
-    ROMIO_PREFIX (File_iread),
-    ROMIO_PREFIX (File_iwrite),
-
-    ROMIO_PREFIX (File_seek),
-    ROMIO_PREFIX (File_get_position),
-    ROMIO_PREFIX (File_get_byte_offset),
-
-    ROMIO_PREFIX (File_read_shared),
-    ROMIO_PREFIX (File_write_shared),
-    ROMIO_PREFIX (File_iread_shared),
-    ROMIO_PREFIX (File_iwrite_shared),
-    ROMIO_PREFIX (File_read_ordered),
-    ROMIO_PREFIX (File_write_ordered),
-    ROMIO_PREFIX (File_seek_shared),
-    ROMIO_PREFIX (File_get_position_shared),
-
-    /* Split IO operations */
-    ROMIO_PREFIX (File_read_at_all_begin),
-    ROMIO_PREFIX (File_read_at_all_end),
-    ROMIO_PREFIX (File_write_at_all_begin),
-    ROMIO_PREFIX (File_write_at_all_end),
-    ROMIO_PREFIX (File_read_all_begin),
-    ROMIO_PREFIX (File_read_all_end),
-    ROMIO_PREFIX (File_write_all_begin),
-    ROMIO_PREFIX (File_write_all_end),
-    ROMIO_PREFIX (File_read_ordered_begin),
-    ROMIO_PREFIX (File_read_ordered_end),
-    ROMIO_PREFIX (File_write_ordered_begin),
-    ROMIO_PREFIX (File_write_ordered_end),
-
-    ROMIO_PREFIX (File_get_type_extent),
-
-    /* Sync/atomic IO operations */
-    ROMIO_PREFIX (File_set_atomicity),
-    ROMIO_PREFIX (File_get_atomicity),
-    ROMIO_PREFIX (File_sync),
-
-    ROMIO_PREFIX (File_set_errhandler),
-    ROMIO_PREFIX (File_get_errhandler),
-
-    /* The following two are not add-on for MPI-IO implementations */
-    ROMIO_PREFIX (Test),
-    ROMIO_PREFIX (Wait)
-};

src/mca/io/romio/src/io_romio_module.c

@@ -0,0 +1,143 @@
+/*
+ * $HEADER
+ */
+#include "ompi_config.h"
+
+#include "mpi.h"
+#include "threads/mutex.h"
+#include "mca/io/io.h"
+#include "io_romio.h"
+
+
+/*
+ * Global ROMIO mutex because ROMIO is not thread safe
+ */
+ompi_mutex_t mca_io_romio_mutex;
+
+
+/*
+ * Global function that does not need to be prototyped in a header
+ * because ROMIO just expects this function to exist
+ */
+int MPIR_Status_set_bytes(ompi_status_public_t *status, 
+                          ompi_datatype_t *datatype, int size);
+
+
+/*
+ * Private functions
+ */
+static int io_romio_request_init(mca_io_base_modules_t *module_union,
+                                 mca_io_base_request_t *request);
+
+
+/*
+ * The ROMIO module operations
+ */
+mca_io_base_module_1_0_0_t mca_io_romio_module = {
+
+    /* Max number of requests in the request cache */
+
+    32,
+
+    /* Additional number of bytes required for this component's
+       requests */
+
+    sizeof(mca_io_romio_request_t) - sizeof(mca_io_base_request_t),
+
+    /* Request init / finalize functions */
+
+    io_romio_request_init,
+    NULL,
+
+    /* Back end to MPI API calls (pretty much a 1-to-1 mapping) */
+
+    mca_io_romio_file_open,
+    mca_io_romio_file_close,
+
+    mca_io_romio_file_set_size,
+    mca_io_romio_file_preallocate,
+    mca_io_romio_file_get_size,
+    mca_io_romio_file_get_amode,
+    mca_io_romio_file_set_info,
+    mca_io_romio_file_get_info,
+    mca_io_romio_file_set_view,
+    mca_io_romio_file_get_view,
+
+    /* Index IO operations */
+    mca_io_romio_file_read_at,
+    mca_io_romio_file_read_at_all,
+    mca_io_romio_file_write_at,
+    mca_io_romio_file_write_at_all,
+    mca_io_romio_file_iread_at,
+    mca_io_romio_file_iwrite_at,
+
+    /* non-indexed IO operations */
+    mca_io_romio_file_read,
+    mca_io_romio_file_read_all,
+    mca_io_romio_file_write,
+    mca_io_romio_file_write_all,
+    mca_io_romio_file_iread,
+    mca_io_romio_file_iwrite,
+
+    mca_io_romio_file_seek,
+    mca_io_romio_file_get_position,
+    mca_io_romio_file_get_byte_offset,
+
+    mca_io_romio_file_read_shared,
+    mca_io_romio_file_write_shared,
+    mca_io_romio_file_iread_shared,
+    mca_io_romio_file_iwrite_shared,
+    mca_io_romio_file_read_ordered,
+    mca_io_romio_file_write_ordered,
+    mca_io_romio_file_seek_shared,
+    mca_io_romio_file_get_position_shared,
+
+    /* Split IO operations */
+    mca_io_romio_file_read_at_all_begin,
+    mca_io_romio_file_read_at_all_end,
+    mca_io_romio_file_write_at_all_begin,
+    mca_io_romio_file_write_at_all_end,
+    mca_io_romio_file_read_all_begin,
+    mca_io_romio_file_read_all_end,
+    mca_io_romio_file_write_all_begin,
+    mca_io_romio_file_write_all_end,
+    mca_io_romio_file_read_ordered_begin,
+    mca_io_romio_file_read_ordered_end,
+    mca_io_romio_file_write_ordered_begin,
+    mca_io_romio_file_write_ordered_end,
+
+    mca_io_romio_file_get_type_extent,
+
+    /* Sync/atomic IO operations */
+    mca_io_romio_file_set_atomicity,
+    mca_io_romio_file_get_atomicity,
+    mca_io_romio_file_sync,
+
+    /* The following two are not add-on for MPI-IO implementations */
+    mca_io_romio_test,
+    mca_io_romio_wait
+};
+
+
+/*
+ * This function is required by ROMIO to set information on an Open
+ * MPI status.  Conveniently, it maps directly to
+ * MPI_Status_set_elements (almost like they planned that... hmmm...).
+ */
+int MPIR_Status_set_bytes(ompi_status_public_t *status, 
+                          ompi_datatype_t *datatype, int nbytes)
+{
+    MPI_Status_set_elements(status, datatype, nbytes);
+    return MPI_SUCCESS;
+}
+
+
+/*
+ * One-time initialization of an MPI_Request for this module
+ */
+static int io_romio_request_init(mca_io_base_modules_t *module_union,
+                                 mca_io_base_request_t *request)
+{
+    request->req_ver = MCA_IO_BASE_V_1_0_0;
+    return OMPI_SUCCESS;
+}

src/mpi/c/file_close.c

@@ -38,6 +38,9 @@ int MPI_File_close(MPI_File *fh)
         }
     }
 
+    /* Release the MPI_File; the destructor releases the component,
+       zeroes out fiels, etc. */
+
     rc = ompi_file_close(fh);
     OMPI_ERRHANDLER_RETURN(rc, *fh, rc, FUNC_NAME);
 }

src/mpi/c/file_delete.c

@@ -10,6 +10,7 @@
 #include "errhandler/errhandler.h"
 #include "info/info.h"
 #include "file/file.h"
+#include "mca/io/base/base.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_delete = PMPI_File_delete
@@ -24,18 +25,23 @@ static const char FUNC_NAME[] = "MPI_File_delete";
 
 int MPI_File_delete(char *filename, MPI_Info info) 
 {
+    int rc;
+
     if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
         if (NULL == info || ompi_info_is_freed(info)) {
-            return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INFO,
-                                          FUNC_NAME);
+            rc = MPI_ERR_INFO;
+        } else if (NULL == filename) {
+            rc = MPI_ERR_ARG;
         }
+        OMPI_ERRHANDLER_CHECK(rc, MPI_FILE_NULL, rc, FUNC_NAME);
     }
 
-    /* Note that MPI-2:9.7 (p265) says that errors in MPI_FILE_DELETE
-       should invoke the default error handler on MPI_FILE_NULL */
+    /* Since there is no MPI_File handle associated with this
+       function, the MCA has to do a selection and perform the
+       action */
 
-    /* This function is not yet implemented */
-
-    return OMPI_ERRHANDLER_INVOKE(MPI_FILE_NULL, MPI_ERR_INTERN, FUNC_NAME);
+    rc = mca_io_base_delete(filename, info);
+    OMPI_ERRHANDLER_RETURN(rc, MPI_FILE_NULL, rc, FUNC_NAME);
 }

src/mpi/c/file_get_amode.c

@@ -8,6 +8,7 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_amode = PMPI_File_get_amode
@@ -22,11 +23,34 @@ static const char FUNC_NAME[] = "MPI_File_get_amode";
 
 int MPI_File_get_amode(MPI_File fh, int *amode)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            rc = MPI_ERR_FILE;
+            fh = MPI_FILE_NULL;
+        } else if (NULL == amode) {
+            rc = MPI_ERR_ARG;
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_get_amode(fh, amode);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_get_atomicity.c

@@ -8,6 +8,8 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
+#include "datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_atomicity = PMPI_File_get_atomicity
@@ -22,11 +24,34 @@ static const char FUNC_NAME[] = "MPI_File_get_atomicity";
 
 int MPI_File_get_atomicity(MPI_File fh, int *flag)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            rc = MPI_ERR_FILE;
+            fh = MPI_FILE_NULL;
+        } else if (NULL == flag) {
+            rc = MPI_ERR_ARG;
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_get_atomicity(fh, flag);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_get_byte_offset.c

@@ -8,6 +8,8 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
+#include "datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_byte_offset = PMPI_File_get_byte_offset
@@ -23,11 +25,34 @@ static const char FUNC_NAME[] = "MPI_File_get_byte_offset";
 int MPI_File_get_byte_offset(MPI_File fh, MPI_Offset offset,
                              MPI_Offset *disp)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            rc = MPI_ERR_FILE;
+            fh = MPI_FILE_NULL;
+        } else if (NULL == disp) {
+            rc = MPI_ERR_ARG;
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_get_byte_offset(fh, offset, disp);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_get_group.c

@@ -8,6 +8,7 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_group = PMPI_File_get_group
@@ -22,11 +23,22 @@ static const char FUNC_NAME[] = "MPI_File_get_group";
 
 int MPI_File_get_group(MPI_File fh, MPI_Group *group)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            rc = MPI_ERR_FILE;
+            fh = MPI_FILE_NULL;
+        } else if (NULL == group) {
+            rc = MPI_ERR_GROUP;
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Does not need to invoke a back-end io function */
+
+    rc = ompi_comm_group (fh->f_comm, group);
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_get_info.c

@@ -8,6 +8,7 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_info = PMPI_File_get_info
@@ -22,15 +23,28 @@ static const char FUNC_NAME[] = "MPI_File_get_info";
 
 int MPI_File_get_info(MPI_File fh, MPI_Info *info_used)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-    if (NULL == info_used) {
-      return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INFO,
-                                    FUNC_NAME);
+    int rc;
+
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            rc = MPI_ERR_FILE;
+            fh = MPI_FILE_NULL;
+        } else if (NULL == info_used) {
+            rc = MPI_ERR_ARG;
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
     }
-  }
 
-  /* This function is not yet implemented */
+    /* Copy the handle and increase the refcount if it's not NULL */
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    *info_used = fh->f_info;
+    if (NULL != fh->f_info) {
+        OBJ_RETAIN(fh->f_info);
+    }
+
+    /* One of the few times that we know that we can succeed.  Woot! */
+
+    return MPI_SUCCESS;
 }

src/mpi/c/file_get_position.c

@@ -8,6 +8,7 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_position = PMPI_File_get_position
@@ -22,11 +23,34 @@ static const char FUNC_NAME[] = "MPI_File_get_position";
 
 int MPI_File_get_position(MPI_File fh, MPI_Offset *offset)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            rc = MPI_ERR_FILE;
+            fh = MPI_FILE_NULL;
+        } else if (NULL == offset) {
+            rc = MPI_ERR_ARG;
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_get_position(fh, offset);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_get_position_shared.c

@@ -8,6 +8,7 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_position_shared = PMPI_File_get_position_shared
@@ -22,11 +23,34 @@ static const char FUNC_NAME[] = "MPI_File_get_position_shared";
 
 int MPI_File_get_position_shared(MPI_File fh, MPI_Offset *offset)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            rc = MPI_ERR_FILE;
+            fh = MPI_FILE_NULL;
+        } else if (NULL == offset) {
+            rc = MPI_ERR_ARG;
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_get_position_shared(fh, offset);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_get_size.c

@@ -8,6 +8,7 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_size = PMPI_File_get_size
@@ -22,11 +23,34 @@ static const char FUNC_NAME[] = "MPI_File_get_size";
 
 int MPI_File_get_size(MPI_File fh, MPI_Offset *size)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            rc = MPI_ERR_FILE;
+            fh = MPI_FILE_NULL;
+        } else if (NULL == size) {
+            rc = MPI_ERR_ARG;
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_get_size(fh, size);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_get_type_extent.c

@@ -8,6 +8,7 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_type_extent = PMPI_File_get_type_extent
@@ -23,11 +24,34 @@ static const char FUNC_NAME[] = "MPI_File_get_type_extent";
 int MPI_File_get_type_extent(MPI_File fh, MPI_Datatype datatype,
                              MPI_Aint *extent)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            rc = MPI_ERR_FILE;
+            fh = MPI_FILE_NULL;
+        } else if (NULL == extent) {
+            rc = MPI_ERR_ARG;
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_get_type_extent(fh, datatype, extent);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_get_view.c

@@ -8,6 +8,7 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_get_view = PMPI_File_get_view
@@ -24,11 +25,36 @@ int MPI_File_get_view(MPI_File fh, MPI_Offset *disp,
                       MPI_Datatype *etype,
                       MPI_Datatype *filetype, char *datarep)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            rc = MPI_ERR_FILE;
+            fh = MPI_FILE_NULL;
+        } else if (NULL == etype || NULL == filetype) {
+            rc = MPI_ERR_TYPE;
+        } else if (NULL == disp || NULL == datarep) {
+            rc = MPI_ERR_ARG;
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_get_view(fh, disp, etype, filetype, datarep);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_iread.c

@@ -8,6 +8,9 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
+#include "mca/io/io.h"
+#include "mca/io/base/io_base_request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iread = PMPI_File_iread
@@ -20,14 +23,47 @@
 static const char FUNC_NAME[] = "MPI_File_iread";
 
 
-int MPI_File_iread(MPI_File fh, void *buf, int count, MPI_Datatype
-                   datatype, MPI_Request *request)
+int MPI_File_iread(MPI_File fh, void *buf, int count, 
+                   MPI_Datatype datatype, MPI_Request *request)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
+    mca_io_base_request_t *io_request;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        } else if (count < 0) {
+            rc = MPI_ERR_COUNT;
+        } else {
+           OMPI_CHECK_DATATYPE_FOR_RECV(rc, datatype, count);
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Get a request */
+
+    if (OMPI_SUCCESS != mca_io_base_request_alloc(fh, &io_request)) {
+        return OMPI_ERRHANDLER_INVOKE(fh, MPI_ERR_NO_MEM, FUNC_NAME);
+    }
+    *request = (ompi_request_t*) io_request;
+
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_iread(fh, buf, count, datatype, io_request);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_iread_at.c

@@ -8,6 +8,9 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
+#include "mca/io/io.h"
+#include "mca/io/base/io_base_request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iread_at = PMPI_File_iread_at
@@ -23,11 +26,45 @@ static const char FUNC_NAME[] = "MPI_File_iread_at";
 int MPI_File_iread_at(MPI_File fh, MPI_Offset offset, void *buf,
                       int count, MPI_Datatype datatype, MPI_Request *request)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
+    mca_io_base_request_t *io_request;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        } else if (count < 0) {
+            rc = MPI_ERR_COUNT;
+        } else {
+           OMPI_CHECK_DATATYPE_FOR_RECV(rc, datatype, count);
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Get a request */
+
+    if (OMPI_SUCCESS != mca_io_base_request_alloc(fh, &io_request)) {
+        return OMPI_ERRHANDLER_INVOKE(fh, MPI_ERR_NO_MEM, FUNC_NAME);
+    }
+    *request = (ompi_request_t*) io_request;
+
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_iread_at(fh, offset, buf, count, datatype, 
+                                    io_request);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_iread_shared.c

@@ -8,6 +8,9 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
+#include "mca/io/io.h"
+#include "mca/io/base/io_base_request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iread_shared = PMPI_File_iread_shared
@@ -23,11 +26,44 @@ static const char FUNC_NAME[] = "MPI_File_iread_shared";
 int MPI_File_iread_shared(MPI_File fh, void *buf, int count,
                           MPI_Datatype datatype, MPI_Request *request)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
+    mca_io_base_request_t *io_request;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        } else if (count < 0) {
+            rc = MPI_ERR_COUNT;
+        } else {
+           OMPI_CHECK_DATATYPE_FOR_RECV(rc, datatype, count);
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Get a request */
+
+    if (OMPI_SUCCESS != mca_io_base_request_alloc(fh, &io_request)) {
+        return OMPI_ERRHANDLER_INVOKE(fh, MPI_ERR_NO_MEM, FUNC_NAME);
+    }
+    *request = (ompi_request_t*) io_request;
+
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_iread_shared(fh, buf, count, datatype, io_request);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_iwrite.c

@@ -8,6 +8,9 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
+#include "mca/io/io.h"
+#include "mca/io/base/io_base_request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iwrite = PMPI_File_iwrite
@@ -23,11 +26,44 @@ static const char FUNC_NAME[] = "MPI_File_iwrite";
 int MPI_File_iwrite(MPI_File fh, void *buf, int count, MPI_Datatype
                     datatype, MPI_Request *request)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
+    mca_io_base_request_t *io_request;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        } else if (count < 0) {
+            rc = MPI_ERR_COUNT;
+        } else {
+           OMPI_CHECK_DATATYPE_FOR_SEND(rc, datatype, count);
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Get a request */
+
+    if (OMPI_SUCCESS != mca_io_base_request_alloc(fh, &io_request)) {
+        return OMPI_ERRHANDLER_INVOKE(fh, MPI_ERR_NO_MEM, FUNC_NAME);
+    }
+    *request = (ompi_request_t*) io_request;
+
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_iwrite(fh, buf, count, datatype, io_request);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_iwrite_at.c

@@ -8,6 +8,9 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
+#include "mca/io/io.h"
+#include "mca/io/base/io_base_request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iwrite_at = PMPI_File_iwrite_at
@@ -24,11 +27,45 @@ int MPI_File_iwrite_at(MPI_File fh, MPI_Offset offset, void *buf,
                        int count, MPI_Datatype datatype, 
                        MPI_Request *request)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
+    mca_io_base_request_t *io_request;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        } else if (count < 0) {
+            rc = MPI_ERR_COUNT;
+        } else {
+           OMPI_CHECK_DATATYPE_FOR_SEND(rc, datatype, count);
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Get a request */
+
+    if (OMPI_SUCCESS != mca_io_base_request_alloc(fh, &io_request)) {
+        return OMPI_ERRHANDLER_INVOKE(fh, MPI_ERR_NO_MEM, FUNC_NAME);
+    }
+    *request = (ompi_request_t*) io_request;
+
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_iwrite_at(fh, offset, buf, count, datatype, 
+                                     io_request);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_iwrite_shared.c

@@ -8,6 +8,9 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
+#include "mca/io/io.h"
+#include "mca/io/base/io_base_request.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_iwrite_shared = PMPI_File_iwrite_shared
@@ -23,11 +26,44 @@ static const char FUNC_NAME[] = "MPI_File_iwrite_shared";
 int MPI_File_iwrite_shared(MPI_File fh, void *buf, int count,
                            MPI_Datatype datatype, MPI_Request *request)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
+    mca_io_base_request_t *io_request;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        } else if (count < 0) {
+            rc = MPI_ERR_COUNT;
+        } else {
+           OMPI_CHECK_DATATYPE_FOR_SEND(rc, datatype, count);
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Get a request */
+
+    if (OMPI_SUCCESS != mca_io_base_request_alloc(fh, &io_request)) {
+        return OMPI_ERRHANDLER_INVOKE(fh, MPI_ERR_NO_MEM, FUNC_NAME);
+    }
+    *request = (ompi_request_t*) io_request;
+
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_iwrite_shared(fh, buf, count, datatype, io_request);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_open.c

@@ -44,7 +44,14 @@ int MPI_File_open(MPI_Comm comm, char *filename, int amode,
        out of ompi_file_open(), invoke the error handler on that.  If
        not, invoke the error handler on MPI_FILE_NULL. */
 
+    /* Create an empty MPI_File handle */
+
     *fh = MPI_FILE_NULL;
     rc = ompi_file_open(comm, filename, amode, info, fh);
+
+    /* Creating the file handle also selects a component to use,
+       creates a module, and calls file_open() on the module.  So
+       we're good to go. */
+
     OMPI_ERRHANDLER_RETURN(rc, *fh, rc, FUNC_NAME);
 }

src/mpi/c/file_preallocate.c

@@ -8,6 +8,7 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_preallocate = PMPI_File_preallocate
@@ -22,11 +23,32 @@ static const char FUNC_NAME[] = "MPI_File_preallocate";
 
 int MPI_File_preallocate(MPI_File fh, MPI_Offset size)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            rc = MPI_ERR_FILE;
+            fh = MPI_FILE_NULL;
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_preallocate(fh, size);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_read.c

@@ -9,6 +9,7 @@
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
 #include "file/file.h"
+#include "datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read = PMPI_File_read
@@ -21,18 +22,39 @@
 static const char FUNC_NAME[] = "MPI_File_read";
 
 
-int MPI_File_read(MPI_File fh, void *buf, int count, MPI_Datatype
-                  datatype, MPI_Status *status)
+int MPI_File_read(MPI_File fh, void *buf, int count, 
+                  MPI_Datatype datatype, MPI_Status *status)
 {
+    int rc;
+
     if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
         if (ompi_file_invalid(fh)) {
-            return OMPI_ERRHANDLER_INVOKE(MPI_FILE_NULL, MPI_ERR_FILE,
-                                          FUNC_NAME);
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        } else if (count < 0) {
+            rc = MPI_ERR_COUNT;
+        } else {
+           OMPI_CHECK_DATATYPE_FOR_RECV(rc, datatype, count);
         }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
     }
 
-    /* This function is not yet implemented */
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_read(fh, buf, count, datatype, status);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
     
-    return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_read_all.c

@@ -8,6 +8,8 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
+#include "datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_all = PMPI_File_read_all
@@ -23,11 +25,36 @@ static const char FUNC_NAME[] = "MPI_File_read_all";
 int MPI_File_read_all(MPI_File fh, void *buf, int count, MPI_Datatype
                       datatype, MPI_Status *status)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        } else if (count < 0) {
+            rc = MPI_ERR_COUNT;
+        } else {
+           OMPI_CHECK_DATATYPE_FOR_RECV(rc, datatype, count);
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_read_all(fh, buf, count, datatype, status);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_read_all_begin.c

@@ -8,6 +8,8 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
+#include "datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_all_begin = PMPI_File_read_all_begin
@@ -23,11 +25,36 @@ static const char FUNC_NAME[] = "MPI_File_read_all_begin";
 int MPI_File_read_all_begin(MPI_File fh, void *buf, int count,
                             MPI_Datatype datatype) 
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        } else if (count < 0) {
+            rc = MPI_ERR_COUNT;
+        } else {
+           OMPI_CHECK_DATATYPE_FOR_RECV(rc, datatype, count);
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_read_all_begin(fh, buf, count, datatype);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_read_all_end.c

@@ -8,6 +8,7 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_all_end = PMPI_File_read_all_end
@@ -22,11 +23,32 @@ static const char FUNC_NAME[] = "MPI_File_read_all_end";
 
 int MPI_File_read_all_end(MPI_File fh, void *buf, MPI_Status *status)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_read_all_end(fh, buf, status);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_read_at.c

@@ -8,6 +8,8 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
+#include "datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_at = PMPI_File_read_at
@@ -23,11 +25,36 @@ static const char FUNC_NAME[] = "MPI_File_read_at";
 int MPI_File_read_at(MPI_File fh, MPI_Offset offset, void *buf,
                      int count, MPI_Datatype datatype, MPI_Status *status)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        } else if (count < 0) {
+            rc = MPI_ERR_COUNT;
+        } else {
+           OMPI_CHECK_DATATYPE_FOR_RECV(rc, datatype, count);
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_read_at(fh, offset, buf, count, datatype, status);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_read_at_all.c

@@ -8,6 +8,8 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
+#include "datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_at_all = PMPI_File_read_at_all
@@ -24,11 +26,37 @@ int MPI_File_read_at_all(MPI_File fh, MPI_Offset offset, void *buf,
                          int count, MPI_Datatype datatype, 
                          MPI_Status *status)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        } else if (count < 0) {
+            rc = MPI_ERR_COUNT;
+        } else {
+           OMPI_CHECK_DATATYPE_FOR_RECV(rc, datatype, count);
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_read_at_all(fh, offset, buf, count, datatype, 
+                                       status);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_read_at_all_begin.c

@@ -8,6 +8,8 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
+#include "datatype/datatype.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_at_all_begin = PMPI_File_read_at_all_begin
@@ -23,11 +25,36 @@ static const char FUNC_NAME[] = "MPI_File_read_at_all_begin";
 int MPI_File_read_at_all_begin(MPI_File fh, MPI_Offset offset, void *buf,
                                int count, MPI_Datatype datatype)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        } else if (count < 0) {
+            rc = MPI_ERR_COUNT;
+        } else {
+           OMPI_CHECK_DATATYPE_FOR_RECV(rc, datatype, count);
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_read_at_all_begin(fh, offset, buf, count, datatype);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }

src/mpi/c/file_read_at_all_end.c

@@ -8,6 +8,7 @@
 #include "mpi/c/bindings.h"
 #include "communicator/communicator.h"
 #include "errhandler/errhandler.h"
+#include "file/file.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
 #pragma weak MPI_File_read_at_all_end = PMPI_File_read_at_all_end
@@ -22,11 +23,32 @@ static const char FUNC_NAME[] = "MPI_File_read_at_all_end";
 
 int MPI_File_read_at_all_end(MPI_File fh, void *buf, MPI_Status *status)
 {
-  if (MPI_PARAM_CHECK) {
-    OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-  }
+    int rc;
 
-  /* This function is not yet implemented */
+    if (MPI_PARAM_CHECK) {
+        rc = MPI_SUCCESS;
+        OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
+        if (ompi_file_invalid(fh)) {
+            fh = MPI_FILE_NULL;
+            rc = MPI_ERR_FILE;
+        }
+        OMPI_ERRHANDLER_CHECK(rc, fh, rc, FUNC_NAME);
+    }
 
-  return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INTERN, FUNC_NAME);
+    /* Call the back-end io component function */
+
+    switch (fh->f_io_version) {
+    case MCA_IO_BASE_V_1_0_0:
+        rc = fh->f_io_selected_module.v1_0_0.
+            io_module_file_read_at_all_end(fh, buf, status);
+        break;
+
+    default:
+        rc = MPI_ERR_INTERN;
+        break;
+    }
+
+    /* All done */
+    
+    OMPI_ERRHANDLER_RETURN(rc, fh, rc, FUNC_NAME);
 }