configury: clean up .so version numbers

Move .so version numbers to their appropriate project in the top-level
VERSION file.  Also add the project name to all .so version number
names.  Remove no-longer-used .so names.

VERSION

@@ -98,14 +98,13 @@ liboshmem_so_version=0:0:0
 # components-don't-affect-the-build-system abstraction.
 
 # OMPI layer
-libmca_common_cuda_so_version=0:0:0
-libmca_common_ofacm_so_version=0:0:0
-libmca_common_sm_so_version=0:0:0
-libmca_common_ugni_so_version=0:0:0
-libmca_common_verbs_so_version=0:0:0
-
-# OPAL layer
-libmca_opal_common_libfabric_so_version=0:0:0
 
 # ORTE layer
-libmca_common_alps_so_version=0:0:0
+libmca_orte_common_alps_so_version=0:0:0
+
+# OPAL layer
+libmca_opal_common_cuda_so_version=0:0:0
+libmca_opal_common_libfabric_so_version=0:0:0
+libmca_opal_common_sm_so_version=0:0:0
+libmca_opal_common_ugni_so_version=0:0:0
+libmca_opal_common_verbs_so_version=0:0:0

configure.ac

@@ -144,12 +144,11 @@ AC_SUBST(libopen_pal_so_version)
 # and/or opal_mca.m4, but I don't have the cycles to do this
 # right now.
 AC_SUBST(libmca_opal_common_libfabric_so_version)
-AC_SUBST(libmca_common_cuda_so_version)
-AC_SUBST(libmca_common_ofacm_so_version)
-AC_SUBST(libmca_common_sm_so_version)
-AC_SUBST(libmca_common_ugni_so_version)
-AC_SUBST(libmca_common_verbs_so_version)
-AC_SUBST(libmca_common_alps_so_version)
+AC_SUBST(libmca_opal_common_cuda_so_version)
+AC_SUBST(libmca_opal_common_sm_so_version)
+AC_SUBST(libmca_opal_common_ugni_so_version)
+AC_SUBST(libmca_opal_common_verbs_so_version)
+AC_SUBST(libmca_orte_common_alps_so_version)
 
 #
 # Get the versions of the autotools that were used to bootstrap us

opal/mca/common/cuda/Makefile.am

@@ -10,7 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2011-2013 NVIDIA Corporation.  All rights reserved.
-# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2014-2015 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -82,7 +82,7 @@ endif
 
 lib@OPAL_LIB_PREFIX@mca_common_cuda_la_SOURCES = $(headers) $(sources)
 lib@OPAL_LIB_PREFIX@mca_common_cuda_la_LDFLAGS = \
-        -version-info $(libmca_common_cuda_so_version)
+        -version-info $(libmca_opal_common_cuda_so_version)
 lib@OPAL_LIB_PREFIX@mca_common_cuda_la_LIBADD = $(common_cuda_LIBS)
 
 lib@OPAL_LIB_PREFIX@mca_common_cuda_noinst_la_SOURCES = $(headers) $(sources)

opal/mca/common/sm/Makefile.am

@@ -9,7 +9,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2010-2013 Los Alamos National Security, LLC.
 #                         All rights reserved.
 # $COPYRIGHT$
@@ -84,7 +84,7 @@ endif
 lib@OPAL_LIB_PREFIX@mca_common_sm_la_SOURCES = \
         $(headers) $(sources)
 lib@OPAL_LIB_PREFIX@mca_common_sm_la_LDFLAGS = \
-        -version-info $(libmca_common_sm_so_version)
+        -version-info $(libmca_opal_common_sm_so_version)
 lib@OPAL_LIB_PREFIX@mca_common_sm_noinst_la_SOURCES = \
         $(headers) $(sources)
 

opal/mca/common/ugni/Makefile.am

@@ -35,7 +35,7 @@ lib@OPAL_LIB_PREFIX@mca_common_ugni_la_SOURCES = $(headers) $(ugni_SOURCES)
 nodist_lib@OPAL_LIB_PREFIX@mca_common_ugni_la_SOURCES = $(ugni_nodist_SOURCES)
 lib@OPAL_LIB_PREFIX@mca_common_ugni_la_LIBADD = $(common_ugni_LIBS)
 lib@OPAL_LIB_PREFIX@mca_common_ugni_la_LDFLAGS = \
-        -version-info $(libmca_common_ugni_so_version) \
+        -version-info $(libmca_opal_common_ugni_so_version) \
         $(common_ugni_LDFLAGS)
 
 lib@OPAL_LIB_PREFIX@mca_common_ugni_noinst_la_SOURCES = \

opal/mca/common/verbs/Makefile.am

@@ -49,7 +49,7 @@ endif
 lib@OPAL_LIB_PREFIX@mca_common_verbs_la_SOURCES = $(headers) $(sources)
 lib@OPAL_LIB_PREFIX@mca_common_verbs_la_CPPFLAGS = $(common_verbs_CPPFLAGS)
 lib@OPAL_LIB_PREFIX@mca_common_verbs_la_LDFLAGS =  \
-        -version-info $(libmca_common_verbs_so_version) \
+        -version-info $(libmca_opal_common_verbs_so_version) \
         $(common_verbs_LDFLAGS)
 lib@OPAL_LIB_PREFIX@mca_common_verbs_la_LIBADD = $(common_verbs_LIBS)
 lib@OPAL_LIB_PREFIX@mca_common_verbs_noinst_la_SOURCES = $(headers) $(sources)

orte/mca/common/alps/Makefile.am

@@ -1,7 +1,7 @@
 #
 # Copyright (c) 2009-2012 Mellanox Technologies.  All rights reserved.
 # Copyright (c) 2009-2012 Oak Ridge National Laboratory.  All rights reserved.
-# Copyright (c) 2012-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012-2015 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -32,7 +32,7 @@ endif
 lib@ORTE_LIB_PREFIX@mca_common_alps_la_SOURCES = $(headers) $(sources)
 lib@ORTE_LIB_PREFIX@mca_common_alps_la_CPPFLAGS = $(common_alps_CPPFLAGS)
 lib@ORTE_LIB_PREFIX@mca_common_alps_la_LDFLAGS =  \
-        -version-info $(libmca_common_alps_so_version) \
+        -version-info $(libmca_orte_common_alps_so_version) \
         $(common_alps_LDFLAGS)
 lib@ORTE_LIB_PREFIX@mca_common_alps_la_LIBADD = $(common_alps_LIBS)
 lib@ORTE_LIB_PREFIX@mca_common_alps_noinst_la_SOURCES = $(headers) $(sources)