Fixes for:

- make dist
- proper inclusion of files between trivial and small
- vpath

This commit was SVN r9964.

ompi/mpi/f90/Makefile.am

@@ -50,7 +50,7 @@
 
 SUBDIRS = scripts
 
-AM_FCFLAGS = -I$(top_builddir)/ompi/include $(OMPI_FC_MODULE_FLAG).
+AM_FCFLAGS = -I$(top_builddir)/ompi/include $(OMPI_FC_MODULE_FLAG). -I$(srcdir)
 
 # Override the default f90 rules because we have to insert
 # $(FCFLAGS_f90) right before the source filename.  This is necessary
@@ -151,10 +151,18 @@ endif
 # distributed.  This file is always in the library, regardless of the
 # size that we're building.
 
-libmpi_f90_a_SOURCES = mpi.f90
+libmpi_f90_a_SOURCES = \
+     attr_fn-f90-interfaces.h \
+     mpi.f90
 
 # These files are all generated by scripts in the scripts/ directory.
 
+trivial_sources = \
+     mpi_sizeof.f90 
+
+small_sources = \
+     mpi_comm_spawn_multiple_f90.f90
+
 medium_sources = \
      mpi_address_f90.f90 \
      mpi_accumulate_f90.f90 \
@@ -235,12 +243,15 @@ large_sources = \
 # The rest of the files that are in the library depend on which size
 # we're building.
 
-nodist_libmpi_f90_a_SOURCES = mpi_sizeof.f90 mpi_comm_spawn_multiple_f90.f90
+nodist_libmpi_f90_a_SOURCES = $(trivial_sources)
+if OMPI_WANT_BUILD_F90_SMALL
+nodist_libmpi_f90_a_SOURCES += $(small_sources)
+endif
 if OMPI_WANT_BUILD_F90_MEDIUM
-nodist_libmpi_f90_a_SOURCES += $(medium_sources)
+nodist_libmpi_f90_a_SOURCES += $(small_sources) $(medium_sources)
 endif
 if OMPI_WANT_BUILD_F90_LARGE
-nodist_libmpi_f90_a_SOURCES += $(medium_sources) $(large_sources)
+nodist_libmpi_f90_a_SOURCES += $(small_sources) $(medium_sources) $(large_sources)
 endif
 
 #