Update Makefile.am's to get common sm component for symbol resolution.

This commit was SVN r6551.

ompi/mca/btl/sm/Makefile.am

@@ -37,11 +37,15 @@ component_noinst = libmca_btl_sm.la
 component_install =
 endif
 
+# See ompi/mca/common/sm/Makefile.am for an explanation of
+# libmca_common_sm.la.
+
 mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)
 mca_btl_sm_la_LDFLAGS = -module -avoid-version
-mca_btl_sm_la_LIBADD = 
+mca_btl_sm_la_LIBADD = \
+        $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)

ompi/mca/mpool/sm/Makefile.am

@@ -35,7 +35,7 @@ component_noinst = libmca_mpool_sm.la
 component_install =
 endif
 
-# See src/mca/ptl/sm/Makefile.am for an explanation of
+# See ompi/mca/common/sm/Makefile.am for an explanation of
 # libmca_common_sm.la.
 
 mcacomponentdir = $(libdir)/openmpi

ompi/mca/ptl/sm/Makefile.am

@@ -36,18 +36,22 @@ sm_SOURCES = src/ptl_sm.c src/ptl_sm.h src/ptl_sm_address.h src/ptl_sm_component
         src/ptl_sm_recvfrag.c src/ptl_sm_send.c src/ptl_sm_sendreq.c \
         src/ptl_sm_sendreq.h src/ptl_sm_sendfrag.c src/ptl_sm_sendfrag.h
 
+# See ompi/mca/common/sm/Makefile.am for an explanation of
+# libmca_common_sm.la.
+
 mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_ptl_sm_la_SOURCES = $(sm_SOURCES)
 mca_ptl_sm_la_DEPENDENCIES = librecompile.la
-mca_ptl_sm_la_LIBADD = librecompile.la
+mca_ptl_sm_la_LIBADD = librecompile.la \
+        $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la
 mca_ptl_sm_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(component_noinst) librecompile.la
 libmca_ptl_sm_la_SOURCES = $(sm_SOURCES)
 libmca_ptl_sm_la_DEPENDENCIES = librecompile.la
-libmca_ptl_sm_la_LIBADD = librecompile.la
 libmca_ptl_sm_la_LDFLAGS = -module -avoid-version
+libmca_ptl_sm_la_LIBADD = librecompile.la
 
 nodist_librecompile_la_SOURCES = src/ptl_sm_send_alternate.c
 librecompile_la_CPPFLAGS = -DSM_COMMON_BASE_ADDR