Change build process slightly:

- always build src/libmpi.la (may contain all of liblam)
- sometimes build src/liblam.la
- ensure libwhatever is build before traversing src/tools

This commit was SVN r487.

config/lam_configure_options.m4

@@ -166,8 +166,8 @@ AC_ARG_ENABLE(single-lib,
 if test "$enable_single_lib" != "yes"; then
     AC_MSG_RESULT([no])
     WANT_SINGLE_MPI_LIBRARY=0
-    LIBLAM_LA='$(top_builddir)/src/lam/liblam.la'
-    LIBMPI_LA='$(top_builddir)/src/mpi/libmpi.la'" $LIBLAM_LA"
+    LIBLAM_LA='$(top_builddir)/src/liblam.la'
+    LIBMPI_LA='$(top_builddir)/src/libmpi.la'" $LIBLAM_LA"
 else
     AC_MSG_RESULT([yes])
     WANT_SINGLE_MPI_LIBRARY=1

src/.cvsignore

@@ -1,2 +1,4 @@
 Makefile
 Makefile.in
+.libs
+*.la

src/Makefile.am

@@ -5,22 +5,30 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS		= include lam mpi mca tools
+SUBDIRS = include lam mpi mca . 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.
 
+lam_sources = lam/liblam_convenience.la mca/libmca_lam.la
+mpi_sources = mpi/libmpi_convenience.la mca/libmca_mpi.la
+
 if WANT_SINGLE_MPI_LIBRARY
-install_lib		= libmpi.la
+install_libs = libmpi.la
+libmpi_sources = $(mpi_sources) $(lam_sources)
+liblam_sources =
 else
-install_lib		=
+install_libs = libmpi.la liblam.la
+libmpi_sources = $(mpi_sources)
+liblam_sources = $(lam_sources)
 endif
 
-lib_LTLIBRARIES		= $(install_lib)
+lib_LTLIBRARIES = $(install_libs)
 
-libmpi_la_SOURCES	=
-libmpi_la_LIBADD	= \
-			lam/liblam_convenience.la \
-			mpi/libmpi_convenience.la
+libmpi_la_SOURCES =
+libmpi_la_LIBADD = $(libmpi_sources)
+
+liblam_la_SOURCES =
+liblam_la_LIBADD = $(liblam_sources)

src/lam/Makefile.am

@@ -7,6 +7,8 @@ include $(top_srcdir)/config/Makefile.options
 
 SUBDIRS	= ctnetwork lfc mem os runtime threads util
 
+noinst_LTLIBRARIES = liblam_convenience.la
+
 headers = \
         atomic.h \
         constants.h \
@@ -15,11 +17,6 @@ headers = \
         totalview.h \
         types.h
 
-# 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.
-
 # List the input convenience libraries here
 
 sources = \
@@ -29,6 +26,9 @@ sources = \
         threads/libthreads.la \
         util/libutil.la 
 
+liblam_convenience_la_SOURCES =
+liblam_convenience_la_LIBADD = $(sources)
+
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
@@ -37,28 +37,3 @@ lam_HEADERS = $(headers)
 else
 lamdir = $(includedir)
 endif
-
-# 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

@@ -7,29 +7,12 @@ include $(top_srcdir)/config/Makefile.options
 
 SUBDIRS = communicator datatype interface runtime
 
-# 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 =
-convenience_lib = libmpi_convenience.la
-else
-install_lib = libmpi.la
-convenience_lib =
-endif
-
-lib_LTLIBRARIES = $(install_lib)
-noinst_LTLIBRARIES = $(convenience_lib)
+noinst_LTLIBRARIES = libmpi_convenience.la
 
 sources = \
         datatype/libmpi_datatype.la \
         interface/libmpi_interface.la \
         runtime/libmpi_runtime.la
 
-libmpi_la_SOURCES =
-libmpi_la_LIBADD = $(sources)
-
 libmpi_convenience_la_SOURCES =
 libmpi_convenience_la_LIBADD = $(sources)