Install Fortran 77 bindings as a stand-alone library, rather than as part of

libmpi.

Refs trac:248

This commit was SVN r11563.

The following Trac tickets were found above:
  Ticket 248 --> https://svn.open-mpi.org/trac/ompi/ticket/248

ompi/Makefile.am

@@ -34,21 +34,9 @@ endif
 # See if we have f77 MPI bindings
 
 if OMPI_WANT_F77_BINDINGS
-f77_base_lib = mpi/f77/libmpi_f77.la
-if WANT_MPI_F77_BINDINGS_LAYER
-f77_mpi_lib = mpi/f77/libmpi_f77_mpi.la
-else
-f77_mpi_lib = 
-endif
-if WANT_PMPI_F77_BINDINGS_LAYER
-f77_pmpi_lib = mpi/f77/profile/libmpi_f77_pmpi.la
-else
-f77_pmpi_lib = 
-endif
+f77_base_lib = mpi/f77/libmpi_f77_base.la
 else
 f77_base_lib =
-f77_mpi_lib =
-f77_pmpi_lib =
 endif
 
 SUBDIRS = \
@@ -82,8 +70,6 @@ libmpi_la_LIBADD = \
 	$(c_mpi_lib) \
 	$(c_pmpi_lib) \
         $(f77_base_lib) \
-	$(f77_mpi_lib) \
-	$(f77_pmpi_lib) \
 	$(MCA_ompi_FRAMEWORK_LIBS) \
 	$(top_ompi_builddir)/orte/liborte.la
 libmpi_la_DEPENDENCIES = $(libmpi_la_LIBADD)

ompi/mpi/f77/Makefile.am

@@ -37,15 +37,22 @@ AM_CPPFLAGS = -DOMPI_PROFILE_LAYER=0 -DOMPI_COMPILING_F77_WRAPPERS=1
 # 2. When profiling is enabled but weak symbol support is absent.
 #
 
-noinst_LTLIBRARIES =
 if WANT_MPI_F77_BINDINGS_LAYER
-noinst_LTLIBRARIES += libmpi_f77_mpi.la
+lib_LTLIBRARIES = libmpi_f77.la
 else
-noinst_LTLIBRARIES +=
+lib_LTLIBRARIES =
 endif
 
+if WANT_PMPI_F77_BINDINGS_LAYER
+libmpi_f77_la_LIBADD = profile/libmpi_f77_pmpi.la
+else
+libmpi_f77_la_LIBADD =
+endif
+
+
+noinst_LTLIBRARIES =
 if OMPI_WANT_F77_BINDINGS
-noinst_LTLIBRARIES += libmpi_f77.la
+noinst_LTLIBRARIES += libmpi_f77_base.la
 else
 noinst_LTLIBRARIES +=
 endif
@@ -61,8 +68,7 @@ headers = \
 # libmpi_f77.la is always build because it contains some non-profilied
 # functions.
 #
-
-libmpi_f77_la_SOURCES   = \
+libmpi_f77_base_la_SOURCES   = \
         attr_fn_f.c \
         f90_accessors.c \
         strings.c \
@@ -71,8 +77,10 @@ libmpi_f77_la_SOURCES   = \
 #
 # These files are only built and added to libmpi_f77.la in certain cases.
 #
+libmpi_f77_la_SOURCES =
 
-libmpi_f77_mpi_la_SOURCES = \
+if WANT_MPI_F77_BINDINGS_LAYER
+libmpi_f77_la_SOURCES += \
         abort_f.c \
         add_error_class_f.c \
         add_error_code_f.c \
@@ -358,6 +366,7 @@ libmpi_f77_mpi_la_SOURCES = \
         win_test_f.c \
         win_unlock_f.c \
         win_wait_f.c
+endif
 
 #
 # Conditionally install the header files

ompi/tools/wrappers/mpif77-wrapper-data.txt.in

@@ -9,5 +9,5 @@ extra_includes=
 preprocessor_flags=
 compiler_flags=@OMPI_WRAPPER_EXTRA_FFLAGS@
 linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
-libs=-lmpi -lorte -lopal @OMPI_WRAPPER_EXTRA_LIBS@
+libs=-lmpi_f77 -lmpi -lorte -lopal @OMPI_WRAPPER_EXTRA_LIBS@
 required_file=@OMPI_WRAPPER_F77_REQUIRED_FILE@

ompi/tools/wrappers/mpif90-wrapper-data.txt.in

@@ -10,5 +10,5 @@ extra_includes=
 preprocessor_flags=
 compiler_flags=@OMPI_WRAPPER_EXTRA_FFLAGS@ 
 linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
-libs=-lmpi_f90 -lmpi -lorte -lopal @OMPI_WRAPPER_EXTRA_LIBS@
+libs=-lmpi_f90 -lmpi_f77 -lmpi -lorte -lopal @OMPI_WRAPPER_EXTRA_LIBS@
 required_file=@OMPI_WRAPPER_F90_REQUIRED_FILE@