Split off cdi-pio parts of library into second library object.

* This also adds separate documentation, header, Fortran wrappers and
  pkg-config file for the cdi-pio part of the library

.gitattributes

@@ -45,7 +45,9 @@ doc/pio/graphics/pio_writer.pdf -text svneol=unset#unset
 doc/pio/graphics/serial.pdf -text svneol=unset#unset
 doc/pio/graphics/timestep.pdf -text svneol=unset#unset
 doc/pio/pio_docu.pdf -text svneol=unset#unset
+doc/pio/tex/c_quick_ref.tex -text
 doc/pio/tex/communicators.tex -text
+doc/pio/tex/f_quick_ref.tex -text
 doc/pio/tex/intro.tex -text
 doc/pio/tex/makepdf_f -text
 doc/pio/tex/modes.tex -text
@@ -193,6 +195,9 @@ src/cdi_int.h -text
 src/cdi_limits.h -text
 src/cdi_util.c -text
 src/cdilib.c -text
+src/cdipio.h -text
+src/cdipio.inc -text
+src/cdipioFortran.c -text
 src/cfortran.doc -text
 src/cfortran.h -text
 src/cgribex.h -text
@@ -254,6 +259,7 @@ src/pio_server.h -text
 src/pio_util.c -text
 src/pio_util.h -text
 src/pkgconfig/cdi.pc.in -text
+src/pkgconfig/cdipio.pc.in -text
 src/resource_handle.c -text
 src/resource_handle.h -text
 src/resource_unpack.c -text

Makefile.in

@@ -54,6 +54,7 @@ subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/cdi.settings.in \
 	$(top_srcdir)/configure $(top_srcdir)/src/pkgconfig/cdi.pc.in \
+	$(top_srcdir)/src/pkgconfig/cdipio.pc.in \
 	$(top_srcdir)/util/serialrun.in AUTHORS COPYING ChangeLog \
 	INSTALL NEWS config/compile config/config.guess \
 	config/config.sub config/depcomp config/install-sh \
@@ -77,7 +78,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = util/serialrun cdi.settings src/pkgconfig/cdi.pc
+CONFIG_CLEAN_FILES = util/serialrun cdi.settings src/pkgconfig/cdi.pc \
+	src/pkgconfig/cdipio.pc
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -386,6 +388,8 @@ cdi.settings: $(top_builddir)/config.status $(srcdir)/cdi.settings.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 src/pkgconfig/cdi.pc: $(top_builddir)/config.status $(top_srcdir)/src/pkgconfig/cdi.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+src/pkgconfig/cdipio.pc: $(top_builddir)/config.status $(top_srcdir)/src/pkgconfig/cdipio.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 	-rm -f *.lo

configure

@@ -27560,7 +27560,7 @@ _ACEOF
 ac_config_files="$ac_config_files tests/test_cksum_grib tests/test_cksum_nc tests/test_cksum_nc2 tests/test_cksum_nc4 tests/test_cksum_extra tests/test_cksum_service tests/test_cksum_ieg tests/test_chunk_cksum tests/pio_write_run tests/pio_cksum_mpinonb tests/pio_cksum_fpguard tests/pio_cksum_asynch tests/pio_cksum_writer tests/pio_cksum_cdf util/serialrun"
-ac_config_files="$ac_config_files Makefile src/Makefile interfaces/Makefile app/Makefile tests/Makefile examples/Makefile cdi.settings examples/pio/Makefile src/pkgconfig/cdi.pc"
+ac_config_files="$ac_config_files Makefile src/Makefile interfaces/Makefile app/Makefile tests/Makefile examples/Makefile cdi.settings examples/pio/Makefile src/pkgconfig/cdi.pc src/pkgconfig/cdipio.pc"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -28923,6 +28923,7 @@ do
     "cdi.settings") CONFIG_FILES="$CONFIG_FILES cdi.settings" ;;
     "examples/pio/Makefile") CONFIG_FILES="$CONFIG_FILES examples/pio/Makefile" ;;
     "src/pkgconfig/cdi.pc") CONFIG_FILES="$CONFIG_FILES src/pkgconfig/cdi.pc" ;;
+    "src/pkgconfig/cdipio.pc") CONFIG_FILES="$CONFIG_FILES src/pkgconfig/cdipio.pc" ;;
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

configure.ac

@@ -334,7 +334,7 @@ AC_CONFIG_FILES([tests/test_cksum_grib \
 
 AC_OUTPUT([Makefile src/Makefile interfaces/Makefile app/Makefile \
 	tests/Makefile examples/Makefile cdi.settings \
-	examples/pio/Makefile src/pkgconfig/cdi.pc])
+	examples/pio/Makefile src/pkgconfig/cdi.pc src/pkgconfig/cdipio.pc])
 
 #  ----------------------------------------------------------------------
 #  Show configuration

doc/pio/tex/c_quick_ref.tex

+\chapter*{Quick Reference}
+\addcontentsline{toc}{chapter}{Quick Reference}
+
+This appendix provide a brief listing of the C language bindings of the
+CDI library routines:
+
+\section*{\tt \htmlref{pioInit}{pioInit}}
+
+\begin{verbatim}
+    MPI_Comm pioInit (MPI_Comm commSuper, int nProcsIO, int IOMode,
+                      int *pioNamespace, float partInflate);
+\end{verbatim}
+
+initialize I/O server processes and communication.
+
+

doc/pio/tex/f_quick_ref.tex

+\chapter*{Quick Reference}
+\addcontentsline{toc}{chapter}{Quick Reference}
+
+This appendix provide a brief listing of the Fortran language bindings of the
+CDI library routines:
+
+\section*{\tt \htmlref{pioInit}{pioInit}}
+
+\begin{verbatim}
+    INTEGER FUNCTION pioInit (INTEGER commSuper, INTEGER nProcsIO, INTEGER IOMode, 
+                              INTEGER pioNamespace, REAL partInflate)
+\end{verbatim}
+
+initialize I/O server processes and communication.
+
+

doc/tex/c_quick_ref.tex

@@ -445,16 +445,6 @@ Get one value of a Y-axis.
 Get all values of a Y-axis.
 
 
-\section*{\tt \htmlref{pioInit}{pioInit}}
-
-\begin{verbatim}
-    MPI_Comm pioInit (MPI_Comm commSuper, int nProcsIO, int IOMode,
-                      int *pioNamespace, float partInflate);
-\end{verbatim}
-
-initialize I/O server processes and communication.
-
-
 \section*{\tt \htmlref{streamClose}{streamClose}}
 
 \begin{verbatim}

doc/tex/f_quick_ref.tex

@@ -445,16 +445,6 @@ Get one value of a Y-axis.
 Get all values of a Y-axis.
 
 
-\section*{\tt \htmlref{pioInit}{pioInit}}
-
-\begin{verbatim}
-    INTEGER FUNCTION pioInit (INTEGER commSuper, INTEGER nProcsIO, INTEGER IOMode, 
-                              INTEGER pioNamespace, REAL partInflate)
-\end{verbatim}
-
-initialize I/O server processes and communication.
-
-
 \section*{\tt \htmlref{streamClose}{streamClose}}
 
 \begin{verbatim}

examples/pio/Makefile.am

@@ -14,16 +14,15 @@ endif
 
 collectData_SOURCES=collectData.c
 
-collectData_LDADD=$(top_builddir)/src/libcdi.la
+if USE_MPI
+LDADD=$(top_builddir)/src/libcdipio.la
+else
+LDADD=
+endif
+LDADD+=$(top_builddir)/src/libcdi.la
 
 collectData2003_SOURCES=collectData2003.F90
 
-collectData2003_LDADD=$(top_builddir)/src/libcdi.la
-
 collectDataNStreams_SOURCES=collectDataNStreams.c
 
-collectDataNStreams_LDADD=$(top_builddir)/src/libcdi.la
-
 compareResourcesArray_SOURCES=compareResourcesArray.c
-
-compareResourcesArray_LDADD=$(top_builddir)/src/libcdi.la

examples/pio/Makefile.in

@@ -82,16 +82,36 @@ CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am_collectData_OBJECTS = collectData.$(OBJEXT)
 collectData_OBJECTS = $(am_collectData_OBJECTS)
-collectData_DEPENDENCIES = $(top_builddir)/src/libcdi.la
+collectData_LDADD = $(LDADD)
+@USE_MPI_FALSE@collectData_DEPENDENCIES =  \
+@USE_MPI_FALSE@	$(top_builddir)/src/libcdi.la
+@USE_MPI_TRUE@collectData_DEPENDENCIES =  \
+@USE_MPI_TRUE@	$(top_builddir)/src/libcdipio.la \
+@USE_MPI_TRUE@	$(top_builddir)/src/libcdi.la
 am_collectData2003_OBJECTS = collectData2003.$(OBJEXT)
 collectData2003_OBJECTS = $(am_collectData2003_OBJECTS)
-collectData2003_DEPENDENCIES = $(top_builddir)/src/libcdi.la
+collectData2003_LDADD = $(LDADD)
+@USE_MPI_FALSE@collectData2003_DEPENDENCIES =  \
+@USE_MPI_FALSE@	$(top_builddir)/src/libcdi.la
+@USE_MPI_TRUE@collectData2003_DEPENDENCIES =  \
+@USE_MPI_TRUE@	$(top_builddir)/src/libcdipio.la \
+@USE_MPI_TRUE@	$(top_builddir)/src/libcdi.la
 am_collectDataNStreams_OBJECTS = collectDataNStreams.$(OBJEXT)
 collectDataNStreams_OBJECTS = $(am_collectDataNStreams_OBJECTS)
-collectDataNStreams_DEPENDENCIES = $(top_builddir)/src/libcdi.la
+collectDataNStreams_LDADD = $(LDADD)
+@USE_MPI_FALSE@collectDataNStreams_DEPENDENCIES =  \
+@USE_MPI_FALSE@	$(top_builddir)/src/libcdi.la
+@USE_MPI_TRUE@collectDataNStreams_DEPENDENCIES =  \
+@USE_MPI_TRUE@	$(top_builddir)/src/libcdipio.la \
+@USE_MPI_TRUE@	$(top_builddir)/src/libcdi.la
 am_compareResourcesArray_OBJECTS = compareResourcesArray.$(OBJEXT)
 compareResourcesArray_OBJECTS = $(am_compareResourcesArray_OBJECTS)
-compareResourcesArray_DEPENDENCIES = $(top_builddir)/src/libcdi.la
+compareResourcesArray_LDADD = $(LDADD)
+@USE_MPI_FALSE@compareResourcesArray_DEPENDENCIES =  \
+@USE_MPI_FALSE@	$(top_builddir)/src/libcdi.la
+@USE_MPI_TRUE@compareResourcesArray_DEPENDENCIES =  \
+@USE_MPI_TRUE@	$(top_builddir)/src/libcdipio.la \
+@USE_MPI_TRUE@	$(top_builddir)/src/libcdi.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -316,13 +336,12 @@ top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/src $(YAXT_CFLAGS)
 AM_FCFLAGS = $(FPP_INCOPT)$(top_srcdir)/src $(am__append_2)
 collectData_SOURCES = collectData.c
-collectData_LDADD = $(top_builddir)/src/libcdi.la
+@USE_MPI_FALSE@LDADD = $(top_builddir)/src/libcdi.la
+@USE_MPI_TRUE@LDADD = $(top_builddir)/src/libcdipio.la \
+@USE_MPI_TRUE@	$(top_builddir)/src/libcdi.la
 collectData2003_SOURCES = collectData2003.F90
-collectData2003_LDADD = $(top_builddir)/src/libcdi.la
 collectDataNStreams_SOURCES = collectDataNStreams.c
-collectDataNStreams_LDADD = $(top_builddir)/src/libcdi.la
 compareResourcesArray_SOURCES = compareResourcesArray.c
-compareResourcesArray_LDADD = $(top_builddir)/src/libcdi.la
 all: all-am
 
 .SUFFIXES:

examples/pio/collectData.c

@@ -17,6 +17,8 @@ typedef int MPI_Comm;
 #include "pio_util.h"
 
 #ifdef USE_MPI
+#include "cdipio.h"
+
 static int
 uniform_partition_start(int set_interval[2], int nparts, int part_idx);
 #endif
@@ -159,7 +161,8 @@ static void modelRun(MPI_Comm commModel)
 #endif
 }
 
-struct {
+#ifdef USE_MPI
+static struct {
   char *text;
   int mode;
 } mode_map[] = {
@@ -169,6 +172,7 @@ struct {
   { "PIO_WRITER", PIO_WRITER },
   { "PIO_FPGUARD", PIO_FPGUARD},
 };
+#endif
 
 
 int main (int argc, char *argv[])

examples/pio/collectData2003.F90

@@ -11,6 +11,7 @@ PROGRAM collectdata2003
   IMPLICIT NONE
 
   INCLUDE 'cdi.inc'
+  INCLUDE 'cdipio.inc'
 
 #ifdef USE_MPI
   INCLUDE 'mpif.h'

examples/pio/collectDataNStreams.c

@@ -12,6 +12,10 @@ typedef int MPI_Comm;
 #include "cdi.h"
 #include "pio_util.h"
 
+#ifdef USE_MPI
+#include "cdipio.h"
+#endif
+
 static void hoursPassingHack ( int * vdate, int * vtime, int hoursPassed )
 {
   int sum, days, hours, oldDays;
@@ -223,7 +227,9 @@ int main (int argc, char *argv[])
     nProcsIODef    = 3,
     //IOModeDef       = PIO_NONE,
     //IOModeDef       = PIO_MPI,
+#ifdef USE_MPI
     IOModeDef       = PIO_FPGUARD,
+#endif
     //IOModeDef       = PIO_ASYNCH,
     //IOModeDef       = PIO_WRITER,
   };

examples/pio/compareResourcesArray.c

@@ -8,6 +8,7 @@
 #include <mpi.h>
 #include <yaxt.h>
 #include "cdi.h"
+#include "cdipio.h"
 #include "pio_util.h"
 #include "resource_handle.h"
 #include "resource_unpack.h"

src/Makefile.am

@@ -34,6 +34,8 @@ libcdi_la_SOURCES = 	 \
 	datetime.h	 \
 	dmemory.c      	 \
 	dmemory.h	 \
+	pio_util.c							\
+	pio_util.h							\
 	dtypes.h	 \
 	error.c        	 \
 	error.h	 	 \
@@ -57,33 +59,6 @@ libcdi_la_SOURCES = 	 \
 	namespace.h      \
 	serialize.h	\
 	serialize.c	\
-	pio.c            \
-	pio.h            \
-	pio_comm.c       \
-	pio_comm.h       \
-	pio_dbuffer.c    \
-	pio_impl.h 	 \
-	pio_interface.c  \
-	pio_interface.h	 \
-	pio_mpinonb.c    \
-	pio_record_send.c\
-	pio_posixasynch.c\
-	pio_posixfpguardsendrecv.c \
-	pio_posixnonb.c  \
-	pio_list_set.c	 \
-	resource_unpack.h \
-	resource_unpack.c \
-	pio_rpc.h        \
-	pio_client.c	\
-	pio_client.h	\
-	pio_server.c     \
-	pio_server.h     \
-	pio_util.c       \
-	pio_util.h       \
-	pio_serialize.h	\
-	pio_serialize.c	\
-	pio_cdf_int.c	\
-	pio_cdf_int.h	\
 	resource_handle.c\
 	resource_handle.h\
 	service.h	 \
@@ -131,8 +106,50 @@ libcdi_la_SOURCES = 	 \
         stream.c         \
         swap.c
 
+if USE_MPI
+if ENABLE_CDI_LIB
+lib_LTLIBRARIES += libcdipio.la
+include_HEADERS += cdipio.h cdipio.inc
+else
+noinst_LTLIBRARIES += libcdipio.la
+endif
+endif
+
+libcdipio_la_SOURCES =							\
+	cdipio.h							\
+	cdipioFortran.c							\
+	cfortran.h							\
+	pio.c								\
+	pio.h								\
+	pio_comm.c							\
+	pio_comm.h							\
+	pio_dbuffer.c							\
+	pio_impl.h							\
+	pio_interface.c							\
+	pio_interface.h							\
+	pio_mpinonb.c							\
+	pio_record_send.c						\
+	pio_posixasynch.c						\
+	pio_posixfpguardsendrecv.c					\
+	pio_posixnonb.c							\
+	pio_list_set.c							\
+	resource_unpack.h						\
+	resource_unpack.c						\
+	pio_rpc.h							\
+	pio_client.c							\
+	pio_client.h							\
+	pio_server.c							\
+	pio_server.h							\
+	pio_serialize.h							\
+	pio_serialize.c							\
+	pio_cdf_int.c							\
+	pio_cdf_int.h
+
+libcdipio_la_LIBADD    = libcdi.la $(PPM_CORE_LIBS) $(YAXT_LIBS)
+
+
 #libcdi_la_CPPFLAGS  = @CPPFLAGS@
-libcdi_la_LIBADD    = $(PPM_CORE_LIBS) $(YAXT_LIBS)
+libcdi_la_LIBADD    =
 #
 #cdilib.c:
 #	$(top_srcdir)/src/make_cdilib $(top_srcdir)/src
@@ -140,9 +157,12 @@ libcdi_la_LIBADD    = $(PPM_CORE_LIBS) $(YAXT_LIBS)
 #cdilib.o: cdilib.c
 #	$(COMPILE) -c $<
 
-LOCALTARGETS  = 
+LOCALTARGETS  =
 if ENABLE_CDI_LIB
 LOCALTARGETS += pkgconfig/cdi.pc
+if USE_MPI
+LOCALTARGETS += pkgconfig/cdipio.pc
+endif
 endif
 
 if CREATE_ISOC
@@ -160,8 +180,11 @@ mo_cdi.$(FCMODEXT): mo_cdi.f90
 
 pkgconfig/cdi.pc: pkgconfig/cdi.pc.in ../config.status
 	(cd .. ; ./config.status src/pkgconfig/cdi.pc)
+
+pkgconfig/cdipio.pc: pkgconfig/cdipio.pc.in ../config.status
+	(cd .. ; ./config.status src/pkgconfig/cdipio.pc)
 #
-all-local: $(LOCALTARGETS) 
+all-local: $(LOCALTARGETS)
 #
 CLEANFILES  = `ls *~`
 #CLEANFILES += cdilib.c
@@ -170,15 +193,28 @@ CLEANFILES += $(top_builddir)/src/mo_cdi.$(FCMODEXT) $(top_builddir)/src/mo_cdi.
 endif
 
 if ENABLE_CDI_LIB
+PKGCONFIG_FILES = pkgconfig/cdi.pc
 CLEANFILES += pkgconfig/cdi.pc
+if USE_MPI
+CLEANFILES += pkgconfig/cdipio.pc
+PKGCONFIG_FILES += pkgconfig/cdipio.pc
+endif
 
-install-exec-local: pkgconfig/cdi.pc
+install-exec-local: $(PKGCONFIG_FILES)
 	$(mkinstalldirs) "$(DESTDIR)$(libdir)/pkgconfig"
-	$(install_sh_DATA) pkgconfig/cdi.pc "$(DESTDIR)$(libdir)/pkgconfig/cdi.pc"
+	@for pkgconfigfile in $(PKGCONFIG_FILES) ; do \
+		echo $(install_sh_DATA) $$pkgconfigfile \
+		"$(DESTDIR)$(libdir)/$$pkgconfigfile" ; \
+		$(install_sh_DATA) $$pkgconfigfile \
+		"$(DESTDIR)$(libdir)/$$pkgconfigfile" ; \
+	done
 
 uninstall-local:
-	rm -f "$(DESTDIR)$(libdir)/pkgconfig/cdi.pc"
-	rmdir "$(DESTDIR)$(libdir)/pkgconfig"
+	@for pkgconfigfile in $(PKGCONFIG_FILES) ; do \
+		echo rm -f "$(DESTDIR)$(libdir)/$$pkgconfigfile" ; \
+		rm -f "$(DESTDIR)$(libdir)/$$pkgconfigfile" ; \
+	done
+	-@rmdir "$(DESTDIR)$(libdir)/pkgconfig"
 
 endif
 

src/Makefile.in

@@ -52,11 +52,17 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@ENABLE_CDI_LIB_TRUE@am__append_1 = pkgconfig/cdi.pc
-@CREATE_ISOC_TRUE@am__append_2 = mo_cdi.o mo_cdi.$(FCMODEXT)
-#CLEANFILES += cdilib.c
-@CREATE_ISOC_TRUE@am__append_3 = $(top_builddir)/src/mo_cdi.$(FCMODEXT) $(top_builddir)/src/mo_cdi.o
+@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_1 = libcdipio.la
+@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_2 = cdipio.h cdipio.inc
+@ENABLE_CDI_LIB_FALSE@@USE_MPI_TRUE@am__append_3 = libcdipio.la
 @ENABLE_CDI_LIB_TRUE@am__append_4 = pkgconfig/cdi.pc
+@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_5 = pkgconfig/cdipio.pc
+@CREATE_ISOC_TRUE@am__append_6 = mo_cdi.o mo_cdi.$(FCMODEXT)
+#CLEANFILES += cdilib.c
+@CREATE_ISOC_TRUE@am__append_7 = $(top_builddir)/src/mo_cdi.$(FCMODEXT) $(top_builddir)/src/mo_cdi.o
+@ENABLE_CDI_LIB_TRUE@am__append_8 = pkgconfig/cdi.pc
+@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_9 = pkgconfig/cdipio.pc
+@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_10 = pkgconfig/cdipio.pc
 subdir = src
 DIST_COMMON = $(am__include_HEADERS_DIST) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in
@@ -108,27 +114,34 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libcdi_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+libcdi_la_DEPENDENCIES =
 am_libcdi_la_OBJECTS = basetime.lo binary.lo calendar.lo cdf.lo \
 	cdf_int.lo cdi_error.lo cdi_util.lo cdiFortran.lo \
-	cgribexlib.lo dmemory.lo error.lo extralib.lo file.lo \
-	gaussgrid.lo gribapi.lo grid.lo ieglib.lo institution.lo \
-	model.lo namespace.lo serialize.lo pio.lo pio_comm.lo \
-	pio_dbuffer.lo pio_interface.lo pio_mpinonb.lo \
-	pio_record_send.lo pio_posixasynch.lo \
-	pio_posixfpguardsendrecv.lo pio_posixnonb.lo pio_list_set.lo \
-	resource_unpack.lo pio_client.lo pio_server.lo pio_util.lo \
-	pio_serialize.lo pio_cdf_int.lo resource_handle.lo \
-	servicelib.lo stream_cdf.lo stream_cgribex.lo stream_ext.lo \
-	stream_grb.lo stream_gribapi.lo stream_history.lo \
-	stream_ieg.lo cdi_int.lo stream_record.lo stream_srv.lo \
-	stream_var.lo table.lo taxis.lo timebase.lo tsteps.lo util.lo \
-	varscan.lo version.lo vlist.lo vlist_att.lo vlist_var.lo \
-	zaxis.lo stream.lo swap.lo
+	cgribexlib.lo dmemory.lo pio_util.lo error.lo extralib.lo \
+	file.lo gaussgrid.lo gribapi.lo grid.lo ieglib.lo \
+	institution.lo model.lo namespace.lo serialize.lo \
+	resource_handle.lo servicelib.lo stream_cdf.lo \
+	stream_cgribex.lo stream_ext.lo stream_grb.lo \
+	stream_gribapi.lo stream_history.lo stream_ieg.lo cdi_int.lo \
+	stream_record.lo stream_srv.lo stream_var.lo table.lo taxis.lo \
+	timebase.lo tsteps.lo util.lo varscan.lo version.lo vlist.lo \
+	vlist_att.lo vlist_var.lo zaxis.lo stream.lo swap.lo
 libcdi_la_OBJECTS = $(am_libcdi_la_OBJECTS)
 @ENABLE_CDI_LIB_FALSE@am_libcdi_la_rpath =
 @ENABLE_CDI_LIB_TRUE@am_libcdi_la_rpath = -rpath $(libdir)
+am__DEPENDENCIES_1 =
+libcdipio_la_DEPENDENCIES = libcdi.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am_libcdipio_la_OBJECTS = cdipioFortran.lo pio.lo pio_comm.lo \
+	pio_dbuffer.lo pio_interface.lo pio_mpinonb.lo \
+	pio_record_send.lo pio_posixasynch.lo \
+	pio_posixfpguardsendrecv.lo pio_posixnonb.lo pio_list_set.lo \
+	resource_unpack.lo pio_client.lo pio_server.lo \
+	pio_serialize.lo pio_cdf_int.lo
+libcdipio_la_OBJECTS = $(am_libcdipio_la_OBJECTS)
+@ENABLE_CDI_LIB_FALSE@@USE_MPI_TRUE@am_libcdipio_la_rpath =
+@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am_libcdipio_la_rpath = -rpath \
+@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@	$(libdir)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -142,14 +155,14 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(libcdi_la_SOURCES)
-DIST_SOURCES = $(libcdi_la_SOURCES)
+SOURCES = $(libcdi_la_SOURCES) $(libcdipio_la_SOURCES)
+DIST_SOURCES = $(libcdi_la_SOURCES) $(libcdipio_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__include_HEADERS_DIST = cdi.h cdi.inc
+am__include_HEADERS_DIST = cdi.h cdi.inc cdipio.h cdipio.inc
 HEADERS = $(include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -342,9 +355,9 @@ top_srcdir = @top_srcdir@
 
 #
 EXTRA_DIST = cdilib.c mo_cdi.f90
-@ENABLE_CDI_LIB_TRUE@lib_LTLIBRARIES = libcdi.la
-@ENABLE_CDI_LIB_TRUE@include_HEADERS = cdi.h cdi.inc
-@ENABLE_CDI_LIB_FALSE@noinst_LTLIBRARIES = libcdi.la
+@ENABLE_CDI_LIB_TRUE@lib_LTLIBRARIES = libcdi.la $(am__append_1)
+@ENABLE_CDI_LIB_TRUE@include_HEADERS = cdi.h cdi.inc $(am__append_2)
+@ENABLE_CDI_LIB_FALSE@noinst_LTLIBRARIES = libcdi.la $(am__append_3)
 AM_CFLAGS = $(PPM_CORE_CFLAGS) $(YAXT_CFLAGS)
 libcdi_la_SOURCES = \
 	basetime.c     	 \
@@ -369,6 +382,8 @@ libcdi_la_SOURCES = \
 	datetime.h	 \
 	dmemory.c      	 \
 	dmemory.h	 \
+	pio_util.c							\
+	pio_util.h							\
 	dtypes.h	 \
 	error.c        	 \
 	error.h	 	 \
@@ -392,33 +407,6 @@ libcdi_la_SOURCES = \
 	namespace.h      \
 	serialize.h	\
 	serialize.c	\
-	pio.c            \
-	pio.h            \
-	pio_comm.c       \
-	pio_comm.h       \
-	pio_dbuffer.c    \
-	pio_impl.h 	 \
-	pio_interface.c  \
-	pio_interface.h	 \
-	pio_mpinonb.c    \
-	pio_record_send.c\
-	pio_posixasynch.c\
-	pio_posixfpguardsendrecv.c \
-	pio_posixnonb.c  \
-	pio_list_set.c	 \
-	resource_unpack.h \
-	resource_unpack.c \
-	pio_rpc.h        \
-	pio_client.c	\
-	pio_client.h	\
-	pio_server.c     \
-	pio_server.h     \
-	pio_util.c       \
-	pio_util.h       \
-	pio_serialize.h	\
-	pio_serialize.c	\
-	pio_cdf_int.c	\
-	pio_cdf_int.h	\
 	resource_handle.c\
 	resource_handle.h\
 	service.h	 \
@@ -466,18 +454,51 @@ libcdi_la_SOURCES = \
         stream.c         \
         swap.c
 
+libcdipio_la_SOURCES = \
+	cdipio.h							\
+	cdipioFortran.c							\
+	cfortran.h							\
+	pio.c								\
+	pio.h								\
+	pio_comm.c							\
+	pio_comm.h							\
+	pio_dbuffer.c							\
+	pio_impl.h							\
+	pio_interface.c							\
+	pio_interface.h							\
+	pio_mpinonb.c							\
+	pio_record_send.c						\
+	pio_posixasynch.c						\
+	pio_posixfpguardsendrecv.c					\
+	pio_posixnonb.c							\
+	pio_list_set.c							\
+	resource_unpack.h						\
+	resource_unpack.c						\
+	pio_rpc.h							\
+	pio_client.c							\
+	pio_client.h							\
+	pio_server.c							\
+	pio_server.h							\
+	pio_serialize.h							\
+	pio_serialize.c							\
+	pio_cdf_int.c							\
+	pio_cdf_int.h
+
+libcdipio_la_LIBADD = libcdi.la $(PPM_CORE_LIBS) $(YAXT_LIBS)
 
 #libcdi_la_CPPFLAGS  = @CPPFLAGS@
-libcdi_la_LIBADD = $(PPM_CORE_LIBS) $(YAXT_LIBS)
+libcdi_la_LIBADD = 
 #
 #cdilib.c:
 #	$(top_srcdir)/src/make_cdilib $(top_srcdir)/src
 #
 #cdilib.o: cdilib.c
 #	$(COMPILE) -c $<
-LOCALTARGETS = $(am__append_1) $(am__append_2)
+LOCALTARGETS = $(am__append_4) $(am__append_5) $(am__append_6)
 #
-CLEANFILES = `ls *~` $(am__append_3) $(am__append_4)
+CLEANFILES = `ls *~` $(am__append_7) $(am__append_8) $(am__append_9)