Merge pull request ESMCI#1430 from NCAR/ejh_genf90_2

Finish generating some F90 codes with genf90.pl

configure.ac

@@ -210,11 +210,6 @@ if test "x$enable_timing" = xyes; then
 fi
 AM_CONDITIONAL([HAVE_PAPI], [test "x$have_papi" = xyes])
 
-AC_CONFIG_FILES(src/flib/piodarray.F90:src/flib/piodarray.F90.in2)
-#AC_CONFIG_FILES(src/flib/pionfatt_mod.F90:src/flib/pionfatt_mod.F90.in2)
-AC_CONFIG_FILES(src/flib/pionfget_mod.F90:src/flib/pionfget_mod.F90.in2)
-AC_CONFIG_FILES(src/flib/pionfput_mod.F90:src/flib/pionfput_mod.F90.in2)
-
 AC_CONFIG_FILES([tests/general/pio_tutil.F90:tests/general/util/pio_tutil.F90])
 
 AC_CONFIG_LINKS([tests/unit/input.nl:tests/unit/input.nl])

src/flib/Makefile.am

@@ -40,23 +40,30 @@ libpio_la_SOURCES = pio.F90
 
 # These F90 files are generated from .F90.in files, using the script
 # genf90.pl.
-pionfatt_mod.F90: ${top_srcdir}/src/flib/pionfatt_mod.F90.in
+piodarray.F90: piodarray.F90.in
+	${top_srcdir}/scripts/genf90.pl $< > $@
+pionfatt_mod.F90: pionfatt_mod.F90.in
+	${top_srcdir}/scripts/genf90.pl $< > $@
+pionfget_mod.F90: pionfget_mod.F90.in
+	${top_srcdir}/scripts/genf90.pl $< > $@
+pionfput_mod.F90: pionfput_mod.F90.in
 	${top_srcdir}/scripts/genf90.pl $< > $@
 
 # Each mod file depends on the .o file.
 pio_kinds.mod: pio_kinds.$(OBJEXT)
 pio_types.mod: pio_types.$(OBJEXT)
 pio_support.mod: pio_support.$(OBJEXT)
 pio_nf.mod: pio_nf.$(OBJEXT)
-piodarray.mod: piodarray.$(OBJEXT)
+piodarray.mod: piodarray.F90 piodarray.$(OBJEXT)
 pionfatt_mod.mod: pionfatt_mod.F90 pionfatt_mod.$(OBJEXT)
-pionfget_mod.mod: pionfget_mod.$(OBJEXT)
-pionfput_mod.mod: pionfput_mod.$(OBJEXT)
+pionfget_mod.mod: pionfget_mod.F90 pionfget_mod.$(OBJEXT)
+pionfput_mod.mod: pionfput_mod.F90 pionfput_mod.$(OBJEXT)
 piolib_mod.mod: piolib_mod.$(OBJEXT)
 pio.mod: pio.$(OBJEXT)
 
 # Some mod files depend on other mod files.
-pio.$(OBJEXT): pio_kinds.mod piolib_mod.mod pio_types.mod piodarray.mod pio_nf.mod pionfatt_mod.mod pionfget_mod.mod pionfput_mod.mod pio_support.mod
+pio.$(OBJEXT): pio_kinds.mod piolib_mod.mod pio_types.mod piodarray.mod \
+pio_nf.mod pionfatt_mod.mod pionfget_mod.mod pionfput_mod.mod pio_support.mod
 
 # Mod files are built and then installed as headers.
 MODFILES = pio_kinds.mod pio_types.mod pio_support.mod pio_nf.mod	\
@@ -65,7 +72,8 @@ piolib_mod.mod pio.mod
 BUILT_SOURCES = $(MODFILES)
 include_HEADERS = $(MODFILES)
 
-CLEANFILES = *.mod
+CLEANFILES = *.mod piodarray.F90 pionfatt_mod.F90 pionfget_mod.F90	\
+pionfput_mod.F90
 
 EXTRA_DIST = CMakeLists.txt piodarray.F90.in pionfatt_mod.F90.in	\
 pionfget_mod.F90.in pionfput_mod.F90.in