A first pass at the fortran libs

Author: jjhursey

ompi/mpi/fortran/mpif-h/Makefile.am

@@ -51,22 +51,22 @@ CLEANFILES =
 # Note that we invoke some OPAL functions directly in libmpi_mpifh.la,
 # so we need to link in the OPAL library directly (pulling it in
 # indirectly via libmpi.la does not work on all platforms).
-libmpi_mpifh_la_LIBADD = \
+lib@OMPI_LIBMPI_NAME@_mpifh_la_LIBADD = \
         $(top_builddir)/ompi/lib@[email protected] \
         $(OMPI_MPIEXT_MPIFH_LIBS) \
         $(OMPI_TOP_BUILDDIR)/opal/lib@[email protected]
 
-libmpi_mpifh_la_LDFLAGS = -version-info $(libmpi_mpifh_so_version)
+lib@OMPI_LIBMPI_NAME@_mpifh_la_LDFLAGS = -version-info $(libmpi_mpifh_so_version)
 
 # Are we building the mpif.h bindings at all?
 if OMPI_BUILD_FORTRAN_MPIFH_BINDINGS
 # If yes, then we need to build the installable library and the glue
 # convenience library that will be sucked up into the main libmpi.
-lib_LTLIBRARIES += libmpi_mpifh.la
+lib_LTLIBRARIES += lib@OMPI_LIBMPI_NAME@_mpifh.la
 # Do we need to suck in the convenience library from the lower
 # directory?
 if BUILD_PMPI_FORTRAN_MPIFH_BINDINGS_LAYER
-libmpi_mpifh_la_LIBADD += profile/libmpi_mpifh_pmpi.la
+lib@OMPI_LIBMPI_NAME@_mpifh_la_LIBADD += profile/libmpi_mpifh_pmpi.la
 endif
 endif
 
@@ -78,7 +78,7 @@ headers = \
 #
 # These files are only built and added to libmpi_mpifh.la in certain cases.
 #
-libmpi_mpifh_la_SOURCES =
+lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES =
 
 # sizeof_f.f90 is generated based on some results from configure tests.
 CLEANFILES += sizeof_f.f90
@@ -108,7 +108,7 @@ if BUILD_FORTRAN_SIZEOF
 noinst_LTLIBRARIES += libmpi_mpifh_sizeof.la
 # Do not dist this file; it is generated
 nodist_libmpi_mpifh_sizeof_la_SOURCES = sizeof_f.f90
-libmpi_mpifh_la_LIBADD += libmpi_mpifh_sizeof.la
+lib@OMPI_LIBMPI_NAME@_mpifh_la_LIBADD += libmpi_mpifh_sizeof.la
 endif
 
 sizeof_pl = $(top_srcdir)/ompi/mpi/fortran/base/gen-mpi-sizeof.pl
@@ -124,7 +124,7 @@ sizeof_f.f90:
 	    --complex32=$(OMPI_HAVE_FORTRAN_COMPLEX32)
 
 if BUILD_MPI_FORTRAN_MPIFH_BINDINGS_LAYER
-libmpi_mpifh_la_SOURCES += \
+lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
         abort_f.c \
         add_error_class_f.c \
         add_error_code_f.c \
@@ -432,7 +432,7 @@ libmpi_mpifh_la_SOURCES += \
         win_flush_local_all_f.c
 
 if OMPI_PROVIDE_MPI_FILE_INTERFACE
-libmpi_mpifh_la_SOURCES += \
+lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
         file_call_errhandler_f.c \
         file_close_f.c \
         file_create_errhandler_f.c \

ompi/mpi/fortran/use-mpi-f08-desc/Makefile.am

@@ -18,7 +18,7 @@ if OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS
 AM_FCFLAGS = -I$(top_builddir)/ompi/include -I$(top_srcdir)/ompi/include \
              -I$(top_srcdir) $(FCFLAGS)
 
-lib_LTLIBRARIES = libmpi_usempif08.la
+lib_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@_usempif08.la
 
 #
 # This list is a subset of the full MPI API used for testing Fortran
@@ -35,7 +35,7 @@ mpi_api_files = \
         type_contiguous_f08.f90 \
         type_vector_f08.f90
 
-libmpi_usempif08_la_SOURCES = \
+lib@OMPI_LIBMPI_NAME@_usempif08_la_SOURCES = \
         $(mpi_api_files) \
         mpi-f08-types.f90 \
         mpi-f08-interfaces.F90 \

ompi/mpi/fortran/use-mpi-f08/Makefile.am

@@ -34,7 +34,7 @@ MOSTLYCLEANFILES = *.mod
 
 CLEANFILES += *.i90
 
-lib_LTLIBRARIES = libmpi_usempif08.la
+lib_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@_usempif08.la
 
 module_sentinel_file = \
         libforce_usempif08_internal_modules_to_be_built.la
@@ -794,7 +794,7 @@ pmpi_api_files += \
         profile/pregister_datarep_f08.F90
 endif
 
-libmpi_usempif08_la_SOURCES = \
+lib@OMPI_LIBMPI_NAME@_usempif08_la_SOURCES = \
         $(mpi_api_files) \
         $(pmpi_api_files) \
         mpi-f-interfaces-bind.h \
@@ -805,11 +805,11 @@ libmpi_usempif08_la_SOURCES = \
         constants.c
 
 # These are generated; do not ship them
-nodist_libmpi_usempif08_la_SOURCES =
+nodist_lib@OMPI_LIBMPI_NAME@_usempif08_la_SOURCES =
 
 if BUILD_FORTRAN_SIZEOF
 SIZEOF_H = sizeof_f08.h
-nodist_libmpi_usempif08_la_SOURCES += \
+nodist_lib@OMPI_LIBMPI_NAME@_usempif08_la_SOURCES += \
         sizeof_f08.h \
         sizeof_f08.f90 \
         profile/psizeof_f08.f90
@@ -819,13 +819,13 @@ endif
 # Include the mpi_f08-based MPI extensions in libmpi_usempif08, too.
 #
 
-libmpi_usempif08_la_LIBADD = \
+lib@OMPI_LIBMPI_NAME@_usempif08_la_LIBADD = \
         $(module_sentinel_file) \
         $(OMPI_MPIEXT_USEMPIF08_LIBS) \
-        $(top_builddir)/ompi/mpi/fortran/mpif-h/libmpi_mpifh.la \
+        $(top_builddir)/ompi/mpi/fortran/mpif-h/lib@OMPI_LIBMPI_NAME@_mpifh.la \
         $(top_builddir)/ompi/lib@[email protected]
-libmpi_usempif08_la_DEPENDENCIES = $(module_sentinel_file)
-libmpi_usempif08_la_LDFLAGS = -version-info $(libmpi_usempif08_so_version)
+lib@OMPI_LIBMPI_NAME@_usempif08_la_DEPENDENCIES = $(module_sentinel_file)
+lib@OMPI_LIBMPI_NAME@_usempif08_la_LDFLAGS = -version-info $(libmpi_usempif08_so_version)
 
 #
 # Automake doesn't do Fortran dependency analysis, so must list them

ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am

@@ -22,7 +22,7 @@ AM_CPPFLAGS = -DOMPI_PROFILE_LAYER=0 -DOMPI_COMPILING_FORTRAN_WRAPPERS=1
 AM_FCFLAGS = -I$(top_builddir)/ompi/include -I$(top_srcdir)/ompi/include \
              -I$(top_builddir) -I$(top_srcdir) $(FCFLAGS_f90)
 
-lib_LTLIBRARIES = libmpi_usempi_ignore_tkr.la
+lib_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr.la
 
 mpi-ignore-tkr-interfaces.h: mpi-ignore-tkr-interfaces.h.in
 mpi-ignore-tkr-file-interfaces.h: mpi-ignore-tkr-file-interfaces.h.in
@@ -35,15 +35,15 @@ mpi-ignore-tkr.lo: mpi-ignore-tkr-sizeof.h
 mpi-ignore-tkr.lo: mpi-ignore-tkr-sizeof.f90
 mpi-ignore-tkr.lo: mpi-ignore-tkr.F90
 
-libmpi_usempi_ignore_tkr_la_SOURCES = \
+lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_SOURCES = \
         mpi-ignore-tkr.F90
-nodist_libmpi_usempi_ignore_tkr_la_SOURCES = \
+nodist_lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_SOURCES = \
         mpi-ignore-tkr-interfaces.h \
         mpi-ignore-tkr-file-interfaces.h
 
 if BUILD_FORTRAN_SIZEOF
 # These files are generated; do not distribute them
-nodist_libmpi_usempi_ignore_tkr_la_SOURCES += \
+nodist_lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_SOURCES += \
         mpi-ignore-tkr-sizeof.h \
         mpi-ignore-tkr-sizeof.f90
 endif
@@ -52,9 +52,9 @@ endif
 # libmpi_usempi_ignore_tkr.la, so we need to link in the OPAL library
 # directly (pulling it in indirectly via libmpi.la does not work on
 # all platforms).
-libmpi_usempi_ignore_tkr_la_LIBADD = \
+lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_LIBADD = \
         $(OMPI_TOP_BUILDDIR)/opal/lib@[email protected]
-libmpi_usempi_ignore_tkr_la_LDFLAGS = \
+lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_LDFLAGS = \
         -version-info $(libmpi_usempi_ignore_tkr_so_version) \
         $(OMPI_FORTRAN_EXTRA_SHARED_LIBRARY_FLAGS)
 

ompi/mpi/fortran/use-mpi-tkr/Makefile.am

@@ -49,7 +49,7 @@ lib_LTLIBRARIES =
 
 # Add the f90 library to the list of libraries to build
 
-lib_LTLIBRARIES += libmpi_usempi.la
+lib_LTLIBRARIES += lib@OMPI_LIBMPI_NAME@_usempi.la
 
 # Automake doesn't know how to do F90 dependency analysis, so manually
 # list this here (i.e., "mpi-f90-interfaces.h" is included in
@@ -65,7 +65,7 @@ mpi.lo: mpi-f90-cptr-interfaces.F90
 # buffer dummy argument.  We therefore really only need to build a
 # handful of subroutines.
 
-libmpi_usempi_la_SOURCES = \
+lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES = \
      mpi.F90 \
      mpi_aint_add_f90.f90 \
      mpi_aint_diff_f90.f90 \
@@ -79,9 +79,9 @@ libmpi_usempi_la_SOURCES = \
 
 # Don't distribute mpi-tkr-sizeof-*; they're generated.
 
-nodist_libmpi_usempi_la_SOURCES =
+nodist_lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES =
 if BUILD_FORTRAN_SIZEOF
-nodist_libmpi_usempi_la_SOURCES += \
+nodist_lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES += \
      mpi-tkr-sizeof.h \
      mpi-tkr-sizeof.f90
 endif
@@ -90,11 +90,11 @@ endif
 # libmpi_usempi.la, so we need to link in the OPAL library directly
 # (pulling it in indirectly via libmpi.la does not work on all
 # platforms).
-libmpi_usempi_la_LIBADD = \
-        $(top_builddir)/ompi/mpi/fortran/mpif-h/libmpi_mpifh.la \
+lib@OMPI_LIBMPI_NAME@_usempi_la_LIBADD = \
+        $(top_builddir)/ompi/mpi/fortran/mpif-h/lib@OMPI_LIBMPI_NAME@_mpifh.la \
         $(OMPI_TOP_BUILDDIR)/opal/lib@[email protected]
 # Set the library version
-libmpi_usempi_la_LDFLAGS = \
+lib@OMPI_LIBMPI_NAME@_usempi_la_LDFLAGS = \
         -version-info $(libmpi_usempi_tkr_so_version) \
         $(OMPI_FORTRAN_EXTRA_SHARED_LIBRARY_FLAGS)
 
@@ -131,7 +131,7 @@ mpi-tkr-sizeof.f90:
 
 CLEANFILES += mpi-tkr-sizeof.h mpi-tkr-sizeof.f90
 MOSTLYCLEANFILES = *.mod
-DISTCLEANFILES = $(nodist_libmpi_usempi_la_SOURCES)
+DISTCLEANFILES = $(nodist_lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES)
 
 #
 # Install the generated .mod files.  Unfortunately, each F90 compiler