This commit converts us to the "one big libmpi" scheme that has been

discussed extensively.  See
https://svn.open-mpi.org/trac/ompi/ticket/2092 and the RFC thread
http://www.open-mpi.org/community/lists/devel/2010/02/7447.php.

Specifically:

 * Create LT convenience libraries for OPAL and ORTE if the layer
   above them is being created (use the already-defined
   AM_CONDITIONALs to know if the project above us is being built).
 * ORTE slurps in the LT convenience library for OPAL; OMPI slurps in
   the LT convenience library for ORTE.
 * Wrapper compilers now only -l one library (e.g., ortecc only does
   -lopen-ret, and mpicc only does -lmpi).

This commit was SVN r22691.

ompi/Makefile.am

@@ -112,7 +112,7 @@ libmpi_la_LIBADD = \
 	$(MCA_ompi_FRAMEWORK_LIBS) \
 	$(EXT_ompi_FRAMEWORK_LIBS) \
 	$(OMPI_LIBMPI_EXTRA_LIBS) \
-	$(top_ompi_builddir)/orte/libopen-rte.la
+	$(top_ompi_builddir)/orte/libopen-rte-lt.la
 libmpi_la_DEPENDENCIES = \
 	datatype/libdatatype.la \
 	debuggers/libdebuggers.la \
@@ -122,7 +122,7 @@ libmpi_la_DEPENDENCIES = \
 	$(f77_base_lib) \
 	$(MCA_ompi_FRAMEWORK_LIBS) \
 	$(EXT_ompi_FRAMEWORK_LIBS) \
-	$(top_ompi_builddir)/orte/libopen-rte.la
+	$(top_ompi_builddir)/orte/libopen-rte-lt.la
 libmpi_la_LDFLAGS = \
         -version-info $(libmpi_so_version) \
 	$(OMPI_LIBMPI_EXTRA_LDFLAGS)

ompi/tools/wrappers/mpic++-wrapper-data.txt.in

@@ -16,7 +16,7 @@ extra_includes=@OMPI_WRAPPER_EXTRA_INCLUDES@
 preprocessor_flags=@OMPI_WRAPPER_EXTRA_CPPFLAGS@
 compiler_flags=@OMPI_WRAPPER_EXTRA_CXXFLAGS@
 linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
-libs=@OMPI_WRAPPER_CXX_LIB@ -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
+libs=@OMPI_WRAPPER_CXX_LIB@ -lmpi @OMPI_WRAPPER_EXTRA_LIBS@
 required_file=@OMPI_WRAPPER_CXX_REQUIRED_FILE@
 includedir=${includedir}
 libdir=${libdir}

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

@@ -16,7 +16,7 @@ extra_includes=@OMPI_WRAPPER_EXTRA_INCLUDES@
 preprocessor_flags=@OMPI_WRAPPER_EXTRA_CPPFLAGS@
 compiler_flags=@OMPI_WRAPPER_EXTRA_CFLAGS@
 linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
-libs=-lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
+libs=-lmpi @OMPI_WRAPPER_EXTRA_LIBS@
 required_file=
 includedir=${includedir}
 libdir=${libdir}

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

@@ -16,7 +16,7 @@ extra_includes=
 preprocessor_flags=
 compiler_flags=@OMPI_WRAPPER_EXTRA_FFLAGS@
 linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
-libs=-lmpi_f77 -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
+libs=-lmpi_f77 -lmpi @OMPI_WRAPPER_EXTRA_LIBS@
 required_file=@OMPI_WRAPPER_F77_REQUIRED_FILE@
 includedir=${includedir}
 libdir=${libdir}

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

@@ -17,7 +17,7 @@ extra_includes=
 preprocessor_flags=
 compiler_flags=@OMPI_WRAPPER_EXTRA_FCFLAGS@ 
 linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
-libs=-lmpi_f90 -lmpi_f77 -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
+libs=-lmpi_f90 -lmpi_f77 -lmpi @OMPI_WRAPPER_EXTRA_LIBS@
 required_file=@OMPI_WRAPPER_F90_REQUIRED_FILE@
 includedir=${includedir}
 libdir=${libdir}

opal/Makefile.am

@@ -89,3 +89,17 @@ include mca/Makefile.am
 include win32/Makefile.am
 include tools/Makefile.am
 include dss/Makefile.am
+
+# Set the convenience library to be the same as the non-convenience
+# library, but a) it's marked as "noinst", so LT knows it's a
+# convenience library, and b) no .so version number is assigned here.
+# Note that we only need to make the convenience library if the ORTE
+# project is being built (i.e., if there is an upper layer that needs
+# to slurp in OPAL as a convenience library).
+
+if PROJECT_ORTE
+noinst_LTLIBRARIES += libopen-pal-lt.la
+endif
+libopen_pal_lt_la_SOURCES = $(libopen_pal_la_SOURCES)
+libopen_pal_lt_la_LIBADD = $(libopen_pal_la_LIBADD)
+libopen_pal_lt_la_DEPENDENCIES = $(libopen_pal_la_DEPENDENCIES)

orte/Makefile.am

@@ -37,7 +37,7 @@ lib_LTLIBRARIES = libopen-rte.la
 libopen_rte_la_SOURCES =
 libopen_rte_la_LIBADD = \
 	$(MCA_orte_FRAMEWORK_LIBS) \
-	$(top_ompi_builddir)/opal/libopen-pal.la
+	$(top_ompi_builddir)/opal/libopen-pal-lt.la
 libopen_rte_la_DEPENDENCIES = $(libopen_rte_la_LIBADD)
 libopen_rte_la_LDFLAGS = -version-info $(libopen_rte_so_version)
 
@@ -66,3 +66,17 @@ include tools/Makefile.am
 include orted/Makefile.am
 include test/mpi/Makefile.include
 include test/system/Makefile.include
+
+# Set the convenience library to be the same as the non-convenience
+# library, but a) it's marked as "noinst", so LT knows it's a
+# convenience library, and b) no .so version number is assigned here.
+# Note that we only need to make the convenience library if the OMPI
+# project is being built (i.e., if there is an upper layer that needs
+# to slurp in ORTE as a convenience library).
+
+if PROJECT_ORTE
+noinst_LTLIBRARIES += libopen-rte-lt.la
+endif
+libopen_rte_lt_la_SOURCES = $(libopen_rte_la_SOURCES)
+libopen_rte_lt_la_LIBADD = $(libopen_rte_la_LIBADD)
+libopen_rte_lt_la_DEPENDENCIES = $(libopen_rte_la_DEPENDENCIES)

orte/tools/wrappers/ortec++-wrapper-data.txt.in

@@ -16,7 +16,7 @@ extra_includes=@ORTE_WRAPPER_EXTRA_INCLUDES@
 preprocessor_flags=@ORTE_WRAPPER_EXTRA_CPPFLAGS@
 compiler_flags=@ORTE_WRAPPER_EXTRA_CXXFLAGS@
 linker_flags=@ORTE_WRAPPER_EXTRA_LDFLAGS@
-libs=-lopen-rte -lopen-pal @ORTE_WRAPPER_EXTRA_LIBS@
+libs=-lopen-rte @ORTE_WRAPPER_EXTRA_LIBS@
 required_file=
 includedir=${includedir}
 libdir=${libdir}

orte/tools/wrappers/ortecc-wrapper-data.txt.in

@@ -16,7 +16,7 @@ extra_includes=@ORTE_WRAPPER_EXTRA_INCLUDES@
 preprocessor_flags=@ORTE_WRAPPER_EXTRA_CPPFLAGS@
 compiler_flags=@ORTE_WRAPPER_EXTRA_CFLAGS@
 linker_flags=@ORTE_WRAPPER_EXTRA_LDFLAGS@
-libs=-lopen-rte -lopen-pal @ORTE_WRAPPER_EXTRA_LIBS@
+libs=-lopen-rte @ORTE_WRAPPER_EXTRA_LIBS@
 required_file=
 includedir=${includedir}
 libdir=${libdir}