* Ensure to follow standard filename conventions for output MCA DSO

filenames -- don't include the project name ("opal")
 * Don't link maffinity/hwloc and paffinity/hwloc against the common
   hwloc in the static build case (because this will result in
   duplicate symbols)

This commit was SVN r24447.

opal/mca/common/hwloc/Makefile.am

@@ -38,8 +38,8 @@ sources = common_hwloc.c
 
 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
-comp_inst = libmca_opal_common_hwloc.la
-comp_noinst = libmca_opal_common_hwloc_noinst.la
+comp_inst = libmca_common_hwloc.la
+comp_noinst = libmca_common_hwloc_noinst.la
 
 if MCA_BUILD_opal_common_hwloc_DSO
 lib_LTLIBRARIES += $(comp_inst)
@@ -47,15 +47,15 @@ else
 noinst_LTLIBRARIES += $(comp_noinst)
 endif
 
-libmca_opal_common_hwloc_la_SOURCES = $(headers) $(sources)
-libmca_opal_common_hwloc_la_LDFLAGS = \
+libmca_common_hwloc_la_SOURCES = $(headers) $(sources)
+libmca_common_hwloc_la_LDFLAGS = \
     -version-info $(libmca_opal_common_hwloc_so_version) \
     $(opal_common_hwloc_LDFLAGS)
-libmca_opal_common_hwloc_la_LIBADD = $(opal_common_hwloc_LIBS)
+libmca_common_hwloc_la_LIBADD = $(opal_common_hwloc_LIBS)
 
-libmca_opal_common_hwloc_noinst_la_SOURCES = $(headers) $(sources)
-libmca_opal_common_hwloc_noinst_la_LDFLAGS = $(opal_common_hwloc_LDFLAGS)
-libmca_opal_common_hwloc_noinst_la_LIBADD = $(opal_common_hwloc_LIBS)
+libmca_common_hwloc_noinst_la_SOURCES = $(headers) $(sources)
+libmca_common_hwloc_noinst_la_LDFLAGS = $(opal_common_hwloc_LDFLAGS)
+libmca_common_hwloc_noinst_la_LIBADD = $(opal_common_hwloc_LIBS)
 
 # Conditionally install the header files
 

opal/mca/maffinity/hwloc/Makefile.am

@@ -48,11 +48,8 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_maffinity_hwloc_la_SOURCES = $(sources)
 mca_maffinity_hwloc_la_LDFLAGS = -module -avoid-version
 mca_maffinity_hwloc_la_LIBADD = \
-    $(top_builddir)/opal/mca/common/hwloc/libmca_opal_common_hwloc.la
+    $(top_builddir)/opal/mca/common/hwloc/libmca_common_hwloc.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_maffinity_hwloc_la_SOURCES =$(sources)
 libmca_maffinity_hwloc_la_LDFLAGS = -module -avoid-version
-libmca_maffinity_hwloc_la_LIBADD = \
-    $(top_builddir)/opal/mca/common/hwloc/libmca_opal_common_hwloc.la
-

opal/mca/paffinity/hwloc/Makefile.am

@@ -46,11 +46,8 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_paffinity_hwloc_la_SOURCES = $(sources)
 mca_paffinity_hwloc_la_LDFLAGS = -module -avoid-version
 mca_paffinity_hwloc_la_LIBADD = \
-    $(top_builddir)/opal/mca/common/hwloc/libmca_opal_common_hwloc.la
+    $(top_builddir)/opal/mca/common/hwloc/libmca_common_hwloc.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_paffinity_hwloc_la_SOURCES =$(sources)
 libmca_paffinity_hwloc_la_LDFLAGS = -module -avoid-version
-libmca_paffinity_hwloc_la_LIBADD = \
-    $(top_builddir)/opal/mca/common/hwloc/libmca_opal_common_hwloc.la
-