make_cdilib: update for cdi.pio

src/institution.h

 #ifndef INSTITUTION_H
 #define INSTITUTION_H
 
+#ifdef USE_MPI
 int
 instituteUnpack(void *buf, int size, int *position, int,
                 MPI_Comm comm);
+#endif
 
 #endif
 

src/make_cdilib

@@ -46,6 +46,13 @@ cat > ${PROG} << EOR
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#ifndef _SX
+#include <aio.h>
+#endif
+#include <stdbool.h>
+#ifdef USE_MPI
+#include "mpi.h"
+#endif
 #include <assert.h>
 
 #if  defined  (HAVE_LIBGRIB_API)
@@ -164,14 +171,24 @@ c="dmemory.c         \
    swap.c            \
    binary.c          \
    cdf.c             \
-"
+   namespace.c       \
+   resource_handle.c \
+   pio_util.c        \
+   pio.c             \
+   pio_dbuffer.c     \
+   pio_mpinonb.c     \
+   pio_posixasynch.c \
+   pio_posixfpguardsendrecv.c\
+   pio_posixnonb.c   \
+   pio_list_set.c"
 
 h="cdi_limits.h taxis.h dtypes.h file.h cgribex.h gribapi.h service.h extra.h \
    ieg.h cdi.h timebase.h calendar.h basetime.h datetime.h \
    stream_cgribex.h  stream_gribapi.h  stream_grb.h  stream_cdf.h \
    tablepar.h table.h gaussgrid.h grid.h varscan.h binary.h swap.h \
    service.h stream_srv.h stream_ext.h stream_ieg.h cdf_int.h  \
-   cdf.h vlist.h"
+   cdf.h vlist.h vlist_var.h vlist_att.h model.h institution.h \
+   namespace.h resource_handle.h pio_util.h pio.h pio_impl.h"
 
 #cat $h >> ${PROG}
 #cat $c | grep -v '#include' | grep -v '#  include' >> ${PROG}

src/model.h

 #ifndef MODEL_H
 #define MODEL_H
 
+#ifdef USE_MPI
 int
 modelUnpack(void *buf, int size, int *position,
             int, MPI_Comm comm);
+#endif
 
 #endif
 /*

src/resource_handle.c

@@ -45,7 +45,7 @@ static int listInit = 0;
   if ( !listInit )                                              \
     {                                                           \
       listInitialize();                                         \
-      listInit = 1                                              \
+      listInit = 1;                                             \
     }                                                           \
   } while(0)