Finish support for --enable-single-lib (where you get a single libmpi

installed instead of liblam and libmpi).

This commit was SVN r123.

config/lam_configure_options.m4

@@ -90,7 +90,7 @@ if test "$enable_single_lib" != "yes"; then
     AC_MSG_RESULT([no])
     WANT_SINGLE_MPI_LIBRARY=0
 else
-    AC_MSG_RESULT([no])
+    AC_MSG_RESULT([yes])
     WANT_SINGLE_MPI_LIBRARY=1
 fi
 AM_CONDITIONAL(WANT_SINGLE_MPI_LIBRARY, test "$WANT_SINGLE_MPI_LIBRARY" = 1)

configure.ac

@@ -158,11 +158,12 @@ if test "$WANT_MPI_PROFILING" = "1"; then
 else
     LAM_PROFILING_COMPILE_SEPARATELY=0
 fi
-AM_CONDITIONAL(COMPILE_PROFILING_SEPARATELY, test "$LAM_PROFILING_COMPILE_SEPARATELY" = 1)
+AM_CONDITIONAL(COMPILE_PROFILING_SEPARATELY, 
+    test "$LAM_PROFILING_COMPILE_SEPARATELY" = 1)
 AC_DEFINE_UNQUOTED(LAM_WANT_MPI_PROFILING, $WANT_MPI_PROFILING,
-   [Whether we want MPI profiling or not])
+    [Whether we want MPI profiling or not])
 AC_DEFINE_UNQUOTED(LAM_HAVE_WEAK_SYMBOLS, $LAM_C_HAVE_WEAK_SYMBOLS,
-   [Wehther we have weak symbols or not])
+    [Wehther we have weak symbols or not])
 
 
 ##################################

src/Makefile.am

@@ -6,3 +6,21 @@
 include $(top_srcdir)/config/Makefile.options
 
 SUBDIRS		= include lam mpi tools
+
+# If the --enable-single-library flag was given to configure, then the
+# user wants to merge liblam and libmpi into a single big, honkin'
+# libmpi.  So the libmpi in this directory should be a convenience
+# (noinst) library.  Otherwise, it should be installed into lib.
+
+if WANT_SINGLE_MPI_LIBRARY
+install_lib		= libmpi.la
+else
+install_lib		=
+endif
+
+lib_LTLIBRARIES		= $(install_lib)
+
+libmpi_la_SOURCES	=
+libmpi_la_LIBADD	= \
+			lam/liblam_convenience.la \
+			mpi/libmpi_convenience.la

src/lam/Makefile.am

@@ -33,13 +33,41 @@ include $(top_srcdir)/config/Makefile.options
 
 SUBDIRS	= ctnetwork lfc mem os threads util
 
-lib_LTLIBRARIES = liblam.la
+# If the --enable-single-library flag was given to configure, then the
+# user wants to merge liblam and libmpi into a single big, honkin'
+# libmpi.  So the libmpi in this directory should be a convenience
+# (noinst) library.  Otherwise, it should be installed into lib.
 
-liblam_la_SOURCES =
-liblam_la_LIBADD = \
-	ctnetwork/libctnetwork.la \
-	lfc/liblfc.la \
-	mem/libmem.la \
-	threads/libthreads.la \
-	util/libutil.la 
+# List the input convenience libraries here
+
+sources 		= \
+			ctnetwork/libctnetwork.la \
+			lfc/liblfc.la \
+			mem/libmem.la \
+			threads/libthreads.la \
+			util/libutil.la 
+
+# List the names of the output libraries here
+
+convenience_lib_name	= liblam_convenience.la
+install_lib_name	= liblam.la
+
+# Setup for deciding which library form we'll build
+
+if WANT_SINGLE_MPI_LIBRARY
+install_lib		=
+convenience_lib		= $(convenience_lib_name)
+else
+install_lib		= $(install_lib_name)
+convenience_lib		=
+endif
+
+lib_LTLIBRARIES		= $(install_lib)
+noinst_LTLIBRARIES	= $(convenience_lib)
+
+liblam_la_SOURCES	=
+liblam_la_LIBADD	= $(sources)
+
+liblam_convenience_la_SOURCES =
+liblam_convenience_la_LIBADD = $(sources)
 

src/mpi/Makefile.am

@@ -35,14 +35,19 @@ DIST_SUBDIRS	= c cxx f77 f90
 
 if WANT_SINGLE_MPI_LIBRARY
 install_lib		=
-convenince_lib		= libmpi.la
+convenience_lib		= libmpi_convenience.la
 else
 install_lib		= libmpi.la
-convenince_lib		=
+convenience_lib		=
 endif
 
 lib_LTLIBRARIES		= $(install_lib)
 noinst_LTLIBRARIES	= $(convenience_lib)
 
+sources			= c/libmpi_c.la $(f77_lib) $(f90_lib)
+
 libmpi_la_SOURCES	=
-libmpi_la_LIBADD	= c/libmpi_c.la $(f77_lib) $(f90_lib)
+libmpi_la_LIBADD	= $(sources)
+
+libmpi_convenience_la_SOURCES =
+libmpi_convenience_la_LIBADD = $(sources)

src/mpi/interface/Makefile.am

@@ -35,14 +35,19 @@ DIST_SUBDIRS	= c cxx f77 f90
 
 if WANT_SINGLE_MPI_LIBRARY
 install_lib		=
-convenince_lib		= libmpi.la
+convenience_lib		= libmpi_convenience.la
 else
 install_lib		= libmpi.la
-convenince_lib		=
+convenience_lib		=
 endif
 
 lib_LTLIBRARIES		= $(install_lib)
 noinst_LTLIBRARIES	= $(convenience_lib)
 
+sources			= c/libmpi_c.la $(f77_lib) $(f90_lib)
+
 libmpi_la_SOURCES	=
-libmpi_la_LIBADD	= c/libmpi_c.la $(f77_lib) $(f90_lib)
+libmpi_la_LIBADD	= $(sources)
+
+libmpi_convenience_la_SOURCES =
+libmpi_convenience_la_LIBADD = $(sources)