--- netcdf-g95.orig/examples/F77/Makefile.am
+++ netcdf-g95/examples/F77/Makefile.am
@@ -1,12 +1,12 @@
 ## This is a automake file, part of Unidata's netCDF package.
-# Copyright 2006, see the COPYRIGHT file for more information.  
+# Copyright 2006, see the COPYRIGHT file for more information.
 
 # This file builds F77 examples.
 
 # $Id: Makefile.am,v 1.24 2009/12/08 20:58:13 dmh Exp $
 
 # Link in the fortran convenivence library.
-LDADD = ../../fortran/libnetcdff.la
+LDADD = ../../fortran/libnetcdff-g95.la
 
 # Go to fortran directory for header.
 AM_FFLAGS = -I$(top_srcdir)/fortran -I$(top_builddir)/fortran
@@ -60,7 +60,7 @@
 else # not USE_NETCDF4
 
 # Without netcdf-4, go to ../../libsrc for the library.
-LDADD += ../../libsrc/libnetcdf.la 
+LDADD += ../../libsrc/libnetcdf.la
 
 endif # USE_NETCDF4
 
--- netcdf-g95.orig/examples/F77/Makefile.in
+++ netcdf-g95/examples/F77/Makefile.in
@@ -15,7 +15,7 @@
 
 @SET_MAKE@
 
-# Copyright 2006, see the COPYRIGHT file for more information.  
+# Copyright 2006, see the COPYRIGHT file for more information.
 
 # This file builds F77 examples.
 
@@ -66,7 +66,7 @@
 @USE_NETCDF4_TRUE@am__append_12 = simple_xy_nc4_wr simple_xy_nc4_rd
 
 # Without netcdf-4, go to ../../libsrc for the library.
-@USE_NETCDF4_FALSE@am__append_13 = ../../libsrc/libnetcdf.la 
+@USE_NETCDF4_FALSE@am__append_13 = ../../libsrc/libnetcdf.la
 @BUILD_DAP_TRUE@am__append_14 = @CURL_CFLAGS@
 @BUILD_DAP_TRUE@am__append_15 = @CURL_LIBS@
 check_PROGRAMS = $(am__EXEEXT_2)
@@ -95,25 +95,25 @@
 pres_temp_4D_rd_OBJECTS = $(am_pres_temp_4D_rd_OBJECTS)
 pres_temp_4D_rd_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
-pres_temp_4D_rd_DEPENDENCIES = ../../fortran/libnetcdff.la \
+pres_temp_4D_rd_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_8) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_13)
 am_pres_temp_4D_wr_OBJECTS = pres_temp_4D_wr.$(OBJEXT)
 pres_temp_4D_wr_OBJECTS = $(am_pres_temp_4D_wr_OBJECTS)
 pres_temp_4D_wr_LDADD = $(LDADD)
-pres_temp_4D_wr_DEPENDENCIES = ../../fortran/libnetcdff.la \
+pres_temp_4D_wr_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_8) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_13)
 am_sfc_pres_temp_rd_OBJECTS = sfc_pres_temp_rd.$(OBJEXT)
 sfc_pres_temp_rd_OBJECTS = $(am_sfc_pres_temp_rd_OBJECTS)
 sfc_pres_temp_rd_LDADD = $(LDADD)
-sfc_pres_temp_rd_DEPENDENCIES = ../../fortran/libnetcdff.la \
+sfc_pres_temp_rd_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_8) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_13)
 am_sfc_pres_temp_wr_OBJECTS = sfc_pres_temp_wr.$(OBJEXT)
 sfc_pres_temp_wr_OBJECTS = $(am_sfc_pres_temp_wr_OBJECTS)
 sfc_pres_temp_wr_LDADD = $(LDADD)
-sfc_pres_temp_wr_DEPENDENCIES = ../../fortran/libnetcdff.la \
+sfc_pres_temp_wr_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_8) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_13)
 am__simple_xy_nc4_rd_SOURCES_DIST = simple_xy_nc4_rd.f
@@ -121,7 +121,7 @@
 @USE_NETCDF4_TRUE@	simple_xy_nc4_rd.$(OBJEXT)
 simple_xy_nc4_rd_OBJECTS = $(am_simple_xy_nc4_rd_OBJECTS)
 simple_xy_nc4_rd_LDADD = $(LDADD)
-simple_xy_nc4_rd_DEPENDENCIES = ../../fortran/libnetcdff.la \
+simple_xy_nc4_rd_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_8) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_13)
 am__simple_xy_nc4_wr_SOURCES_DIST = simple_xy_nc4_wr.f
@@ -129,19 +129,19 @@
 @USE_NETCDF4_TRUE@	simple_xy_nc4_wr.$(OBJEXT)
 simple_xy_nc4_wr_OBJECTS = $(am_simple_xy_nc4_wr_OBJECTS)
 simple_xy_nc4_wr_LDADD = $(LDADD)
-simple_xy_nc4_wr_DEPENDENCIES = ../../fortran/libnetcdff.la \
+simple_xy_nc4_wr_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_8) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_13)
 am_simple_xy_rd_OBJECTS = simple_xy_rd.$(OBJEXT)
 simple_xy_rd_OBJECTS = $(am_simple_xy_rd_OBJECTS)
 simple_xy_rd_LDADD = $(LDADD)
-simple_xy_rd_DEPENDENCIES = ../../fortran/libnetcdff.la \
+simple_xy_rd_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_8) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_13)
 am_simple_xy_wr_OBJECTS = simple_xy_wr.$(OBJEXT)
 simple_xy_wr_OBJECTS = $(am_simple_xy_wr_OBJECTS)
 simple_xy_wr_LDADD = $(LDADD)
-simple_xy_wr_DEPENDENCIES = ../../fortran/libnetcdff.la \
+simple_xy_wr_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_8) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_13)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/fortran
@@ -323,7 +323,7 @@
 top_srcdir = @top_srcdir@
 
 # Link in the fortran convenivence library.
-LDADD = ../../fortran/libnetcdff.la $(am__append_8) $(am__append_9) \
+LDADD = ../../fortran/libnetcdff-g95.la $(am__append_8) $(am__append_9) \
 	$(am__append_10) $(am__append_11) $(am__append_13)
 
 # Go to fortran directory for header.
@@ -396,28 +396,28 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-pres_temp_4D_rd$(EXEEXT): $(pres_temp_4D_rd_OBJECTS) $(pres_temp_4D_rd_DEPENDENCIES) 
+pres_temp_4D_rd$(EXEEXT): $(pres_temp_4D_rd_OBJECTS) $(pres_temp_4D_rd_DEPENDENCIES)
 	@rm -f pres_temp_4D_rd$(EXEEXT)
 	$(F77LINK) $(pres_temp_4D_rd_OBJECTS) $(pres_temp_4D_rd_LDADD) $(LIBS)
-pres_temp_4D_wr$(EXEEXT): $(pres_temp_4D_wr_OBJECTS) $(pres_temp_4D_wr_DEPENDENCIES) 
+pres_temp_4D_wr$(EXEEXT): $(pres_temp_4D_wr_OBJECTS) $(pres_temp_4D_wr_DEPENDENCIES)
 	@rm -f pres_temp_4D_wr$(EXEEXT)
 	$(F77LINK) $(pres_temp_4D_wr_OBJECTS) $(pres_temp_4D_wr_LDADD) $(LIBS)
-sfc_pres_temp_rd$(EXEEXT): $(sfc_pres_temp_rd_OBJECTS) $(sfc_pres_temp_rd_DEPENDENCIES) 
+sfc_pres_temp_rd$(EXEEXT): $(sfc_pres_temp_rd_OBJECTS) $(sfc_pres_temp_rd_DEPENDENCIES)
 	@rm -f sfc_pres_temp_rd$(EXEEXT)
 	$(F77LINK) $(sfc_pres_temp_rd_OBJECTS) $(sfc_pres_temp_rd_LDADD) $(LIBS)
-sfc_pres_temp_wr$(EXEEXT): $(sfc_pres_temp_wr_OBJECTS) $(sfc_pres_temp_wr_DEPENDENCIES) 
+sfc_pres_temp_wr$(EXEEXT): $(sfc_pres_temp_wr_OBJECTS) $(sfc_pres_temp_wr_DEPENDENCIES)
 	@rm -f sfc_pres_temp_wr$(EXEEXT)
 	$(F77LINK) $(sfc_pres_temp_wr_OBJECTS) $(sfc_pres_temp_wr_LDADD) $(LIBS)
-simple_xy_nc4_rd$(EXEEXT): $(simple_xy_nc4_rd_OBJECTS) $(simple_xy_nc4_rd_DEPENDENCIES) 
+simple_xy_nc4_rd$(EXEEXT): $(simple_xy_nc4_rd_OBJECTS) $(simple_xy_nc4_rd_DEPENDENCIES)
 	@rm -f simple_xy_nc4_rd$(EXEEXT)
 	$(F77LINK) $(simple_xy_nc4_rd_OBJECTS) $(simple_xy_nc4_rd_LDADD) $(LIBS)
-simple_xy_nc4_wr$(EXEEXT): $(simple_xy_nc4_wr_OBJECTS) $(simple_xy_nc4_wr_DEPENDENCIES) 
+simple_xy_nc4_wr$(EXEEXT): $(simple_xy_nc4_wr_OBJECTS) $(simple_xy_nc4_wr_DEPENDENCIES)
 	@rm -f simple_xy_nc4_wr$(EXEEXT)
 	$(F77LINK) $(simple_xy_nc4_wr_OBJECTS) $(simple_xy_nc4_wr_LDADD) $(LIBS)
-simple_xy_rd$(EXEEXT): $(simple_xy_rd_OBJECTS) $(simple_xy_rd_DEPENDENCIES) 
+simple_xy_rd$(EXEEXT): $(simple_xy_rd_OBJECTS) $(simple_xy_rd_DEPENDENCIES)
 	@rm -f simple_xy_rd$(EXEEXT)
 	$(F77LINK) $(simple_xy_rd_OBJECTS) $(simple_xy_rd_LDADD) $(LIBS)
-simple_xy_wr$(EXEEXT): $(simple_xy_wr_OBJECTS) $(simple_xy_wr_DEPENDENCIES) 
+simple_xy_wr$(EXEEXT): $(simple_xy_wr_OBJECTS) $(simple_xy_wr_DEPENDENCIES)
 	@rm -f simple_xy_wr$(EXEEXT)
 	$(F77LINK) $(simple_xy_wr_OBJECTS) $(simple_xy_wr_LDADD) $(LIBS)
 
--- netcdf-g95.orig/examples/F90/Makefile.am
+++ netcdf-g95/examples/F90/Makefile.am
@@ -1,5 +1,5 @@
 ## This is a automake file, part of Unidata's netCDF package.
-# Copyright 2006, see the COPYRIGHT file for more information.  
+# Copyright 2006, see the COPYRIGHT file for more information.
 
 # This file builds F90 examples.
 
@@ -12,7 +12,7 @@
 @MOD_FLAG@$(top_builddir)/f90
 AM_FCFLAGS = -I$(top_srcdir)/fortran -I$(top_srcdir)/f90	\
 @MOD_FLAG@$(top_builddir)/f90
-LDADD = ../../fortran/libnetcdff.la
+LDADD = ../../fortran/libnetcdff-g95.la
 AM_LDFLAGS =
 
 # Some fortran compilers think your files should not have an .f90
@@ -36,7 +36,7 @@
 pres_temp_4D_rd_SOURCES = pres_temp_4D_rd.f90
 
 # Cleaning up files created during the process.
-CLEANFILES = simple_xy.nc sfc_pres_temp.nc pres_temp_4D.nc 
+CLEANFILES = simple_xy.nc sfc_pres_temp.nc pres_temp_4D.nc
 
 # Is the user building netCDF-4?
 if USE_NETCDF4
@@ -65,13 +65,13 @@
 # Since netCDF-4 is being built, link to the netcdf library in
 # ../../libsrc4, also link to HDF5 and HDF5 high-level libraries, and
 # find netcdf.h in ../../libsrc4.
-AM_FFLAGS += -I$(top_srcdir)/libsrc4 
-AM_FCFLAGS += -I$(top_srcdir)/libsrc4 
+AM_FFLAGS += -I$(top_srcdir)/libsrc4
+AM_FCFLAGS += -I$(top_srcdir)/libsrc4
 LDADD += ../../libsrc4/libnetcdf.la
 if USE_HDF4
 LDADD += -lmfhdf -ldf -ljpeg
 endif # USE_HDF4
-LDADD += -lhdf5_hl -lhdf5 -lz 
+LDADD += -lhdf5_hl -lhdf5 -lz
 
 if USE_PNETCDF
 LDADD += -lpnetcdf
@@ -123,7 +123,7 @@
 AM_FFLAGS += -I$(top_srcdir)/libsrc
 AM_FCFLAGS += -I$(top_srcdir)/libsrc
 
-LDADD += ../../libsrc/libnetcdf.la 
+LDADD += ../../libsrc/libnetcdf.la
 
 endif # USE_NETCDF4
 
--- netcdf-g95.orig/examples/F90/Makefile.in
+++ netcdf-g95/examples/F90/Makefile.in
@@ -15,7 +15,7 @@
 
 @SET_MAKE@
 
-# Copyright 2006, see the COPYRIGHT file for more information.  
+# Copyright 2006, see the COPYRIGHT file for more information.
 
 # This file builds F90 examples.
 
@@ -60,11 +60,11 @@
 # Since netCDF-4 is being built, link to the netcdf library in
 # ../../libsrc4, also link to HDF5 and HDF5 high-level libraries, and
 # find netcdf.h in ../../libsrc4.
-@USE_NETCDF4_TRUE@am__append_10 = -I$(top_srcdir)/libsrc4 
-@USE_NETCDF4_TRUE@am__append_11 = -I$(top_srcdir)/libsrc4 
+@USE_NETCDF4_TRUE@am__append_10 = -I$(top_srcdir)/libsrc4
+@USE_NETCDF4_TRUE@am__append_11 = -I$(top_srcdir)/libsrc4
 @USE_NETCDF4_TRUE@am__append_12 = ../../libsrc4/libnetcdf.la
 @USE_HDF4_TRUE@@USE_NETCDF4_TRUE@am__append_13 = -lmfhdf -ldf -ljpeg
-@USE_NETCDF4_TRUE@am__append_14 = -lhdf5_hl -lhdf5 -lz 
+@USE_NETCDF4_TRUE@am__append_14 = -lhdf5_hl -lhdf5 -lz
 @USE_NETCDF4_TRUE@@USE_PNETCDF_TRUE@am__append_15 = -lpnetcdf
 
 # Add example to the tests run.
@@ -94,7 +94,7 @@
 # Without netcdf-4, go to ../../libsrc for the library and header.
 @USE_NETCDF4_FALSE@am__append_24 = -I$(top_srcdir)/libsrc
 @USE_NETCDF4_FALSE@am__append_25 = -I$(top_srcdir)/libsrc
-@USE_NETCDF4_FALSE@am__append_26 = ../../libsrc/libnetcdf.la 
+@USE_NETCDF4_FALSE@am__append_26 = ../../libsrc/libnetcdf.la
 @BUILD_DAP_TRUE@am__append_27 = @CURL_CFLAGS@
 @BUILD_DAP_TRUE@am__append_28 = @CURL_CFLAGS@
 @BUILD_DAP_TRUE@am__append_29 = @CURL_LIBS@
@@ -130,45 +130,45 @@
 nc4_pres_temp_4D_wr_OBJECTS = $(am_nc4_pres_temp_4D_wr_OBJECTS)
 nc4_pres_temp_4D_wr_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
-nc4_pres_temp_4D_wr_DEPENDENCIES = ../../fortran/libnetcdff.la \
+nc4_pres_temp_4D_wr_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_12) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_26)
 am__nc4_sfc_pres_temp_wr_SOURCES_DIST = nc4_sfc_pres_temp_wr.f90
 @EXTRA_EXAMPLE_TESTS_TRUE@@USE_NETCDF4_TRUE@am_nc4_sfc_pres_temp_wr_OBJECTS = nc4_sfc_pres_temp_wr.$(OBJEXT)
 nc4_sfc_pres_temp_wr_OBJECTS = $(am_nc4_sfc_pres_temp_wr_OBJECTS)
 nc4_sfc_pres_temp_wr_LDADD = $(LDADD)
-nc4_sfc_pres_temp_wr_DEPENDENCIES = ../../fortran/libnetcdff.la \
+nc4_sfc_pres_temp_wr_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_12) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_26)
 am__nc4_simple_xy_wr_SOURCES_DIST = nc4_simple_xy_wr.f90
 @EXTRA_EXAMPLE_TESTS_TRUE@@USE_NETCDF4_TRUE@am_nc4_simple_xy_wr_OBJECTS = nc4_simple_xy_wr.$(OBJEXT)
 nc4_simple_xy_wr_OBJECTS = $(am_nc4_simple_xy_wr_OBJECTS)
 nc4_simple_xy_wr_LDADD = $(LDADD)
-nc4_simple_xy_wr_DEPENDENCIES = ../../fortran/libnetcdff.la \
+nc4_simple_xy_wr_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_12) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_26)
 am_pres_temp_4D_rd_OBJECTS = pres_temp_4D_rd.$(OBJEXT)
 pres_temp_4D_rd_OBJECTS = $(am_pres_temp_4D_rd_OBJECTS)
 pres_temp_4D_rd_LDADD = $(LDADD)
-pres_temp_4D_rd_DEPENDENCIES = ../../fortran/libnetcdff.la \
+pres_temp_4D_rd_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_12) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_26)
 am_pres_temp_4D_wr_OBJECTS = pres_temp_4D_wr.$(OBJEXT)
 pres_temp_4D_wr_OBJECTS = $(am_pres_temp_4D_wr_OBJECTS)
 pres_temp_4D_wr_LDADD = $(LDADD)
-pres_temp_4D_wr_DEPENDENCIES = ../../fortran/libnetcdff.la \
+pres_temp_4D_wr_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_12) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_26)
 am_sfc_pres_temp_rd_OBJECTS = sfc_pres_temp_rd.$(OBJEXT)
 sfc_pres_temp_rd_OBJECTS = $(am_sfc_pres_temp_rd_OBJECTS)
 sfc_pres_temp_rd_LDADD = $(LDADD)
-sfc_pres_temp_rd_DEPENDENCIES = ../../fortran/libnetcdff.la \
+sfc_pres_temp_rd_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_12) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_26)
 am_sfc_pres_temp_wr_OBJECTS = sfc_pres_temp_wr.$(OBJEXT)
 sfc_pres_temp_wr_OBJECTS = $(am_sfc_pres_temp_wr_OBJECTS)
 sfc_pres_temp_wr_LDADD = $(LDADD)
-sfc_pres_temp_wr_DEPENDENCIES = ../../fortran/libnetcdff.la \
+sfc_pres_temp_wr_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_12) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_26)
 am__simple_xy_nc4_rd_SOURCES_DIST = simple_xy_nc4_rd.f90
@@ -176,7 +176,7 @@
 @USE_NETCDF4_TRUE@	simple_xy_nc4_rd.$(OBJEXT)
 simple_xy_nc4_rd_OBJECTS = $(am_simple_xy_nc4_rd_OBJECTS)
 simple_xy_nc4_rd_LDADD = $(LDADD)
-simple_xy_nc4_rd_DEPENDENCIES = ../../fortran/libnetcdff.la \
+simple_xy_nc4_rd_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_12) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_26)
 am__simple_xy_nc4_wr_SOURCES_DIST = simple_xy_nc4_wr.f90
@@ -184,33 +184,33 @@
 @USE_NETCDF4_TRUE@	simple_xy_nc4_wr.$(OBJEXT)
 simple_xy_nc4_wr_OBJECTS = $(am_simple_xy_nc4_wr_OBJECTS)
 simple_xy_nc4_wr_LDADD = $(LDADD)
-simple_xy_nc4_wr_DEPENDENCIES = ../../fortran/libnetcdff.la \
+simple_xy_nc4_wr_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_12) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_26)
 am__simple_xy_par_rd_SOURCES_DIST = simple_xy_par_rd.f90
 @TEST_PARALLEL_TRUE@@USE_NETCDF4_TRUE@am_simple_xy_par_rd_OBJECTS = simple_xy_par_rd.$(OBJEXT)
 simple_xy_par_rd_OBJECTS = $(am_simple_xy_par_rd_OBJECTS)
 simple_xy_par_rd_LDADD = $(LDADD)
-simple_xy_par_rd_DEPENDENCIES = ../../fortran/libnetcdff.la \
+simple_xy_par_rd_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_12) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_26)
 am__simple_xy_par_wr_SOURCES_DIST = simple_xy_par_wr.f90
 @TEST_PARALLEL_TRUE@@USE_NETCDF4_TRUE@am_simple_xy_par_wr_OBJECTS = simple_xy_par_wr.$(OBJEXT)
 simple_xy_par_wr_OBJECTS = $(am_simple_xy_par_wr_OBJECTS)
 simple_xy_par_wr_LDADD = $(LDADD)
-simple_xy_par_wr_DEPENDENCIES = ../../fortran/libnetcdff.la \
+simple_xy_par_wr_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_12) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_26)
 am_simple_xy_rd_OBJECTS = simple_xy_rd.$(OBJEXT)
 simple_xy_rd_OBJECTS = $(am_simple_xy_rd_OBJECTS)
 simple_xy_rd_LDADD = $(LDADD)
-simple_xy_rd_DEPENDENCIES = ../../fortran/libnetcdff.la \
+simple_xy_rd_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_12) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_26)
 am_simple_xy_wr_OBJECTS = simple_xy_wr.$(OBJEXT)
 simple_xy_wr_OBJECTS = $(am_simple_xy_wr_OBJECTS)
 simple_xy_wr_LDADD = $(LDADD)
-simple_xy_wr_DEPENDENCIES = ../../fortran/libnetcdff.la \
+simple_xy_wr_DEPENDENCIES = ../../fortran/libnetcdff-g95.la \
 	$(am__append_12) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__append_26)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/fortran
@@ -414,7 +414,7 @@
 	@MOD_FLAG@$(top_builddir)/f90 $(FCFLAGS_f90) $(am__append_2) \
 	$(am__append_5) $(am__append_8) $(am__append_11) \
 	$(am__append_25) $(am__append_28)
-LDADD = ../../fortran/libnetcdff.la $(am__append_12) $(am__append_13) \
+LDADD = ../../fortran/libnetcdff-g95.la $(am__append_12) $(am__append_13) \
 	$(am__append_14) $(am__append_15) $(am__append_26)
 AM_LDFLAGS = $(am__append_3) $(am__append_6) $(am__append_9) \
 	$(am__append_29)
@@ -500,43 +500,43 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-nc4_pres_temp_4D_wr$(EXEEXT): $(nc4_pres_temp_4D_wr_OBJECTS) $(nc4_pres_temp_4D_wr_DEPENDENCIES) 
+nc4_pres_temp_4D_wr$(EXEEXT): $(nc4_pres_temp_4D_wr_OBJECTS) $(nc4_pres_temp_4D_wr_DEPENDENCIES)
 	@rm -f nc4_pres_temp_4D_wr$(EXEEXT)
 	$(FCLINK) $(nc4_pres_temp_4D_wr_OBJECTS) $(nc4_pres_temp_4D_wr_LDADD) $(LIBS)
-nc4_sfc_pres_temp_wr$(EXEEXT): $(nc4_sfc_pres_temp_wr_OBJECTS) $(nc4_sfc_pres_temp_wr_DEPENDENCIES) 
+nc4_sfc_pres_temp_wr$(EXEEXT): $(nc4_sfc_pres_temp_wr_OBJECTS) $(nc4_sfc_pres_temp_wr_DEPENDENCIES)
 	@rm -f nc4_sfc_pres_temp_wr$(EXEEXT)
 	$(FCLINK) $(nc4_sfc_pres_temp_wr_OBJECTS) $(nc4_sfc_pres_temp_wr_LDADD) $(LIBS)
-nc4_simple_xy_wr$(EXEEXT): $(nc4_simple_xy_wr_OBJECTS) $(nc4_simple_xy_wr_DEPENDENCIES) 
+nc4_simple_xy_wr$(EXEEXT): $(nc4_simple_xy_wr_OBJECTS) $(nc4_simple_xy_wr_DEPENDENCIES)
 	@rm -f nc4_simple_xy_wr$(EXEEXT)
 	$(FCLINK) $(nc4_simple_xy_wr_OBJECTS) $(nc4_simple_xy_wr_LDADD) $(LIBS)
-pres_temp_4D_rd$(EXEEXT): $(pres_temp_4D_rd_OBJECTS) $(pres_temp_4D_rd_DEPENDENCIES) 
+pres_temp_4D_rd$(EXEEXT): $(pres_temp_4D_rd_OBJECTS) $(pres_temp_4D_rd_DEPENDENCIES)
 	@rm -f pres_temp_4D_rd$(EXEEXT)
 	$(FCLINK) $(pres_temp_4D_rd_OBJECTS) $(pres_temp_4D_rd_LDADD) $(LIBS)
-pres_temp_4D_wr$(EXEEXT): $(pres_temp_4D_wr_OBJECTS) $(pres_temp_4D_wr_DEPENDENCIES) 
+pres_temp_4D_wr$(EXEEXT): $(pres_temp_4D_wr_OBJECTS) $(pres_temp_4D_wr_DEPENDENCIES)
 	@rm -f pres_temp_4D_wr$(EXEEXT)
 	$(FCLINK) $(pres_temp_4D_wr_OBJECTS) $(pres_temp_4D_wr_LDADD) $(LIBS)
-sfc_pres_temp_rd$(EXEEXT): $(sfc_pres_temp_rd_OBJECTS) $(sfc_pres_temp_rd_DEPENDENCIES) 
+sfc_pres_temp_rd$(EXEEXT): $(sfc_pres_temp_rd_OBJECTS) $(sfc_pres_temp_rd_DEPENDENCIES)
 	@rm -f sfc_pres_temp_rd$(EXEEXT)
 	$(FCLINK) $(sfc_pres_temp_rd_OBJECTS) $(sfc_pres_temp_rd_LDADD) $(LIBS)
-sfc_pres_temp_wr$(EXEEXT): $(sfc_pres_temp_wr_OBJECTS) $(sfc_pres_temp_wr_DEPENDENCIES) 
+sfc_pres_temp_wr$(EXEEXT): $(sfc_pres_temp_wr_OBJECTS) $(sfc_pres_temp_wr_DEPENDENCIES)
 	@rm -f sfc_pres_temp_wr$(EXEEXT)
 	$(FCLINK) $(sfc_pres_temp_wr_OBJECTS) $(sfc_pres_temp_wr_LDADD) $(LIBS)
-simple_xy_nc4_rd$(EXEEXT): $(simple_xy_nc4_rd_OBJECTS) $(simple_xy_nc4_rd_DEPENDENCIES) 
+simple_xy_nc4_rd$(EXEEXT): $(simple_xy_nc4_rd_OBJECTS) $(simple_xy_nc4_rd_DEPENDENCIES)
 	@rm -f simple_xy_nc4_rd$(EXEEXT)
 	$(FCLINK) $(simple_xy_nc4_rd_OBJECTS) $(simple_xy_nc4_rd_LDADD) $(LIBS)
-simple_xy_nc4_wr$(EXEEXT): $(simple_xy_nc4_wr_OBJECTS) $(simple_xy_nc4_wr_DEPENDENCIES) 
+simple_xy_nc4_wr$(EXEEXT): $(simple_xy_nc4_wr_OBJECTS) $(simple_xy_nc4_wr_DEPENDENCIES)
 	@rm -f simple_xy_nc4_wr$(EXEEXT)
 	$(FCLINK) $(simple_xy_nc4_wr_OBJECTS) $(simple_xy_nc4_wr_LDADD) $(LIBS)
-simple_xy_par_rd$(EXEEXT): $(simple_xy_par_rd_OBJECTS) $(simple_xy_par_rd_DEPENDENCIES) 
+simple_xy_par_rd$(EXEEXT): $(simple_xy_par_rd_OBJECTS) $(simple_xy_par_rd_DEPENDENCIES)
 	@rm -f simple_xy_par_rd$(EXEEXT)
 	$(FCLINK) $(simple_xy_par_rd_OBJECTS) $(simple_xy_par_rd_LDADD) $(LIBS)
-simple_xy_par_wr$(EXEEXT): $(simple_xy_par_wr_OBJECTS) $(simple_xy_par_wr_DEPENDENCIES) 
+simple_xy_par_wr$(EXEEXT): $(simple_xy_par_wr_OBJECTS) $(simple_xy_par_wr_DEPENDENCIES)
 	@rm -f simple_xy_par_wr$(EXEEXT)
 	$(FCLINK) $(simple_xy_par_wr_OBJECTS) $(simple_xy_par_wr_LDADD) $(LIBS)
-simple_xy_rd$(EXEEXT): $(simple_xy_rd_OBJECTS) $(simple_xy_rd_DEPENDENCIES) 
+simple_xy_rd$(EXEEXT): $(simple_xy_rd_OBJECTS) $(simple_xy_rd_DEPENDENCIES)
 	@rm -f simple_xy_rd$(EXEEXT)
 	$(FCLINK) $(simple_xy_rd_OBJECTS) $(simple_xy_rd_LDADD) $(LIBS)
-simple_xy_wr$(EXEEXT): $(simple_xy_wr_OBJECTS) $(simple_xy_wr_DEPENDENCIES) 
+simple_xy_wr$(EXEEXT): $(simple_xy_wr_OBJECTS) $(simple_xy_wr_DEPENDENCIES)
 	@rm -f simple_xy_wr$(EXEEXT)
 	$(FCLINK) $(simple_xy_wr_OBJECTS) $(simple_xy_wr_LDADD) $(LIBS)
 
--- netcdf-g95.orig/fortran/Makefile.am
+++ netcdf-g95/fortran/Makefile.am
@@ -28,12 +28,12 @@
 # Does the user wants separate fortran libraries? See the comments in
 # libsrc/Makefile.am about the version-info number.
 if BUILD_SEPARATE_FORTRAN
-lib_LTLIBRARIES = libnetcdff.la
+lib_LTLIBRARIES = libnetcdff-g95.la
 # Point pre-processor and linker to directory with C lib.
 AM_CPPFLAGS += -I$(NETCDF_C_LIB)/include
 AM_LDFLAGS += -L$(NETCDF_C_LIB)/lib
 else
-noinst_LTLIBRARIES = libnetcdff.la
+noinst_LTLIBRARIES = libnetcdff-g95.la
 endif
 
 # These are the source files for the fortran library.
@@ -71,10 +71,10 @@
 # Tell make to rebuld fortran library if nfconfig.inc has changed
 # (it's generated by the configure script from nfconfig.in), or if
 # netcdf.inc has changed.
-libnetcdff_la_DEPENDENCIES = nfconfig.inc netcdf.inc 
+libnetcdff_la_DEPENDENCIES = nfconfig.inc netcdf.inc
 
 # May need to set this.
-libnetcdff_la_LIBADD = 
+libnetcdff_la_LIBADD =
 
 # Is the user building netCDF-4?
 if USE_NETCDF4
@@ -87,7 +87,7 @@
 libnetcdff_la_LIBADD += $(top_builddir)/libsrc4/libnetcdf.la
 
 #libnetcdff_la_LDFLAGS = $(AM_LDFLAGS) -version-info 5:0:0 -no-undefined
-libnetcdff_la_LDFLAGS = $(AM_LDFLAGS) -version-info 5:0:0 
+libnetcdff_la_LDFLAGS = $(AM_LDFLAGS) -version-info 5:0:0
 endif # BUILD_SEPARATE_FORTRAN
 
 # Find netCDF header file in libsrc4.
@@ -132,7 +132,7 @@
 # Fortran library depends on C library.
 libnetcdff_la_LIBADD += $(top_builddir)/libsrc/libnetcdf.la
 
-libnetcdff_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:0:0 
+libnetcdff_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:0:0
 endif # BUILD_SEPARATE_FORTRAN
 
 endif # USE_NETCDF4
@@ -162,6 +162,6 @@
 
 # These files need to be cleaned up my make.
 CLEANFILES = nfconfig1.inc netcdf.inc
-DISTCLEANFILES = nfconfig.inc 
+DISTCLEANFILES = nfconfig.inc
 
 test: check
--- netcdf-g95.orig/fortran/Makefile.in
+++ netcdf-g95/fortran/Makefile.in
@@ -347,8 +347,8 @@
 
 # Does the user wants separate fortran libraries? See the comments in
 # libsrc/Makefile.am about the version-info number.
-@BUILD_SEPARATE_FORTRAN_TRUE@lib_LTLIBRARIES = libnetcdff.la
-@BUILD_SEPARATE_FORTRAN_FALSE@noinst_LTLIBRARIES = libnetcdff.la
+@BUILD_SEPARATE_FORTRAN_TRUE@lib_LTLIBRARIES = libnetcdff-g95.la
+@BUILD_SEPARATE_FORTRAN_FALSE@noinst_LTLIBRARIES = libnetcdff-g95.la
 
 # These are the source files for the fortran library.
 libnetcdff_la_SOURCES = fort-attio.c fort-control.c fort-dim.c \
@@ -366,15 +366,15 @@
 # Tell make to rebuld fortran library if nfconfig.inc has changed
 # (it's generated by the configure script from nfconfig.in), or if
 # netcdf.inc has changed.
-libnetcdff_la_DEPENDENCIES = nfconfig.inc netcdf.inc 
+libnetcdff_la_DEPENDENCIES = nfconfig.inc netcdf.inc
 
 # May need to set this.
 libnetcdff_la_LIBADD = $(am__append_7) $(am__append_20) \
 	$(am__append_21)
-@BUILD_SEPARATE_FORTRAN_TRUE@@USE_NETCDF4_FALSE@libnetcdff_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:0:0 
+@BUILD_SEPARATE_FORTRAN_TRUE@@USE_NETCDF4_FALSE@libnetcdff_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:0:0
 
 #libnetcdff_la_LDFLAGS = $(AM_LDFLAGS) -version-info 5:0:0 -no-undefined
-@BUILD_SEPARATE_FORTRAN_TRUE@@USE_NETCDF4_TRUE@libnetcdff_la_LDFLAGS = $(AM_LDFLAGS) -version-info 5:0:0 
+@BUILD_SEPARATE_FORTRAN_TRUE@@USE_NETCDF4_TRUE@libnetcdff_la_LDFLAGS = $(AM_LDFLAGS) -version-info 5:0:0
 @BUILD_F90_TRUE@nodist_EXTRA_libnetcdff_la_SOURCES = dummy.f90
 
 # The nfconfig.in file is turned into nfconfig.inc by the configure
@@ -386,7 +386,7 @@
 
 # These files need to be cleaned up my make.
 CLEANFILES = nfconfig1.inc netcdf.inc
-DISTCLEANFILES = nfconfig.inc 
+DISTCLEANFILES = nfconfig.inc
 all: $(BUILT_SOURCES) nfconfig1.inc
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -432,7 +432,7 @@
 stamp-h2: $(srcdir)/nfconfig.in $(top_builddir)/config.status
 	@rm -f stamp-h2
 	cd $(top_builddir) && $(SHELL) ./config.status fortran/nfconfig1.inc
-$(srcdir)/nfconfig.in:  $(am__configure_deps) 
+$(srcdir)/nfconfig.in:  $(am__configure_deps)
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h2
 	touch $@
@@ -479,7 +479,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libnetcdff.la: $(libnetcdff_la_OBJECTS) $(libnetcdff_la_DEPENDENCIES) 
+libnetcdff-g95.la: $(libnetcdff_la_OBJECTS) $(libnetcdff_la_DEPENDENCIES)
 	$(libnetcdff_la_LINK) $(am_libnetcdff_la_rpath) $(libnetcdff_la_OBJECTS) $(libnetcdff_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
--- netcdf-g95.orig/libsrc/Makefile.am
+++ netcdf-g95/libsrc/Makefile.am
@@ -8,7 +8,7 @@
 CLEANFILES =
 
 # The C API man page.
-man_MANS = netcdf.3 
+man_MANS = netcdf.3
 
 # This rule generates the C manpage.
 ARGS_MANPAGE = -DAPI=C
@@ -22,7 +22,7 @@
 ARGS_MANPAGE += -DPARALLEL_IO=TRUE
 endif
 
-netcdf.3: $(top_srcdir)/man4/netcdf.m4 
+netcdf.3: $(top_srcdir)/man4/netcdf.m4
 	m4 $(M4FLAGS) $(ARGS_MANPAGE) $? >$@  || rm $@
 
 # These files are part of the netCDF-3 library.
@@ -40,8 +40,8 @@
 
 # We may have to add to these later.
 LDADD=
-libnetcdf_la_LIBADD = 
-noinst_LTLIBRARIES = 
+libnetcdf_la_LIBADD =
+noinst_LTLIBRARIES =
 AM_CPPFLAGS =
 AM_LDFLAGS =
 libnetcdf_la_LDFLAGS =
@@ -51,7 +51,7 @@
 
 # This will create a convenience library for all the netcdf-2
 # functions.
-noinst_LTLIBRARIES += libnetcdf2.la 
+noinst_LTLIBRARIES += libnetcdf2.la
 
 # This is the v2 API source code.
 libnetcdf2_la_SOURCES = v2i.c
@@ -121,7 +121,7 @@
 # If F77 is built, include its convenience library. If F90 is built,
 # it will already be part of the F77 convenience library.
 if BUILD_F77
-libnetcdf_la_LIBADD += ../fortran/libnetcdff.la
+libnetcdf_la_LIBADD += ../fortran/libnetcdff-g95.la
 endif
 
 endif # !BUILD_SEPARATE_FORTRAN
@@ -144,7 +144,7 @@
 
 # We need extra arguments to produce the def file, which is needed by
 # MS tools to create the VC++ import library. Add -avoid-version to
-# avoid the version number in the .dll file name. 
+# avoid the version number in the .dll file name.
 libnetcdf_la_LDFLAGS += -Wl,--output-def,.libs/libnetcdf.def  -no-undefined
 AM_CPPFLAGS += -DNC_DLL_EXPORT
 endif # BUILD_DLL
--- netcdf-g95.orig/libsrc/Makefile.in
+++ netcdf-g95/libsrc/Makefile.in
@@ -53,7 +53,7 @@
 
 # This will create a convenience library for all the netcdf-2
 # functions.
-@BUILD_V2_TRUE@am__append_6 = libnetcdf2.la 
+@BUILD_V2_TRUE@am__append_6 = libnetcdf2.la
 # Define library for local test programs to use
 @USE_NETCDF4_TRUE@am__append_7 = ../libsrc/libnetcdf3.la
 @USE_NETCDF4_TRUE@am__append_8 = libnetcdf3.la
@@ -83,7 +83,7 @@
 
 # If F77 is built, include its convenience library. If F90 is built,
 # it will already be part of the F77 convenience library.
-@BUILD_F77_TRUE@@BUILD_SEPARATE_FORTRAN_FALSE@@USE_NETCDF4_FALSE@am__append_20 = ../fortran/libnetcdff.la
+@BUILD_F77_TRUE@@BUILD_SEPARATE_FORTRAN_FALSE@@USE_NETCDF4_FALSE@am__append_20 = ../fortran/libnetcdff-g95.la
 
 # Verson for the netcdf-3 library. Don't mess with this number
 # lightly!! This is not the same as the netCDF version, it is a
@@ -101,7 +101,7 @@
 
 # We need extra arguments to produce the def file, which is needed by
 # MS tools to create the VC++ import library. Add -avoid-version to
-# avoid the version number in the .dll file name. 
+# avoid the version number in the .dll file name.
 @BUILD_DLL_TRUE@@USE_NETCDF4_FALSE@am__append_22 = -Wl,--output-def,.libs/libnetcdf.def  -no-undefined
 @BUILD_DLL_TRUE@@USE_NETCDF4_FALSE@am__append_23 = -DNC_DLL_EXPORT
 @USE_NETCDF4_FALSE@am__append_24 = t_type
@@ -377,7 +377,7 @@
 CLEANFILES = t_nc test.nc
 
 # The C API man page.
-man_MANS = netcdf.3 
+man_MANS = netcdf.3
 
 # This rule generates the C manpage.
 ARGS_MANPAGE = -DAPI=C $(am__append_1) $(am__append_2) $(am__append_3)
@@ -500,11 +500,11 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libnetcdf.la: $(libnetcdf_la_OBJECTS) $(libnetcdf_la_DEPENDENCIES) 
+libnetcdf.la: $(libnetcdf_la_OBJECTS) $(libnetcdf_la_DEPENDENCIES)
 	$(libnetcdf_la_LINK) $(am_libnetcdf_la_rpath) $(libnetcdf_la_OBJECTS) $(libnetcdf_la_LIBADD) $(LIBS)
-libnetcdf2.la: $(libnetcdf2_la_OBJECTS) $(libnetcdf2_la_DEPENDENCIES) 
+libnetcdf2.la: $(libnetcdf2_la_OBJECTS) $(libnetcdf2_la_DEPENDENCIES)
 	$(LINK) $(am_libnetcdf2_la_rpath) $(libnetcdf2_la_OBJECTS) $(libnetcdf2_la_LIBADD) $(LIBS)
-libnetcdf3.la: $(libnetcdf3_la_OBJECTS) $(libnetcdf3_la_DEPENDENCIES) 
+libnetcdf3.la: $(libnetcdf3_la_OBJECTS) $(libnetcdf3_la_DEPENDENCIES)
 	$(LINK) $(am_libnetcdf3_la_rpath) $(libnetcdf3_la_OBJECTS) $(libnetcdf3_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
@@ -515,10 +515,10 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-t_nc$(EXEEXT): $(t_nc_OBJECTS) $(t_nc_DEPENDENCIES) 
+t_nc$(EXEEXT): $(t_nc_OBJECTS) $(t_nc_DEPENDENCIES)
 	@rm -f t_nc$(EXEEXT)
 	$(LINK) $(t_nc_OBJECTS) $(t_nc_LDADD) $(LIBS)
-t_type$(EXEEXT): $(t_type_OBJECTS) $(t_type_DEPENDENCIES) 
+t_type$(EXEEXT): $(t_type_OBJECTS) $(t_type_DEPENDENCIES)
 	@rm -f t_type$(EXEEXT)
 	$(LINK) $(t_type_OBJECTS) $(t_type_LDADD) $(LIBS)
 
@@ -964,7 +964,7 @@
 	uninstall-man uninstall-man3
 
 
-netcdf.3: $(top_srcdir)/man4/netcdf.m4 
+netcdf.3: $(top_srcdir)/man4/netcdf.m4
 	m4 $(M4FLAGS) $(ARGS_MANPAGE) $? >$@  || rm $@
 
 # This tells make how to turn .m4 files into .c files.
--- netcdf-g95.orig/libsrc4/Makefile.am
+++ netcdf-g95/libsrc4/Makefile.am
@@ -15,7 +15,7 @@
 # Cause C preprocessor to search current and parent directory.
 AM_CPPFLAGS = -I$(top_srcdir)/libsrc
 
-AM_LDFLAGS = 
+AM_LDFLAGS =
 
 # If the user specified a root location for HDF5, use it.
 if USE_HDF5_DIR
@@ -66,7 +66,7 @@
 # Include netcdf-2 unless v2 has been turned off..
 if BUILD_V2
 libnetcdf_la_LIBADD += ../libsrc/libnetcdf2.la
-TST_V2 = tst_v2 
+TST_V2 = tst_v2
 endif
 
 # Netcdf-4 source.
@@ -82,7 +82,7 @@
 # If F77 is built, include its convenience library. If F90 is built,
 # it will also be part of this convenience library.
 if BUILD_F77
-libnetcdf_la_LIBADD += ../fortran/libnetcdff.la
+libnetcdf_la_LIBADD += ../fortran/libnetcdff-g95.la
 endif
 
 endif # !BUILD_SEPARATE_FORTRAN
@@ -125,13 +125,13 @@
 $(TST_V2) tst_xplatform tst_xplatform2 tst_h_atts2 tst_endian_fill
 
 if USE_HDF4
-check_PROGRAMS += tst_interops2 
+check_PROGRAMS += tst_interops2
 TESTS += tst_interops2
 if USE_HDF4_FILE_TESTS
 check_PROGRAMS += tst_interops3
 TESTS += run_get_hdf4_files.sh tst_interops3
 endif # USE_HDF4_FILE_TESTS
-tst_interops2_LDADD = ${lib_LTLIBRARIES} -lmfhdf -ldf -ljpeg -lhdf5_hl -lhdf5 -lz 
+tst_interops2_LDADD = ${lib_LTLIBRARIES} -lmfhdf -ldf -ljpeg -lhdf5_hl -lhdf5 -lz
 endif # USE_HDF4
 
 EXTRA_DIST = ref_tst_compounds.nc ref_tst_h_compounds.h5	\
@@ -148,10 +148,10 @@
 
 if USE_HDF4
 LDADD += -lmfhdf -ldf -ljpeg
-libnetcdf_la_LIBADD += -lmfhdf -ldf 
+libnetcdf_la_LIBADD += -lmfhdf -ldf
 endif # USE_HDF4
 
-LDADD += -lhdf5_hl -lhdf5 -lz 
+LDADD += -lhdf5_hl -lhdf5 -lz
 
 if USE_PNETCDF
 LDADD += -lpnetcdf
@@ -159,7 +159,7 @@
 endif
 
 # Always need to link to hdf5 and zlib.
-#libnetcdf_la_LIBADD += -lhdf5_hl -lhdf5 
+#libnetcdf_la_LIBADD += -lhdf5_hl -lhdf5
 
 # This header is used by all test programs.
 noinst_HEADERS = nc_tests.h
@@ -188,7 +188,7 @@
 # name as the test program, and either a .h5 or .nc, for "pure" HDF5
 # files and netCDF-4 files.
 CLEANFILES = tst_nc_converts.nc tst_h_*.h5 tst_*.nc tst_interops.h5	\
-tst_interops2.h4 tst_interops4.nc AMSR_E_* MYD29.A2* 
+tst_interops2.h4 tst_interops4.nc AMSR_E_* MYD29.A2*
 
 DISTCLEANFILES = netcdf.h
 
--- netcdf-g95.orig/libsrc4/Makefile.in
+++ netcdf-g95/libsrc4/Makefile.in
@@ -80,7 +80,7 @@
 
 # If F77 is built, include its convenience library. If F90 is built,
 # it will also be part of this convenience library.
-@BUILD_F77_TRUE@@BUILD_SEPARATE_FORTRAN_FALSE@am__append_15 = ../fortran/libnetcdff.la
+@BUILD_F77_TRUE@@BUILD_SEPARATE_FORTRAN_FALSE@am__append_15 = ../fortran/libnetcdff-g95.la
 check_PROGRAMS = tst_h_files$(EXEEXT) tst_h_files2$(EXEEXT) \
 	tst_h_atts$(EXEEXT) tst_h_atts2$(EXEEXT) tst_h_atts3$(EXEEXT) \
 	tst_h_vars$(EXEEXT) tst_h_vars2$(EXEEXT) tst_h_vars3$(EXEEXT) \
@@ -136,12 +136,12 @@
 	tst_endian_fill$(EXEEXT) $(am__EXEEXT_4) $(am__EXEEXT_7) \
 	$(am__append_26) $(am__EXEEXT_6) $(am__append_29) \
 	$(am__append_30)
-@USE_HDF4_TRUE@am__append_18 = tst_interops2 
+@USE_HDF4_TRUE@am__append_18 = tst_interops2
 @USE_HDF4_TRUE@am__append_19 = tst_interops2
 @USE_HDF4_FILE_TESTS_TRUE@@USE_HDF4_TRUE@am__append_20 = tst_interops3
 @USE_HDF4_FILE_TESTS_TRUE@@USE_HDF4_TRUE@am__append_21 = run_get_hdf4_files.sh tst_interops3
 @USE_HDF4_TRUE@am__append_22 = -lmfhdf -ldf -ljpeg
-@USE_HDF4_TRUE@am__append_23 = -lmfhdf -ldf 
+@USE_HDF4_TRUE@am__append_23 = -lmfhdf -ldf
 @USE_PNETCDF_TRUE@am__append_24 = -lpnetcdf
 @USE_PNETCDF_TRUE@am__append_25 = -lpnetcdf
 
@@ -781,7 +781,7 @@
 libnetcdf_la_LIBADD = ../libsrc/libnetcdf3.la $(am__append_11) \
 	$(am__append_14) $(am__append_15) $(am__append_23) \
 	$(am__append_25)
-@BUILD_V2_TRUE@TST_V2 = tst_v2 
+@BUILD_V2_TRUE@TST_V2 = tst_v2
 
 # Netcdf-4 source.
 libnetcdf_la_SOURCES = nc4attr.c nc4internal.c nc4var.c netcdf3.h	\
@@ -792,7 +792,7 @@
 
 # These linker flags specify libtool version info.
 libnetcdf_la_LDFLAGS = -version-number 6:0:0
-@USE_HDF4_TRUE@tst_interops2_LDADD = ${lib_LTLIBRARIES} -lmfhdf -ldf -ljpeg -lhdf5_hl -lhdf5 -lz 
+@USE_HDF4_TRUE@tst_interops2_LDADD = ${lib_LTLIBRARIES} -lmfhdf -ldf -ljpeg -lhdf5_hl -lhdf5 -lz
 EXTRA_DIST = ref_tst_compounds.nc ref_tst_h_compounds.h5	\
 ref_tst_h_compounds2.h5 run_par_tests.sh run_valgrind_tests.sh	\
 run_hdf4_valgrind_tests.sh ref_tst_xplatform2_1.nc		\
@@ -808,7 +808,7 @@
 	$(am__append_24)
 
 # Always need to link to hdf5 and zlib.
-#libnetcdf_la_LIBADD += -lhdf5_hl -lhdf5 
+#libnetcdf_la_LIBADD += -lhdf5_hl -lhdf5
 
 # This header is used by all test programs.
 noinst_HEADERS = nc_tests.h
@@ -817,7 +817,7 @@
 # name as the test program, and either a .h5 or .nc, for "pure" HDF5
 # files and netCDF-4 files.
 CLEANFILES = tst_nc_converts.nc tst_h_*.h5 tst_*.nc tst_interops.h5	\
-tst_interops2.h4 tst_interops4.nc AMSR_E_* MYD29.A2* 
+tst_interops2.h4 tst_interops4.nc AMSR_E_* MYD29.A2*
 
 DISTCLEANFILES = netcdf.h $(am__append_31)
 all: all-am
@@ -885,7 +885,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libnetcdf.la: $(libnetcdf_la_OBJECTS) $(libnetcdf_la_DEPENDENCIES) 
+libnetcdf.la: $(libnetcdf_la_OBJECTS) $(libnetcdf_la_DEPENDENCIES)
 	$(libnetcdf_la_LINK) -rpath $(libdir) $(libnetcdf_la_OBJECTS) $(libnetcdf_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
@@ -896,205 +896,205 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-tst_ar5$(EXEEXT): $(tst_ar5_OBJECTS) $(tst_ar5_DEPENDENCIES) 
+tst_ar5$(EXEEXT): $(tst_ar5_OBJECTS) $(tst_ar5_DEPENDENCIES)
 	@rm -f tst_ar5$(EXEEXT)
 	$(LINK) $(tst_ar5_OBJECTS) $(tst_ar5_LDADD) $(LIBS)
-tst_atts$(EXEEXT): $(tst_atts_OBJECTS) $(tst_atts_DEPENDENCIES) 
+tst_atts$(EXEEXT): $(tst_atts_OBJECTS) $(tst_atts_DEPENDENCIES)
 	@rm -f tst_atts$(EXEEXT)
 	$(LINK) $(tst_atts_OBJECTS) $(tst_atts_LDADD) $(LIBS)
-tst_atts2$(EXEEXT): $(tst_atts2_OBJECTS) $(tst_atts2_DEPENDENCIES) 
+tst_atts2$(EXEEXT): $(tst_atts2_OBJECTS) $(tst_atts2_DEPENDENCIES)
 	@rm -f tst_atts2$(EXEEXT)
 	$(LINK) $(tst_atts2_OBJECTS) $(tst_atts2_LDADD) $(LIBS)
-tst_chunks$(EXEEXT): $(tst_chunks_OBJECTS) $(tst_chunks_DEPENDENCIES) 
+tst_chunks$(EXEEXT): $(tst_chunks_OBJECTS) $(tst_chunks_DEPENDENCIES)
 	@rm -f tst_chunks$(EXEEXT)
 	$(LINK) $(tst_chunks_OBJECTS) $(tst_chunks_LDADD) $(LIBS)
-tst_compounds$(EXEEXT): $(tst_compounds_OBJECTS) $(tst_compounds_DEPENDENCIES) 
+tst_compounds$(EXEEXT): $(tst_compounds_OBJECTS) $(tst_compounds_DEPENDENCIES)
 	@rm -f tst_compounds$(EXEEXT)
 	$(LINK) $(tst_compounds_OBJECTS) $(tst_compounds_LDADD) $(LIBS)
-tst_compounds2$(EXEEXT): $(tst_compounds2_OBJECTS) $(tst_compounds2_DEPENDENCIES) 
+tst_compounds2$(EXEEXT): $(tst_compounds2_OBJECTS) $(tst_compounds2_DEPENDENCIES)
 	@rm -f tst_compounds2$(EXEEXT)
 	$(LINK) $(tst_compounds2_OBJECTS) $(tst_compounds2_LDADD) $(LIBS)
-tst_compounds3$(EXEEXT): $(tst_compounds3_OBJECTS) $(tst_compounds3_DEPENDENCIES) 
+tst_compounds3$(EXEEXT): $(tst_compounds3_OBJECTS) $(tst_compounds3_DEPENDENCIES)
 	@rm -f tst_compounds3$(EXEEXT)
 	$(LINK) $(tst_compounds3_OBJECTS) $(tst_compounds3_LDADD) $(LIBS)
-tst_converts$(EXEEXT): $(tst_converts_OBJECTS) $(tst_converts_DEPENDENCIES) 
+tst_converts$(EXEEXT): $(tst_converts_OBJECTS) $(tst_converts_DEPENDENCIES)
 	@rm -f tst_converts$(EXEEXT)
 	$(LINK) $(tst_converts_OBJECTS) $(tst_converts_LDADD) $(LIBS)
-tst_converts2$(EXEEXT): $(tst_converts2_OBJECTS) $(tst_converts2_DEPENDENCIES) 
+tst_converts2$(EXEEXT): $(tst_converts2_OBJECTS) $(tst_converts2_DEPENDENCIES)
 	@rm -f tst_converts2$(EXEEXT)
 	$(LINK) $(tst_converts2_OBJECTS) $(tst_converts2_LDADD) $(LIBS)
-tst_coords$(EXEEXT): $(tst_coords_OBJECTS) $(tst_coords_DEPENDENCIES) 
+tst_coords$(EXEEXT): $(tst_coords_OBJECTS) $(tst_coords_DEPENDENCIES)
 	@rm -f tst_coords$(EXEEXT)
 	$(LINK) $(tst_coords_OBJECTS) $(tst_coords_LDADD) $(LIBS)
-tst_coords2$(EXEEXT): $(tst_coords2_OBJECTS) $(tst_coords2_DEPENDENCIES) 
+tst_coords2$(EXEEXT): $(tst_coords2_OBJECTS) $(tst_coords2_DEPENDENCIES)
 	@rm -f tst_coords2$(EXEEXT)
 	$(LINK) $(tst_coords2_OBJECTS) $(tst_coords2_LDADD) $(LIBS)
-tst_coords3$(EXEEXT): $(tst_coords3_OBJECTS) $(tst_coords3_DEPENDENCIES) 
+tst_coords3$(EXEEXT): $(tst_coords3_OBJECTS) $(tst_coords3_DEPENDENCIES)
 	@rm -f tst_coords3$(EXEEXT)
 	$(LINK) $(tst_coords3_OBJECTS) $(tst_coords3_LDADD) $(LIBS)
-tst_dims$(EXEEXT): $(tst_dims_OBJECTS) $(tst_dims_DEPENDENCIES) 
+tst_dims$(EXEEXT): $(tst_dims_OBJECTS) $(tst_dims_DEPENDENCIES)
 	@rm -f tst_dims$(EXEEXT)
 	$(LINK) $(tst_dims_OBJECTS) $(tst_dims_LDADD) $(LIBS)
-tst_dims2$(EXEEXT): $(tst_dims2_OBJECTS) $(tst_dims2_DEPENDENCIES) 
+tst_dims2$(EXEEXT): $(tst_dims2_OBJECTS) $(tst_dims2_DEPENDENCIES)
 	@rm -f tst_dims2$(EXEEXT)
 	$(LINK) $(tst_dims2_OBJECTS) $(tst_dims2_LDADD) $(LIBS)
-tst_dims3$(EXEEXT): $(tst_dims3_OBJECTS) $(tst_dims3_DEPENDENCIES) 
+tst_dims3$(EXEEXT): $(tst_dims3_OBJECTS) $(tst_dims3_DEPENDENCIES)
 	@rm -f tst_dims3$(EXEEXT)
 	$(LINK) $(tst_dims3_OBJECTS) $(tst_dims3_LDADD) $(LIBS)
-tst_endian_fill$(EXEEXT): $(tst_endian_fill_OBJECTS) $(tst_endian_fill_DEPENDENCIES) 
+tst_endian_fill$(EXEEXT): $(tst_endian_fill_OBJECTS) $(tst_endian_fill_DEPENDENCIES)
 	@rm -f tst_endian_fill$(EXEEXT)
 	$(LINK) $(tst_endian_fill_OBJECTS) $(tst_endian_fill_LDADD) $(LIBS)
-tst_enums$(EXEEXT): $(tst_enums_OBJECTS) $(tst_enums_DEPENDENCIES) 
+tst_enums$(EXEEXT): $(tst_enums_OBJECTS) $(tst_enums_DEPENDENCIES)
 	@rm -f tst_enums$(EXEEXT)
 	$(LINK) $(tst_enums_OBJECTS) $(tst_enums_LDADD) $(LIBS)
-tst_files$(EXEEXT): $(tst_files_OBJECTS) $(tst_files_DEPENDENCIES) 
+tst_files$(EXEEXT): $(tst_files_OBJECTS) $(tst_files_DEPENDENCIES)
 	@rm -f tst_files$(EXEEXT)
 	$(LINK) $(tst_files_OBJECTS) $(tst_files_LDADD) $(LIBS)
-tst_files2$(EXEEXT): $(tst_files2_OBJECTS) $(tst_files2_DEPENDENCIES) 
+tst_files2$(EXEEXT): $(tst_files2_OBJECTS) $(tst_files2_DEPENDENCIES)
 	@rm -f tst_files2$(EXEEXT)
 	$(LINK) $(tst_files2_OBJECTS) $(tst_files2_LDADD) $(LIBS)
-tst_files3$(EXEEXT): $(tst_files3_OBJECTS) $(tst_files3_DEPENDENCIES) 
+tst_files3$(EXEEXT): $(tst_files3_OBJECTS) $(tst_files3_DEPENDENCIES)
 	@rm -f tst_files3$(EXEEXT)
 	$(LINK) $(tst_files3_OBJECTS) $(tst_files3_LDADD) $(LIBS)
-tst_files4$(EXEEXT): $(tst_files4_OBJECTS) $(tst_files4_DEPENDENCIES) 
+tst_files4$(EXEEXT): $(tst_files4_OBJECTS) $(tst_files4_DEPENDENCIES)
 	@rm -f tst_files4$(EXEEXT)
 	$(LINK) $(tst_files4_OBJECTS) $(tst_files4_LDADD) $(LIBS)
-tst_fillbug$(EXEEXT): $(tst_fillbug_OBJECTS) $(tst_fillbug_DEPENDENCIES) 
+tst_fillbug$(EXEEXT): $(tst_fillbug_OBJECTS) $(tst_fillbug_DEPENDENCIES)
 	@rm -f tst_fillbug$(EXEEXT)
 	$(LINK) $(tst_fillbug_OBJECTS) $(tst_fillbug_LDADD) $(LIBS)
-tst_fills$(EXEEXT): $(tst_fills_OBJECTS) $(tst_fills_DEPENDENCIES) 
+tst_fills$(EXEEXT): $(tst_fills_OBJECTS) $(tst_fills_DEPENDENCIES)
 	@rm -f tst_fills$(EXEEXT)
 	$(LINK) $(tst_fills_OBJECTS) $(tst_fills_LDADD) $(LIBS)
-tst_grps$(EXEEXT): $(tst_grps_OBJECTS) $(tst_grps_DEPENDENCIES) 
+tst_grps$(EXEEXT): $(tst_grps_OBJECTS) $(tst_grps_DEPENDENCIES)
 	@rm -f tst_grps$(EXEEXT)
 	$(LINK) $(tst_grps_OBJECTS) $(tst_grps_LDADD) $(LIBS)
-tst_h_atts$(EXEEXT): $(tst_h_atts_OBJECTS) $(tst_h_atts_DEPENDENCIES) 
+tst_h_atts$(EXEEXT): $(tst_h_atts_OBJECTS) $(tst_h_atts_DEPENDENCIES)
 	@rm -f tst_h_atts$(EXEEXT)
 	$(LINK) $(tst_h_atts_OBJECTS) $(tst_h_atts_LDADD) $(LIBS)
-tst_h_atts2$(EXEEXT): $(tst_h_atts2_OBJECTS) $(tst_h_atts2_DEPENDENCIES) 
+tst_h_atts2$(EXEEXT): $(tst_h_atts2_OBJECTS) $(tst_h_atts2_DEPENDENCIES)
 	@rm -f tst_h_atts2$(EXEEXT)
 	$(LINK) $(tst_h_atts2_OBJECTS) $(tst_h_atts2_LDADD) $(LIBS)
-tst_h_atts3$(EXEEXT): $(tst_h_atts3_OBJECTS) $(tst_h_atts3_DEPENDENCIES) 
+tst_h_atts3$(EXEEXT): $(tst_h_atts3_OBJECTS) $(tst_h_atts3_DEPENDENCIES)
 	@rm -f tst_h_atts3$(EXEEXT)
 	$(LINK) $(tst_h_atts3_OBJECTS) $(tst_h_atts3_LDADD) $(LIBS)
-tst_h_compounds$(EXEEXT): $(tst_h_compounds_OBJECTS) $(tst_h_compounds_DEPENDENCIES) 
+tst_h_compounds$(EXEEXT): $(tst_h_compounds_OBJECTS) $(tst_h_compounds_DEPENDENCIES)
 	@rm -f tst_h_compounds$(EXEEXT)
 	$(LINK) $(tst_h_compounds_OBJECTS) $(tst_h_compounds_LDADD) $(LIBS)
-tst_h_compounds2$(EXEEXT): $(tst_h_compounds2_OBJECTS) $(tst_h_compounds2_DEPENDENCIES) 
+tst_h_compounds2$(EXEEXT): $(tst_h_compounds2_OBJECTS) $(tst_h_compounds2_DEPENDENCIES)
 	@rm -f tst_h_compounds2$(EXEEXT)
 	$(LINK) $(tst_h_compounds2_OBJECTS) $(tst_h_compounds2_LDADD) $(LIBS)
-tst_h_dimscales$(EXEEXT): $(tst_h_dimscales_OBJECTS) $(tst_h_dimscales_DEPENDENCIES) 
+tst_h_dimscales$(EXEEXT): $(tst_h_dimscales_OBJECTS) $(tst_h_dimscales_DEPENDENCIES)
 	@rm -f tst_h_dimscales$(EXEEXT)
 	$(LINK) $(tst_h_dimscales_OBJECTS) $(tst_h_dimscales_LDADD) $(LIBS)
-tst_h_dimscales1$(EXEEXT): $(tst_h_dimscales1_OBJECTS) $(tst_h_dimscales1_DEPENDENCIES) 
+tst_h_dimscales1$(EXEEXT): $(tst_h_dimscales1_OBJECTS) $(tst_h_dimscales1_DEPENDENCIES)
 	@rm -f tst_h_dimscales1$(EXEEXT)
 	$(LINK) $(tst_h_dimscales1_OBJECTS) $(tst_h_dimscales1_LDADD) $(LIBS)
-tst_h_dimscales2$(EXEEXT): $(tst_h_dimscales2_OBJECTS) $(tst_h_dimscales2_DEPENDENCIES) 
+tst_h_dimscales2$(EXEEXT): $(tst_h_dimscales2_OBJECTS) $(tst_h_dimscales2_DEPENDENCIES)
 	@rm -f tst_h_dimscales2$(EXEEXT)
 	$(LINK) $(tst_h_dimscales2_OBJECTS) $(tst_h_dimscales2_LDADD) $(LIBS)
-tst_h_dimscales3$(EXEEXT): $(tst_h_dimscales3_OBJECTS) $(tst_h_dimscales3_DEPENDENCIES) 
+tst_h_dimscales3$(EXEEXT): $(tst_h_dimscales3_OBJECTS) $(tst_h_dimscales3_DEPENDENCIES)
 	@rm -f tst_h_dimscales3$(EXEEXT)
 	$(LINK) $(tst_h_dimscales3_OBJECTS) $(tst_h_dimscales3_LDADD) $(LIBS)
-tst_h_enums$(EXEEXT): $(tst_h_enums_OBJECTS) $(tst_h_enums_DEPENDENCIES) 
+tst_h_enums$(EXEEXT): $(tst_h_enums_OBJECTS) $(tst_h_enums_DEPENDENCIES)
 	@rm -f tst_h_enums$(EXEEXT)
 	$(LINK) $(tst_h_enums_OBJECTS) $(tst_h_enums_LDADD) $(LIBS)
-tst_h_files$(EXEEXT): $(tst_h_files_OBJECTS) $(tst_h_files_DEPENDENCIES) 
+tst_h_files$(EXEEXT): $(tst_h_files_OBJECTS) $(tst_h_files_DEPENDENCIES)
 	@rm -f tst_h_files$(EXEEXT)
 	$(LINK) $(tst_h_files_OBJECTS) $(tst_h_files_LDADD) $(LIBS)
-tst_h_files2$(EXEEXT): $(tst_h_files2_OBJECTS) $(tst_h_files2_DEPENDENCIES) 
+tst_h_files2$(EXEEXT): $(tst_h_files2_OBJECTS) $(tst_h_files2_DEPENDENCIES)
 	@rm -f tst_h_files2$(EXEEXT)
 	$(LINK) $(tst_h_files2_OBJECTS) $(tst_h_files2_LDADD) $(LIBS)
-tst_h_files3$(EXEEXT): $(tst_h_files3_OBJECTS) $(tst_h_files3_DEPENDENCIES) 
+tst_h_files3$(EXEEXT): $(tst_h_files3_OBJECTS) $(tst_h_files3_DEPENDENCIES)
 	@rm -f tst_h_files3$(EXEEXT)
 	$(LINK) $(tst_h_files3_OBJECTS) $(tst_h_files3_LDADD) $(LIBS)
-tst_h_grps$(EXEEXT): $(tst_h_grps_OBJECTS) $(tst_h_grps_DEPENDENCIES) 
+tst_h_grps$(EXEEXT): $(tst_h_grps_OBJECTS) $(tst_h_grps_DEPENDENCIES)
 	@rm -f tst_h_grps$(EXEEXT)
 	$(LINK) $(tst_h_grps_OBJECTS) $(tst_h_grps_LDADD) $(LIBS)
-tst_h_opaques$(EXEEXT): $(tst_h_opaques_OBJECTS) $(tst_h_opaques_DEPENDENCIES) 
+tst_h_opaques$(EXEEXT): $(tst_h_opaques_OBJECTS) $(tst_h_opaques_DEPENDENCIES)
 	@rm -f tst_h_opaques$(EXEEXT)
 	$(LINK) $(tst_h_opaques_OBJECTS) $(tst_h_opaques_LDADD) $(LIBS)
-tst_h_par$(EXEEXT): $(tst_h_par_OBJECTS) $(tst_h_par_DEPENDENCIES) 
+tst_h_par$(EXEEXT): $(tst_h_par_OBJECTS) $(tst_h_par_DEPENDENCIES)
 	@rm -f tst_h_par$(EXEEXT)
 	$(LINK) $(tst_h_par_OBJECTS) $(tst_h_par_LDADD) $(LIBS)
-tst_h_rd_cmp$(EXEEXT): $(tst_h_rd_cmp_OBJECTS) $(tst_h_rd_cmp_DEPENDENCIES) 
+tst_h_rd_cmp$(EXEEXT): $(tst_h_rd_cmp_OBJECTS) $(tst_h_rd_cmp_DEPENDENCIES)
 	@rm -f tst_h_rd_cmp$(EXEEXT)
 	$(LINK) $(tst_h_rd_cmp_OBJECTS) $(tst_h_rd_cmp_LDADD) $(LIBS)
-tst_h_strings$(EXEEXT): $(tst_h_strings_OBJECTS) $(tst_h_strings_DEPENDENCIES) 
+tst_h_strings$(EXEEXT): $(tst_h_strings_OBJECTS) $(tst_h_strings_DEPENDENCIES)
 	@rm -f tst_h_strings$(EXEEXT)
 	$(LINK) $(tst_h_strings_OBJECTS) $(tst_h_strings_LDADD) $(LIBS)
-tst_h_strings1$(EXEEXT): $(tst_h_strings1_OBJECTS) $(tst_h_strings1_DEPENDENCIES) 
+tst_h_strings1$(EXEEXT): $(tst_h_strings1_OBJECTS) $(tst_h_strings1_DEPENDENCIES)
 	@rm -f tst_h_strings1$(EXEEXT)
 	$(LINK) $(tst_h_strings1_OBJECTS) $(tst_h_strings1_LDADD) $(LIBS)
-tst_h_vars$(EXEEXT): $(tst_h_vars_OBJECTS) $(tst_h_vars_DEPENDENCIES) 
+tst_h_vars$(EXEEXT): $(tst_h_vars_OBJECTS) $(tst_h_vars_DEPENDENCIES)
 	@rm -f tst_h_vars$(EXEEXT)
 	$(LINK) $(tst_h_vars_OBJECTS) $(tst_h_vars_LDADD) $(LIBS)
-tst_h_vars2$(EXEEXT): $(tst_h_vars2_OBJECTS) $(tst_h_vars2_DEPENDENCIES) 
+tst_h_vars2$(EXEEXT): $(tst_h_vars2_OBJECTS) $(tst_h_vars2_DEPENDENCIES)
 	@rm -f tst_h_vars2$(EXEEXT)
 	$(LINK) $(tst_h_vars2_OBJECTS) $(tst_h_vars2_LDADD) $(LIBS)
-tst_h_vars3$(EXEEXT): $(tst_h_vars3_OBJECTS) $(tst_h_vars3_DEPENDENCIES) 
+tst_h_vars3$(EXEEXT): $(tst_h_vars3_OBJECTS) $(tst_h_vars3_DEPENDENCIES)
 	@rm -f tst_h_vars3$(EXEEXT)
 	$(LINK) $(tst_h_vars3_OBJECTS) $(tst_h_vars3_LDADD) $(LIBS)
-tst_h_vl$(EXEEXT): $(tst_h_vl_OBJECTS) $(tst_h_vl_DEPENDENCIES) 
+tst_h_vl$(EXEEXT): $(tst_h_vl_OBJECTS) $(tst_h_vl_DEPENDENCIES)
 	@rm -f tst_h_vl$(EXEEXT)
 	$(LINK) $(tst_h_vl_OBJECTS) $(tst_h_vl_LDADD) $(LIBS)
-tst_h_vl2$(EXEEXT): $(tst_h_vl2_OBJECTS) $(tst_h_vl2_DEPENDENCIES) 
+tst_h_vl2$(EXEEXT): $(tst_h_vl2_OBJECTS) $(tst_h_vl2_DEPENDENCIES)
 	@rm -f tst_h_vl2$(EXEEXT)
 	$(LINK) $(tst_h_vl2_OBJECTS) $(tst_h_vl2_LDADD) $(LIBS)
-tst_h_wrt_cmp$(EXEEXT): $(tst_h_wrt_cmp_OBJECTS) $(tst_h_wrt_cmp_DEPENDENCIES) 
+tst_h_wrt_cmp$(EXEEXT): $(tst_h_wrt_cmp_OBJECTS) $(tst_h_wrt_cmp_DEPENDENCIES)
 	@rm -f tst_h_wrt_cmp$(EXEEXT)
 	$(LINK) $(tst_h_wrt_cmp_OBJECTS) $(tst_h_wrt_cmp_LDADD) $(LIBS)
-tst_interops$(EXEEXT): $(tst_interops_OBJECTS) $(tst_interops_DEPENDENCIES) 
+tst_interops$(EXEEXT): $(tst_interops_OBJECTS) $(tst_interops_DEPENDENCIES)
 	@rm -f tst_interops$(EXEEXT)
 	$(LINK) $(tst_interops_OBJECTS) $(tst_interops_LDADD) $(LIBS)
-tst_interops2$(EXEEXT): $(tst_interops2_OBJECTS) $(tst_interops2_DEPENDENCIES) 
+tst_interops2$(EXEEXT): $(tst_interops2_OBJECTS) $(tst_interops2_DEPENDENCIES)
 	@rm -f tst_interops2$(EXEEXT)
 	$(LINK) $(tst_interops2_OBJECTS) $(tst_interops2_LDADD) $(LIBS)
-tst_interops3$(EXEEXT): $(tst_interops3_OBJECTS) $(tst_interops3_DEPENDENCIES) 
+tst_interops3$(EXEEXT): $(tst_interops3_OBJECTS) $(tst_interops3_DEPENDENCIES)
 	@rm -f tst_interops3$(EXEEXT)
 	$(LINK) $(tst_interops3_OBJECTS) $(tst_interops3_LDADD) $(LIBS)
-tst_interops4$(EXEEXT): $(tst_interops4_OBJECTS) $(tst_interops4_DEPENDENCIES) 
+tst_interops4$(EXEEXT): $(tst_interops4_OBJECTS) $(tst_interops4_DEPENDENCIES)
 	@rm -f tst_interops4$(EXEEXT)
 	$(LINK) $(tst_interops4_OBJECTS) $(tst_interops4_LDADD) $(LIBS)
-tst_large$(EXEEXT): $(tst_large_OBJECTS) $(tst_large_DEPENDENCIES) 
+tst_large$(EXEEXT): $(tst_large_OBJECTS) $(tst_large_DEPENDENCIES)
 	@rm -f tst_large$(EXEEXT)
 	$(LINK) $(tst_large_OBJECTS) $(tst_large_LDADD) $(LIBS)
-tst_lists$(EXEEXT): $(tst_lists_OBJECTS) $(tst_lists_DEPENDENCIES) 
+tst_lists$(EXEEXT): $(tst_lists_OBJECTS) $(tst_lists_DEPENDENCIES)
 	@rm -f tst_lists$(EXEEXT)
 	$(LINK) $(tst_lists_OBJECTS) $(tst_lists_LDADD) $(LIBS)
-tst_opaques$(EXEEXT): $(tst_opaques_OBJECTS) $(tst_opaques_DEPENDENCIES) 
+tst_opaques$(EXEEXT): $(tst_opaques_OBJECTS) $(tst_opaques_DEPENDENCIES)
 	@rm -f tst_opaques$(EXEEXT)
 	$(LINK) $(tst_opaques_OBJECTS) $(tst_opaques_LDADD) $(LIBS)
-tst_strings$(EXEEXT): $(tst_strings_OBJECTS) $(tst_strings_DEPENDENCIES) 
+tst_strings$(EXEEXT): $(tst_strings_OBJECTS) $(tst_strings_DEPENDENCIES)
 	@rm -f tst_strings$(EXEEXT)
 	$(LINK) $(tst_strings_OBJECTS) $(tst_strings_LDADD) $(LIBS)
-tst_unlim_vars$(EXEEXT): $(tst_unlim_vars_OBJECTS) $(tst_unlim_vars_DEPENDENCIES) 
+tst_unlim_vars$(EXEEXT): $(tst_unlim_vars_OBJECTS) $(tst_unlim_vars_DEPENDENCIES)
 	@rm -f tst_unlim_vars$(EXEEXT)
 	$(LINK) $(tst_unlim_vars_OBJECTS) $(tst_unlim_vars_LDADD) $(LIBS)
-tst_utf8$(EXEEXT): $(tst_utf8_OBJECTS) $(tst_utf8_DEPENDENCIES) 
+tst_utf8$(EXEEXT): $(tst_utf8_OBJECTS) $(tst_utf8_DEPENDENCIES)
 	@rm -f tst_utf8$(EXEEXT)
 	$(LINK) $(tst_utf8_OBJECTS) $(tst_utf8_LDADD) $(LIBS)
-tst_v2$(EXEEXT): $(tst_v2_OBJECTS) $(tst_v2_DEPENDENCIES) 
+tst_v2$(EXEEXT): $(tst_v2_OBJECTS) $(tst_v2_DEPENDENCIES)
 	@rm -f tst_v2$(EXEEXT)
 	$(LINK) $(tst_v2_OBJECTS) $(tst_v2_LDADD) $(LIBS)
-tst_varms$(EXEEXT): $(tst_varms_OBJECTS) $(tst_varms_DEPENDENCIES) 
+tst_varms$(EXEEXT): $(tst_varms_OBJECTS) $(tst_varms_DEPENDENCIES)
 	@rm -f tst_varms$(EXEEXT)
 	$(LINK) $(tst_varms_OBJECTS) $(tst_varms_LDADD) $(LIBS)
-tst_vars$(EXEEXT): $(tst_vars_OBJECTS) $(tst_vars_DEPENDENCIES) 
+tst_vars$(EXEEXT): $(tst_vars_OBJECTS) $(tst_vars_DEPENDENCIES)
 	@rm -f tst_vars$(EXEEXT)
 	$(LINK) $(tst_vars_OBJECTS) $(tst_vars_LDADD) $(LIBS)
-tst_vars2$(EXEEXT): $(tst_vars2_OBJECTS) $(tst_vars2_DEPENDENCIES) 
+tst_vars2$(EXEEXT): $(tst_vars2_OBJECTS) $(tst_vars2_DEPENDENCIES)
 	@rm -f tst_vars2$(EXEEXT)
 	$(LINK) $(tst_vars2_OBJECTS) $(tst_vars2_LDADD) $(LIBS)
-tst_vars3$(EXEEXT): $(tst_vars3_OBJECTS) $(tst_vars3_DEPENDENCIES) 
+tst_vars3$(EXEEXT): $(tst_vars3_OBJECTS) $(tst_vars3_DEPENDENCIES)
 	@rm -f tst_vars3$(EXEEXT)
 	$(LINK) $(tst_vars3_OBJECTS) $(tst_vars3_LDADD) $(LIBS)
-tst_vl$(EXEEXT): $(tst_vl_OBJECTS) $(tst_vl_DEPENDENCIES) 
+tst_vl$(EXEEXT): $(tst_vl_OBJECTS) $(tst_vl_DEPENDENCIES)
 	@rm -f tst_vl$(EXEEXT)
 	$(LINK) $(tst_vl_OBJECTS) $(tst_vl_LDADD) $(LIBS)
-tst_xplatform$(EXEEXT): $(tst_xplatform_OBJECTS) $(tst_xplatform_DEPENDENCIES) 
+tst_xplatform$(EXEEXT): $(tst_xplatform_OBJECTS) $(tst_xplatform_DEPENDENCIES)
 	@rm -f tst_xplatform$(EXEEXT)
 	$(LINK) $(tst_xplatform_OBJECTS) $(tst_xplatform_LDADD) $(LIBS)
-tst_xplatform2$(EXEEXT): $(tst_xplatform2_OBJECTS) $(tst_xplatform2_DEPENDENCIES) 
+tst_xplatform2$(EXEEXT): $(tst_xplatform2_OBJECTS) $(tst_xplatform2_DEPENDENCIES)
 	@rm -f tst_xplatform2$(EXEEXT)
 	$(LINK) $(tst_xplatform2_OBJECTS) $(tst_xplatform2_LDADD) $(LIBS)
 
--- netcdf-g95.orig/nf_test/Makefile.am
+++ netcdf-g95/nf_test/Makefile.am
@@ -1,7 +1,7 @@
 ## This is a automake file, part of Unidata's netCDF package.
 # Copyright 2005-2006, see the COPYRIGHT file for more information.
 
-# This file builds and runs the following: 
+# This file builds and runs the following:
 
 # The nf_test program, which tests the netCDF fortran 77 interface.
 
@@ -18,7 +18,7 @@
 # $Id: Makefile.am,v 1.86 2010/01/25 21:01:07 ed Exp $
 
 LDADD =
-AM_LDFLAGS = 
+AM_LDFLAGS =
 AM_CFLAGS =
 TESTS =
 
@@ -28,7 +28,7 @@
 TESTS += create_fills.sh
 endif # BUILD_UTILITIES
 
-# nf_test is the main test program. 
+# nf_test is the main test program.
 check_PROGRAMS = nf_test
 nf_test_SOURCES = test_get.m4 test_put.m4 nf_error.F nf_test.F	\
 test_read.F test_write.F util.F fortlib.c tests.inc
@@ -49,7 +49,7 @@
 # If building a separate fortran library, include it so the tests can
 # find it.
 if BUILD_SEPARATE_FORTRAN
-LDADD += ../fortran/libnetcdff.la -lm
+LDADD += ../fortran/libnetcdff-g95.la -lm
 # Point pre-processor and linker to directory with C lib.
 AM_CPPFLAGS = -I$(NETCDF_C_LIB)/include
 AM_LDFLAGS += -L$(NETCDF_C_LIB)/lib
@@ -101,7 +101,7 @@
 CLEANFILES += f90tst_*.nc tst_types.nc tst_types2.nc tst_f90_nc4.nc
 
 if USE_SZIP
-check_PROGRAMS += f90tst_vars2 
+check_PROGRAMS += f90tst_vars2
 TESTS += f90tst_vars2
 f90tst_vars2_SOURCES = f90tst_vars2.f90
 endif
@@ -109,7 +109,7 @@
 # This is a netCDF-4 V2 test program.
 if BUILD_V2
 check_PROGRAMS += ftst_v2
-ftst_v2_SOURCES = ftst_v2.F 
+ftst_v2_SOURCES = ftst_v2.F
 TESTS += ftst_v2
 CLEANFILES += ftst_v2.nc
 endif # BUILD_V2
@@ -133,7 +133,7 @@
 
 # Test parallel I/O.
 if TEST_PARALLEL
-check_PROGRAMS += f90tst_parallel f90tst_parallel2 f90tst_parallel3	
+check_PROGRAMS += f90tst_parallel f90tst_parallel2 f90tst_parallel3
 #f90tst_parallel_fill
 f90tst_parallel_SOURCES = f90tst_parallel.f90
 f90tst_parallel2_SOURCES = f90tst_parallel2.f90
@@ -197,7 +197,7 @@
 AM_FCFLAGS += -I$(top_srcdir)/libsrc4
 
 # Include the C library in the link.
-LDADD += ../libsrc4/libnetcdf.la 
+LDADD += ../libsrc4/libnetcdf.la
 
 else
 
@@ -209,11 +209,11 @@
 endif # BUILD_C
 
 # Link to the netCDF-4, (optionally) HDF4, and the HDF5 libraries.
-LDADD += ../libsrc4/libnetcdf.la 
+LDADD += ../libsrc4/libnetcdf.la
 if USE_HDF4
 LDADD += -lmfhdf -ldf -ljpeg
 endif # USE_HDF4
-LDADD += -lhdf5_hl -lhdf5 -lz 
+LDADD += -lhdf5_hl -lhdf5 -lz
 
 if USE_PNETCDF
 LDADD += -lpnetcdf
@@ -225,7 +225,7 @@
 
 # Find header file in libsrc directory.
 AM_FFLAGS += -I$(top_srcdir)/libsrc -I$(top_srcdir)/fortran
-AM_FCFLAGS += -I$(top_srcdir)/libsrc -I$(top_srcdir)/fortran 
+AM_FCFLAGS += -I$(top_srcdir)/libsrc -I$(top_srcdir)/fortran
 
 # Include the C library in the link.
 LDADD += ../libsrc/libnetcdf.la
@@ -252,7 +252,7 @@
 if BUILD_V2
 if BUILD_UTILITIES
 check_PROGRAMS += ftest
-ftest_SOURCES = ftest.F fortlib.c 
+ftest_SOURCES = ftest.F fortlib.c
 TESTS += ftest
 CLEANFILES += test.nc
 endif # BUILD_UTILITIES
--- netcdf-g95.orig/nf_test/Makefile.in
+++ netcdf-g95/nf_test/Makefile.in
@@ -17,7 +17,7 @@
 
 # Copyright 2005-2006, see the COPYRIGHT file for more information.
 
-# This file builds and runs the following: 
+# This file builds and runs the following:
 
 # The nf_test program, which tests the netCDF fortran 77 interface.
 
@@ -72,7 +72,7 @@
 
 # If building a separate fortran library, include it so the tests can
 # find it.
-@BUILD_SEPARATE_FORTRAN_TRUE@am__append_5 = ../fortran/libnetcdff.la -lm
+@BUILD_SEPARATE_FORTRAN_TRUE@am__append_5 = ../fortran/libnetcdff-g95.la -lm
 @BUILD_SEPARATE_FORTRAN_TRUE@am__append_6 = -L$(NETCDF_C_LIB)/lib
 
 # Is the user building netCDF-4?
@@ -97,7 +97,7 @@
 @BUILD_F90_TRUE@@USE_NETCDF4_TRUE@f90tst_grps f90tst_fill f90tst_fill2 f90tst_vars3
 
 @BUILD_F90_TRUE@@USE_NETCDF4_TRUE@am__append_12 = f90tst_*.nc tst_types.nc tst_types2.nc tst_f90_nc4.nc
-@BUILD_F90_TRUE@@USE_NETCDF4_TRUE@@USE_SZIP_TRUE@am__append_13 = f90tst_vars2 
+@BUILD_F90_TRUE@@USE_NETCDF4_TRUE@@USE_SZIP_TRUE@am__append_13 = f90tst_vars2
 @BUILD_F90_TRUE@@USE_NETCDF4_TRUE@@USE_SZIP_TRUE@am__append_14 = f90tst_vars2
 
 # This is a netCDF-4 V2 test program.
@@ -118,7 +118,7 @@
 
 
 # Test parallel I/O.
-@BUILD_F90_TRUE@@TEST_PARALLEL_TRUE@@USE_NETCDF4_TRUE@am__append_24 = f90tst_parallel f90tst_parallel2 f90tst_parallel3	
+@BUILD_F90_TRUE@@TEST_PARALLEL_TRUE@@USE_NETCDF4_TRUE@am__append_24 = f90tst_parallel f90tst_parallel2 f90tst_parallel3
 #f90tst_parallel_fill_SOURCES = f90tst_parallel_fill.f90
 @BUILD_F90_TRUE@@TEST_PARALLEL_TRUE@@USE_NETCDF4_TRUE@am__append_25 = run_f90_par_test.sh
 @BUILD_F90_TRUE@@TEST_PARALLEL_TRUE@@USE_NETCDF4_TRUE@am__append_26 = f90tst_parallel*.nc
@@ -158,21 +158,21 @@
 @BUILD_C_TRUE@@USE_NETCDF4_TRUE@am__append_46 = -I$(top_srcdir)/libsrc4
 
 # Include the C library in the link.
-@BUILD_C_TRUE@@USE_NETCDF4_TRUE@am__append_47 = ../libsrc4/libnetcdf.la 
+@BUILD_C_TRUE@@USE_NETCDF4_TRUE@am__append_47 = ../libsrc4/libnetcdf.la
 @BUILD_C_FALSE@@USE_NETCDF4_TRUE@am__append_48 = -I@NETCDF_C_LIB@/include
 @BUILD_C_FALSE@@USE_NETCDF4_TRUE@am__append_49 = -I@NETCDF_C_LIB@/include
 @BUILD_C_FALSE@@USE_NETCDF4_TRUE@am__append_50 = -L@NETCDF_C_LIB@/lib
 @BUILD_C_FALSE@@USE_NETCDF4_TRUE@am__append_51 = -lnetcdf
 
 # Link to the netCDF-4, (optionally) HDF4, and the HDF5 libraries.
-@USE_NETCDF4_TRUE@am__append_52 = ../libsrc4/libnetcdf.la 
+@USE_NETCDF4_TRUE@am__append_52 = ../libsrc4/libnetcdf.la
 @USE_HDF4_TRUE@@USE_NETCDF4_TRUE@am__append_53 = -lmfhdf -ldf -ljpeg
-@USE_NETCDF4_TRUE@am__append_54 = -lhdf5_hl -lhdf5 -lz 
+@USE_NETCDF4_TRUE@am__append_54 = -lhdf5_hl -lhdf5 -lz
 @USE_NETCDF4_TRUE@@USE_PNETCDF_TRUE@am__append_55 = -lpnetcdf
 
 # Find header file in libsrc directory.
 @BUILD_C_TRUE@@USE_NETCDF4_FALSE@am__append_56 = -I$(top_srcdir)/libsrc -I$(top_srcdir)/fortran
-@BUILD_C_TRUE@@USE_NETCDF4_FALSE@am__append_57 = -I$(top_srcdir)/libsrc -I$(top_srcdir)/fortran 
+@BUILD_C_TRUE@@USE_NETCDF4_FALSE@am__append_57 = -I$(top_srcdir)/libsrc -I$(top_srcdir)/fortran
 
 # Include the C library in the link.
 @BUILD_C_TRUE@@USE_NETCDF4_FALSE@am__append_58 = ../libsrc/libnetcdf.la
@@ -241,7 +241,7 @@
 f90tst_fill_OBJECTS = $(am_f90tst_fill_OBJECTS)
 f90tst_fill_LDADD = $(LDADD)
 @BUILD_SEPARATE_FORTRAN_TRUE@am__DEPENDENCIES_1 =  \
-@BUILD_SEPARATE_FORTRAN_TRUE@	../fortran/libnetcdff.la
+@BUILD_SEPARATE_FORTRAN_TRUE@	../fortran/libnetcdff-g95.la
 am__DEPENDENCIES_2 =
 f90tst_fill_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__append_47) \
 	$(am__DEPENDENCIES_2) $(am__append_52) $(am__DEPENDENCIES_2) \
@@ -785,7 +785,7 @@
 @BUILD_F90_TRUE@@USE_NETCDF4_TRUE@f90tst_fill2_SOURCES = f90tst_fill2.f90
 @BUILD_F90_TRUE@@USE_NETCDF4_TRUE@f90tst_vars3_SOURCES = f90tst_vars3.f90
 @BUILD_F90_TRUE@@USE_NETCDF4_TRUE@@USE_SZIP_TRUE@f90tst_vars2_SOURCES = f90tst_vars2.f90
-@BUILD_F90_TRUE@@BUILD_V2_TRUE@@USE_NETCDF4_TRUE@ftst_v2_SOURCES = ftst_v2.F 
+@BUILD_F90_TRUE@@BUILD_V2_TRUE@@USE_NETCDF4_TRUE@ftst_v2_SOURCES = ftst_v2.F
 @BUILD_F90_TRUE@@LARGE_FILE_TESTS_TRUE@@USE_NETCDF4_TRUE@tst_flarge_SOURCES = tst_flarge.f90
 @BUILD_BENCHMARKS_TRUE@@BUILD_F90_TRUE@@USE_NETCDF4_TRUE@tst_io_SOURCES = tst_io.f90
 #f90tst_parallel_fill
@@ -793,7 +793,7 @@
 @BUILD_F90_TRUE@@TEST_PARALLEL_TRUE@@USE_NETCDF4_TRUE@f90tst_parallel2_SOURCES = f90tst_parallel2.f90
 @BUILD_F90_TRUE@@TEST_PARALLEL_TRUE@@USE_NETCDF4_TRUE@f90tst_parallel3_SOURCES = f90tst_parallel3.f90
 @TEST_F77_TRUE@@TEST_PARALLEL_TRUE@@USE_NETCDF4_TRUE@ftst_parallel_SOURCES = ftst_parallel.F
-@BUILD_C_TRUE@@BUILD_UTILITIES_TRUE@@BUILD_V2_TRUE@ftest_SOURCES = ftest.F fortlib.c 
+@BUILD_C_TRUE@@BUILD_UTILITIES_TRUE@@BUILD_V2_TRUE@ftest_SOURCES = ftest.F fortlib.c
 @BUILD_F90_TRUE@tst_f90_SOURCES = tst_f90.f90
 
 # test_get.F and test_put.f need to be distributed, so that the user
@@ -844,97 +844,97 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-f90tst_fill$(EXEEXT): $(f90tst_fill_OBJECTS) $(f90tst_fill_DEPENDENCIES) 
+f90tst_fill$(EXEEXT): $(f90tst_fill_OBJECTS) $(f90tst_fill_DEPENDENCIES)
 	@rm -f f90tst_fill$(EXEEXT)
 	$(FCLINK) $(f90tst_fill_OBJECTS) $(f90tst_fill_LDADD) $(LIBS)
-f90tst_fill2$(EXEEXT): $(f90tst_fill2_OBJECTS) $(f90tst_fill2_DEPENDENCIES) 
+f90tst_fill2$(EXEEXT): $(f90tst_fill2_OBJECTS) $(f90tst_fill2_DEPENDENCIES)
 	@rm -f f90tst_fill2$(EXEEXT)
 	$(FCLINK) $(f90tst_fill2_OBJECTS) $(f90tst_fill2_LDADD) $(LIBS)
-f90tst_grps$(EXEEXT): $(f90tst_grps_OBJECTS) $(f90tst_grps_DEPENDENCIES) 
+f90tst_grps$(EXEEXT): $(f90tst_grps_OBJECTS) $(f90tst_grps_DEPENDENCIES)
 	@rm -f f90tst_grps$(EXEEXT)
 	$(FCLINK) $(f90tst_grps_OBJECTS) $(f90tst_grps_LDADD) $(LIBS)
-f90tst_parallel$(EXEEXT): $(f90tst_parallel_OBJECTS) $(f90tst_parallel_DEPENDENCIES) 
+f90tst_parallel$(EXEEXT): $(f90tst_parallel_OBJECTS) $(f90tst_parallel_DEPENDENCIES)
 	@rm -f f90tst_parallel$(EXEEXT)
 	$(FCLINK) $(f90tst_parallel_OBJECTS) $(f90tst_parallel_LDADD) $(LIBS)
-f90tst_parallel2$(EXEEXT): $(f90tst_parallel2_OBJECTS) $(f90tst_parallel2_DEPENDENCIES) 
+f90tst_parallel2$(EXEEXT): $(f90tst_parallel2_OBJECTS) $(f90tst_parallel2_DEPENDENCIES)
 	@rm -f f90tst_parallel2$(EXEEXT)
 	$(FCLINK) $(f90tst_parallel2_OBJECTS) $(f90tst_parallel2_LDADD) $(LIBS)
-f90tst_parallel3$(EXEEXT): $(f90tst_parallel3_OBJECTS) $(f90tst_parallel3_DEPENDENCIES) 
+f90tst_parallel3$(EXEEXT): $(f90tst_parallel3_OBJECTS) $(f90tst_parallel3_DEPENDENCIES)
 	@rm -f f90tst_parallel3$(EXEEXT)
 	$(FCLINK) $(f90tst_parallel3_OBJECTS) $(f90tst_parallel3_LDADD) $(LIBS)
-f90tst_vars$(EXEEXT): $(f90tst_vars_OBJECTS) $(f90tst_vars_DEPENDENCIES) 
+f90tst_vars$(EXEEXT): $(f90tst_vars_OBJECTS) $(f90tst_vars_DEPENDENCIES)
 	@rm -f f90tst_vars$(EXEEXT)
 	$(FCLINK) $(f90tst_vars_OBJECTS) $(f90tst_vars_LDADD) $(LIBS)
-f90tst_vars2$(EXEEXT): $(f90tst_vars2_OBJECTS) $(f90tst_vars2_DEPENDENCIES) 
+f90tst_vars2$(EXEEXT): $(f90tst_vars2_OBJECTS) $(f90tst_vars2_DEPENDENCIES)
 	@rm -f f90tst_vars2$(EXEEXT)
 	$(FCLINK) $(f90tst_vars2_OBJECTS) $(f90tst_vars2_LDADD) $(LIBS)
-f90tst_vars3$(EXEEXT): $(f90tst_vars3_OBJECTS) $(f90tst_vars3_DEPENDENCIES) 
+f90tst_vars3$(EXEEXT): $(f90tst_vars3_OBJECTS) $(f90tst_vars3_DEPENDENCIES)
 	@rm -f f90tst_vars3$(EXEEXT)
 	$(FCLINK) $(f90tst_vars3_OBJECTS) $(f90tst_vars3_LDADD) $(LIBS)
-f90tst_vars_vlen$(EXEEXT): $(f90tst_vars_vlen_OBJECTS) $(f90tst_vars_vlen_DEPENDENCIES) 
+f90tst_vars_vlen$(EXEEXT): $(f90tst_vars_vlen_OBJECTS) $(f90tst_vars_vlen_DEPENDENCIES)
 	@rm -f f90tst_vars_vlen$(EXEEXT)
 	$(FCLINK) $(f90tst_vars_vlen_OBJECTS) $(f90tst_vars_vlen_LDADD) $(LIBS)
-ftest$(EXEEXT): $(ftest_OBJECTS) $(ftest_DEPENDENCIES) 
+ftest$(EXEEXT): $(ftest_OBJECTS) $(ftest_DEPENDENCIES)
 	@rm -f ftest$(EXEEXT)
 	$(F77LINK) $(ftest_OBJECTS) $(ftest_LDADD) $(LIBS)
-ftst_groups$(EXEEXT): $(ftst_groups_OBJECTS) $(ftst_groups_DEPENDENCIES) 
+ftst_groups$(EXEEXT): $(ftst_groups_OBJECTS) $(ftst_groups_DEPENDENCIES)
 	@rm -f ftst_groups$(EXEEXT)
 	$(F77LINK) $(ftst_groups_OBJECTS) $(ftst_groups_LDADD) $(LIBS)
-ftst_parallel$(EXEEXT): $(ftst_parallel_OBJECTS) $(ftst_parallel_DEPENDENCIES) 
+ftst_parallel$(EXEEXT): $(ftst_parallel_OBJECTS) $(ftst_parallel_DEPENDENCIES)
 	@rm -f ftst_parallel$(EXEEXT)
 	$(F77LINK) $(ftst_parallel_OBJECTS) $(ftst_parallel_LDADD) $(LIBS)
-ftst_types$(EXEEXT): $(ftst_types_OBJECTS) $(ftst_types_DEPENDENCIES) 
+ftst_types$(EXEEXT): $(ftst_types_OBJECTS) $(ftst_types_DEPENDENCIES)
 	@rm -f ftst_types$(EXEEXT)
 	$(F77LINK) $(ftst_types_OBJECTS) $(ftst_types_LDADD) $(LIBS)
-ftst_types2$(EXEEXT): $(ftst_types2_OBJECTS) $(ftst_types2_DEPENDENCIES) 
+ftst_types2$(EXEEXT): $(ftst_types2_OBJECTS) $(ftst_types2_DEPENDENCIES)
 	@rm -f ftst_types2$(EXEEXT)
 	$(F77LINK) $(ftst_types2_OBJECTS) $(ftst_types2_LDADD) $(LIBS)
-ftst_types3$(EXEEXT): $(ftst_types3_OBJECTS) $(ftst_types3_DEPENDENCIES) 
+ftst_types3$(EXEEXT): $(ftst_types3_OBJECTS) $(ftst_types3_DEPENDENCIES)
 	@rm -f ftst_types3$(EXEEXT)
 	$(F77LINK) $(ftst_types3_OBJECTS) $(ftst_types3_LDADD) $(LIBS)
-ftst_v2$(EXEEXT): $(ftst_v2_OBJECTS) $(ftst_v2_DEPENDENCIES) 
+ftst_v2$(EXEEXT): $(ftst_v2_OBJECTS) $(ftst_v2_DEPENDENCIES)
 	@rm -f ftst_v2$(EXEEXT)
 	$(F77LINK) $(ftst_v2_OBJECTS) $(ftst_v2_LDADD) $(LIBS)
-ftst_vars$(EXEEXT): $(ftst_vars_OBJECTS) $(ftst_vars_DEPENDENCIES) 
+ftst_vars$(EXEEXT): $(ftst_vars_OBJECTS) $(ftst_vars_DEPENDENCIES)
 	@rm -f ftst_vars$(EXEEXT)
 	$(F77LINK) $(ftst_vars_OBJECTS) $(ftst_vars_LDADD) $(LIBS)
-ftst_vars2$(EXEEXT): $(ftst_vars2_OBJECTS) $(ftst_vars2_DEPENDENCIES) 
+ftst_vars2$(EXEEXT): $(ftst_vars2_OBJECTS) $(ftst_vars2_DEPENDENCIES)
 	@rm -f ftst_vars2$(EXEEXT)
 	$(F77LINK) $(ftst_vars2_OBJECTS) $(ftst_vars2_LDADD) $(LIBS)
-ftst_vars3$(EXEEXT): $(ftst_vars3_OBJECTS) $(ftst_vars3_DEPENDENCIES) 
+ftst_vars3$(EXEEXT): $(ftst_vars3_OBJECTS) $(ftst_vars3_DEPENDENCIES)
 	@rm -f ftst_vars3$(EXEEXT)
 	$(F77LINK) $(ftst_vars3_OBJECTS) $(ftst_vars3_LDADD) $(LIBS)
-ftst_vars4$(EXEEXT): $(ftst_vars4_OBJECTS) $(ftst_vars4_DEPENDENCIES) 
+ftst_vars4$(EXEEXT): $(ftst_vars4_OBJECTS) $(ftst_vars4_DEPENDENCIES)
 	@rm -f ftst_vars4$(EXEEXT)
 	$(F77LINK) $(ftst_vars4_OBJECTS) $(ftst_vars4_LDADD) $(LIBS)
-ftst_vars5$(EXEEXT): $(ftst_vars5_OBJECTS) $(ftst_vars5_DEPENDENCIES) 
+ftst_vars5$(EXEEXT): $(ftst_vars5_OBJECTS) $(ftst_vars5_DEPENDENCIES)
 	@rm -f ftst_vars5$(EXEEXT)
 	$(F77LINK) $(ftst_vars5_OBJECTS) $(ftst_vars5_LDADD) $(LIBS)
-ftst_vars6$(EXEEXT): $(ftst_vars6_OBJECTS) $(ftst_vars6_DEPENDENCIES) 
+ftst_vars6$(EXEEXT): $(ftst_vars6_OBJECTS) $(ftst_vars6_DEPENDENCIES)
 	@rm -f ftst_vars6$(EXEEXT)
 	$(F77LINK) $(ftst_vars6_OBJECTS) $(ftst_vars6_LDADD) $(LIBS)
-nf_test$(EXEEXT): $(nf_test_OBJECTS) $(nf_test_DEPENDENCIES) 
+nf_test$(EXEEXT): $(nf_test_OBJECTS) $(nf_test_DEPENDENCIES)
 	@rm -f nf_test$(EXEEXT)
 	$(F77LINK) $(nf_test_OBJECTS) $(nf_test_LDADD) $(LIBS)
-tst_f77_v2$(EXEEXT): $(tst_f77_v2_OBJECTS) $(tst_f77_v2_DEPENDENCIES) 
+tst_f77_v2$(EXEEXT): $(tst_f77_v2_OBJECTS) $(tst_f77_v2_DEPENDENCIES)
 	@rm -f tst_f77_v2$(EXEEXT)
 	$(F77LINK) $(tst_f77_v2_OBJECTS) $(tst_f77_v2_LDADD) $(LIBS)
-tst_f90$(EXEEXT): $(tst_f90_OBJECTS) $(tst_f90_DEPENDENCIES) 
+tst_f90$(EXEEXT): $(tst_f90_OBJECTS) $(tst_f90_DEPENDENCIES)
 	@rm -f tst_f90$(EXEEXT)
 	$(FCLINK) $(tst_f90_OBJECTS) $(tst_f90_LDADD) $(LIBS)
-tst_f90_nc4$(EXEEXT): $(tst_f90_nc4_OBJECTS) $(tst_f90_nc4_DEPENDENCIES) 
+tst_f90_nc4$(EXEEXT): $(tst_f90_nc4_OBJECTS) $(tst_f90_nc4_DEPENDENCIES)
 	@rm -f tst_f90_nc4$(EXEEXT)
 	$(FCLINK) $(tst_f90_nc4_OBJECTS) $(tst_f90_nc4_LDADD) $(LIBS)
-tst_flarge$(EXEEXT): $(tst_flarge_OBJECTS) $(tst_flarge_DEPENDENCIES) 
+tst_flarge$(EXEEXT): $(tst_flarge_OBJECTS) $(tst_flarge_DEPENDENCIES)
 	@rm -f tst_flarge$(EXEEXT)
 	$(FCLINK) $(tst_flarge_OBJECTS) $(tst_flarge_LDADD) $(LIBS)
-tst_io$(EXEEXT): $(tst_io_OBJECTS) $(tst_io_DEPENDENCIES) 
+tst_io$(EXEEXT): $(tst_io_OBJECTS) $(tst_io_DEPENDENCIES)
 	@rm -f tst_io$(EXEEXT)
 	$(FCLINK) $(tst_io_OBJECTS) $(tst_io_LDADD) $(LIBS)
-tst_types$(EXEEXT): $(tst_types_OBJECTS) $(tst_types_DEPENDENCIES) 
+tst_types$(EXEEXT): $(tst_types_OBJECTS) $(tst_types_DEPENDENCIES)
 	@rm -f tst_types$(EXEEXT)
 	$(FCLINK) $(tst_types_OBJECTS) $(tst_types_LDADD) $(LIBS)
-tst_types2$(EXEEXT): $(tst_types2_OBJECTS) $(tst_types2_DEPENDENCIES) 
+tst_types2$(EXEEXT): $(tst_types2_OBJECTS) $(tst_types2_DEPENDENCIES)
 	@rm -f tst_types2$(EXEEXT)
 	$(FCLINK) $(tst_types2_OBJECTS) $(tst_types2_LDADD) $(LIBS)
 
