configury: new OPAL_SET_LIB_PREFIX/ORTE_SET_LIB_PREFIX macros

These two macros set the prefix for the OPAL and ORTE libraries, respectively. Specifically, the OPAL library will be named libPREFIXopen-pal.la and the ORTE library will be named libPREFIXopen-rte.la. These macros must be called, even if the prefix argument is empty. The intent is that Open MPI will call these macros with an empty prefix, but other projects (such as ORCM) will call these macros with a non-empty prefix. For example, ORCM libraries can be named liborcm-open-pal.la and liborcm-open-rte.la. This scheme is necessary to allow running Open MPI applications under systems that use their own versions of ORTE and OPAL. For example, when running MPI applications under ORTE, if the ORTE and OPAL libraries between OMPI and ORCM are not identical (which, because they are released at different times, are likely to be different), we need to ensure that the OMPI applications link against their ORTE and OPAL libraries, but the ORCM executables link against their ORTE and OPAL libraries.
2014-10-22 05:49:58 -07:00 · 2014-10-22 05:49:58 -07:00 · c22e1ae33b
--- a/config/opal_set_lib_prefix.m4
+++ b/config/opal_set_lib_prefix.m4
@ -0,0 +1,40 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# OPAL_SET_LIB_PREFIX([library_prefix]
+#
+# This macro sets a prefix for the libopen-pal library.  Specifically,
+# libopen-pal.la becomes libPREFIXopen-pal.la.
+#
+# --------------------------------------------------------
+AC_DEFUN([OPAL_SET_LIB_PREFIX],[
+    AS_IF([test "$opal_lib_prefix_set" = "yes"],
+          [AC_MSG_WARN([OPAL lib prefix was already set!])
+           AC_MSG_WARN([This is a configury programming error])
+           AC_MSG_ERROR([Cannot continue])])
+
+    OPAL_LIB_PREFIX=$1
+    opal_lib_prefix_set=yes
+    AC_SUBST(OPAL_LIB_PREFIX)
+])dnl
+
+#
+# Same as OPAL LIB_PREFIX, but for the ORTE layer
+#
+AC_DEFUN([ORTE_SET_LIB_PREFIX],[
+    AS_IF([test "$orte_lib_prefix_set" = "yes"],
+          [AC_MSG_WARN([ORTE lib prefix was already set!])
+           AC_MSG_WARN([This is a configury programming error])
+           AC_MSG_ERROR([Cannot continue])])
+
+    ORTE_LIB_PREFIX=$1
+    orte_lib_prefix_set=yes
+    AC_SUBST(ORTE_LIB_PREFIX)
+])dnl
--- a/configure.ac
+++ b/configure.ac
@ -1407,13 +1407,15 @@ AC_SUBST(opaldatadir)
 AC_SUBST(opallibdir)
 AC_SUBST(opalincludedir)

+OPAL_SET_LIB_PREFIX([])
 m4_ifdef([project_orte],
         [ortedatadir="$opaldatadir"
          AC_SUBST(ortedatadir)
          ortelibdir="$opallibdir"
          AC_SUBST(ortelibdir)
          orteincludedir="$opalincludedir"
-          AC_SUBST(orteincludedir)])
+          AC_SUBST(orteincludedir)
+          ORTE_SET_LIB_PREFIX([])])
 m4_ifdef([project_ompi],
         [ompidatadir="$opaldatadir"
          AC_SUBST(ompidatadir)
--- a/ompi/Makefile.am
+++ b/ompi/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) 2008-2012 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # Copyright (c) 2010-2011 Sandia National Laboratories. All rights reserved.
 # Copyright (c) 2013      Los Alamos National Security, LLC. All rights
@ -145,10 +145,10 @@ libmpi_la_LIBADD = \

 if OMPI_RTE_ORTE
 libmpi_la_LIBADD += \
-        $(OMPI_TOP_BUILDDIR)/orte/libopen-rte.la
+        $(OMPI_TOP_BUILDDIR)/orte/lib@ORTE_LIB_PREFIX@open-rte.la
 endif
 libmpi_la_LIBADD += \
-        $(OMPI_TOP_BUILDDIR)/opal/libopen-pal.la
+        $(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
 libmpi_la_DEPENDENCIES = $(libmpi_la_LIBADD)
 libmpi_la_LDFLAGS = \
       -version-info $(libmpi_so_version) \
--- a/ompi/mca/coll/sm/Makefile.am
+++ b/ompi/mca/coll/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) 2009-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -62,7 +62,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_sm_la_SOURCES = $(sources)
 mca_coll_sm_la_LDFLAGS = -module -avoid-version
 mca_coll_sm_la_LIBADD = \
-        $(OMPI_TOP_BUILDDIR)/opal/mca/common/sm/libmca_common_sm.la
+        $(OMPI_TOP_BUILDDIR)/opal/mca/common/sm/lib@OPAL_LIB_PREFIX@mca_common_sm.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_sm_la_SOURCES =$(sources)
--- a/ompi/mca/pml/ob1/Makefile.am
+++ b/ompi/mca/pml/ob1/Makefile.am
@ -10,7 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2009      Sun Microsystems, Inc.  All rights reserved.
-# Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012      NVIDIA Corporation.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -69,7 +69,7 @@ mca_pml_ob1_la_LDFLAGS = -module -avoid-version

 if OPAL_cuda_support
 mca_pml_ob1_la_LIBADD = \
-    $(OMPI_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
+    $(OMPI_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
 endif

 noinst_LTLIBRARIES = $(component_noinst)
--- a/ompi/mca/rte/orte/Makefile.am
+++ b/ompi/mca/rte/orte/Makefile.am
@ -1,6 +1,7 @@
 #
 # Copyright (c) 2012      Los Alamos National Security, LLC.
 #                         All rights reserved.
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -24,7 +25,7 @@ endif
 noinst_LTLIBRARIES = libmca_rte_orte.la
 libmca_rte_orte_la_SOURCES =$(sources) $(headers)
 libmca_rte_orte_la_LDFLAGS = -module -avoid-version
-libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/libopen-rte.la
+libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la

 man_pages = mpirun.1 mpiexec.1 ompi-ps.1 ompi-clean.1 ompi-top.1 ompi-server.1

--- a/ompi/tools/mpisync/Makefile.am
+++ b/ompi/tools/mpisync/Makefile.am
@ -71,9 +71,9 @@ mpisync_SOURCES = \

 mpisync_LDADD = $(top_builddir)/ompi/libmpi.la
 if OMPI_RTE_ORTE
-mpisync_LDADD +=  $(top_builddir)/orte/libopen-rte.la
+mpisync_LDADD +=  $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la
 endif
-mpisync_LDADD += $(top_builddir)/opal/libopen-pal.la
+mpisync_LDADD += $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 clean-local:
 	test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)
--- a/ompi/tools/ompi_info/Makefile.am
+++ b/ompi/tools/ompi_info/Makefile.am
@ -63,9 +63,9 @@ ompi_info_SOURCES = \

 ompi_info_LDADD = $(top_builddir)/ompi/libmpi.la
 if OMPI_RTE_ORTE
-ompi_info_LDADD +=  $(top_builddir)/orte/libopen-rte.la
+ompi_info_LDADD +=  $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la
 endif
-ompi_info_LDADD += $(top_builddir)/opal/libopen-pal.la
+ompi_info_LDADD += $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 clean-local:
 	test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)
--- a/ompi/tools/wrappers/mpic++-wrapper-data.txt.in
+++ b/ompi/tools/wrappers/mpic++-wrapper-data.txt.in
@ -21,7 +21,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
 # pulled in implicitly) because we intend MPI applications to only use
 # the MPI API.
 libs=@OMPI_WRAPPER_CXX_LIB@ -lmpi
-libs_static=@OMPI_WRAPPER_CXX_LIB@ -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
+libs_static=@OMPI_WRAPPER_CXX_LIB@ -lmpi -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
 dyn_lib_file=libmpi.@OPAL_DYN_LIB_SUFFIX@
 static_lib_file=libmpi.a
 required_file=@OMPI_WRAPPER_CXX_REQUIRED_FILE@
--- a/ompi/tools/wrappers/mpicc-wrapper-data.txt.in
+++ b/ompi/tools/wrappers/mpicc-wrapper-data.txt.in
@ -21,7 +21,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
 # pulled in implicitly) because we intend MPI applications to only use
 # the MPI API.
 libs=-lmpi
-libs_static=-lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
+libs_static=-lmpi -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@
 dyn_lib_file=libmpi.@OPAL_DYN_LIB_SUFFIX@
 static_lib_file=libmpi.a
 required_file=
--- a/ompi/tools/wrappers/mpifort-wrapper-data.txt.in
+++ b/ompi/tools/wrappers/mpifort-wrapper-data.txt.in
@ -20,7 +20,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
 # pulled in implicitly) because we intend MPI applications to only use
 # the MPI API.
 libs=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi
-libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi -lopen-rte -lopen-pal  @OMPI_WRAPPER_EXTRA_LIBS@
+libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal  @OMPI_WRAPPER_EXTRA_LIBS@
 dyn_lib_file=libmpi.@OPAL_DYN_LIB_SUFFIX@
 static_lib_file=libmpi.a
 required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@
--- a/opal/Makefile.am
+++ b/opal/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) 2009-2011 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -46,23 +46,23 @@ DIST_SUBDIRS = \

 # Build the main OPAL library

-lib_LTLIBRARIES = libopen-pal.la
-libopen_pal_la_SOURCES =
-libopen_pal_la_LIBADD = \
+lib_LTLIBRARIES = lib@OPAL_LIB_PREFIX@open-pal.la
+lib@OPAL_LIB_PREFIX@open_pal_la_SOURCES =
+lib@OPAL_LIB_PREFIX@open_pal_la_LIBADD = \
        $(LIBLTDL) \
        asm/libasm.la \
        datatype/libdatatype.la \
        mca/base/libmca_base.la \
        util/libopalutil.la \
 	$(MCA_opal_FRAMEWORK_LIBS)
-libopen_pal_la_DEPENDENCIES = $(libopen_pal_la_LIBADD)
-libopen_pal_la_LDFLAGS = -version-info $(libopen_pal_so_version)
+lib@OPAL_LIB_PREFIX@open_pal_la_DEPENDENCIES = $(lib@OPAL_LIB_PREFIX@open_pal_la_LIBADD)
+lib@OPAL_LIB_PREFIX@open_pal_la_LDFLAGS = -version-info $(libopen_pal_so_version)

 # included subdirectory Makefile.am's and appended-to variables
 headers =
 noinst_LTLIBRARIES =
 dist_opaldata_DATA =
-libopen_pal_la_SOURCES += $(headers)
+lib@OPAL_LIB_PREFIX@open_pal_la_SOURCES += $(headers)

 # Conditionally install the header files

--- a/opal/class/Makefile.am
+++ b/opal/class/Makefile.am
@ -10,6 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -37,7 +38,7 @@ headers += \
        class/opal_rb_tree.h \
        class/ompi_free_list.h

-libopen_pal_la_SOURCES += \
+lib@OPAL_LIB_PREFIX@open_pal_la_SOURCES += \
        class/opal_bitmap.c \
        class/opal_free_list.c \
        class/opal_hash_table.c \
--- a/opal/dss/Makefile.am
+++ b/opal/dss/Makefile.am
@ -11,6 +11,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2012      Los Alamos National Security, Inc.  All rights reserved. 
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@ -25,7 +26,7 @@ headers += \
        dss/dss_types.h \
        dss/dss_internal.h

-libopen_pal_la_SOURCES += \
+lib@OPAL_LIB_PREFIX@open_pal_la_SOURCES += \
        dss/dss_internal_functions.c \
        dss/dss_compare.c \
        dss/dss_copy.c \
--- a/opal/mca/btl/openib/Makefile.am
+++ b/opal/mca/btl/openib/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) 2007-2012 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2007-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
 # Copyright (c) 2011      NVIDIA Corporation.  All rights reserved.
 # Copyright (c) 2011      Mellanox Technologies.  All rights reserved.
@ -118,10 +118,10 @@ mcacomponent_LTLIBRARIES = $(component)
 mca_btl_openib_la_SOURCES = $(component_sources)
 mca_btl_openib_la_LDFLAGS = -module -avoid-version $(btl_openib_LDFLAGS)
 mca_btl_openib_la_LIBADD = $(btl_openib_LIBS) \
-    $(OPAL_TOP_BUILDDIR)/opal/mca/common/verbs/libmca_common_verbs.la
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/verbs/lib@OPAL_LIB_PREFIX@mca_common_verbs.la
 if OPAL_cuda_support
 mca_btl_openib_la_LIBADD += \
-    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
 endif

 noinst_LTLIBRARIES = $(lib)
--- a/opal/mca/btl/sm/Makefile.am
+++ b/opal/mca/btl/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) 2009-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2014      NVIDIA Corporation.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -49,10 +49,10 @@ 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 = \
-    $(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/libmca_common_sm.la
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/lib@OPAL_LIB_PREFIX@mca_common_sm.la
 if OPAL_cuda_support
 mca_btl_sm_la_LIBADD += \
-    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
 endif
 mca_btl_sm_la_CPPFLAGS = $(btl_sm_CPPFLAGS)

--- a/opal/mca/btl/smcuda/Makefile.am
+++ b/opal/mca/btl/smcuda/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) 2009-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012      NVIDIA Corporation.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -49,11 +49,11 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_smcuda_la_SOURCES = $(libmca_btl_smcuda_la_sources)
 mca_btl_smcuda_la_LDFLAGS = -module -avoid-version
 mca_btl_smcuda_la_LIBADD = \
-    $(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/libmca_common_sm.la
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/lib@OPAL_LIB_PREFIX@mca_common_sm.la
 mca_btl_smcuda_la_CPPFLAGS = $(btl_smcuda_CPPFLAGS)
 if OPAL_cuda_support
 mca_btl_smcuda_la_LIBADD += \
-    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
 endif

 noinst_LTLIBRARIES = $(component_noinst)
--- a/opal/mca/btl/tcp/Makefile.am
+++ b/opal/mca/btl/tcp/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) 2009-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2013      NVIDIA Corporation.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -57,7 +57,7 @@ mca_btl_tcp_la_SOURCES = $(component_sources)
 mca_btl_tcp_la_LDFLAGS = -module -avoid-version
 if OPAL_cuda_support
 mca_btl_tcp_la_LIBADD = \
-    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
 endif

 noinst_LTLIBRARIES = $(lib)
--- a/opal/mca/btl/usnic/Makefile.am
+++ b/opal/mca/btl/usnic/Makefile.am
@ -104,7 +104,7 @@ mcacomponent_LTLIBRARIES = $(component)
 mca_btl_usnic_la_SOURCES = $(component_sources)
 mca_btl_usnic_la_LDFLAGS = -module -avoid-version $(btl_usnic_LDFLAGS)
 mca_btl_usnic_la_LIBADD = $(btl_usnic_LIBS) \
-    $(OPAL_TOP_BUILDDIR)/opal/mca/common/verbs/libmca_common_verbs.la
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/verbs/lib@OPAL_LIB_PREFIX@mca_common_verbs.la

 noinst_LTLIBRARIES = $(lib)
 libmca_btl_usnic_la_SOURCES = $(lib_sources)
--- a/opal/mca/btl/usnic/btl_usnic_proc.c
+++ b/opal/mca/btl/usnic/btl_usnic_proc.c
@ -199,7 +199,7 @@ static int create_proc(opal_proc_t *opal_proc,
    /* If this proc simply doesn't have this key, then they're not
       running the usnic BTL -- just ignore them.  Otherwise, show an
       error message. */
-    if (OPAL_ERR_DATA_VALUE_NOT_FOUND == rc) {
+    if (OPAL_ERR_NOT_FOUND == rc) {
        OBJ_RELEASE(proc);
        return OPAL_ERR_UNREACH;
    } else if (OPAL_SUCCESS != rc) {
--- a/opal/mca/common/cuda/Makefile.am
+++ b/opal/mca/common/cuda/Makefile.am
@ -71,8 +71,8 @@ dist_opaldata_DATA = help-mpi-common-cuda.txt

 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
-comp_inst = libmca_common_cuda.la
-comp_noinst = libmca_common_cuda_noinst.la
+comp_inst = lib@OPAL_LIB_PREFIX@mca_common_cuda.la
+comp_noinst = lib@OPAL_LIB_PREFIX@mca_common_cuda_noinst.la

 if MCA_BUILD_opal_common_cuda_DSO
 lib_LTLIBRARIES += $(comp_inst)
@ -80,13 +80,15 @@ else
 noinst_LTLIBRARIES += $(comp_noinst)
 endif

-libmca_common_cuda_la_SOURCES = $(headers) $(sources)
-libmca_common_cuda_la_LDFLAGS = -version-info $(libmca_common_cuda_so_version)
-libmca_common_cuda_la_LIBADD = $(common_cuda_LIBS)
+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)
+lib@OPAL_LIB_PREFIX@mca_common_cuda_la_LIBADD = $(common_cuda_LIBS)

-libmca_common_cuda_noinst_la_SOURCES = $(libmca_common_cuda_la_SOURCES)
-libmca_common_cuda_noinst_la_LDFLAGS = $(common_cuda_LDFLAGS)
-libmca_common_cuda_noinst_la_LIBADD = $(common_cuda_LIBS)
+lib@OPAL_LIB_PREFIX@mca_common_cuda_noinst_la_SOURCES = \
+        $(lib@OPAL_LIB_PREFIX@mca_common_cuda_la_SOURCES)
+lib@OPAL_LIB_PREFIX@mca_common_cuda_noinst_la_LDFLAGS = $(common_cuda_LDFLAGS)
+lib@OPAL_LIB_PREFIX@mca_common_cuda_noinst_la_LIBADD = $(common_cuda_LIBS)

 # Conditionally install the header files

--- a/opal/mca/common/ofacm/Makefile.am
+++ b/opal/mca/common/ofacm/Makefile.am
@ -37,8 +37,8 @@ endif

 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
-comp_inst = libmca_common_ofacm.la
-comp_noinst = libmca_common_ofacm_noinst.la
+comp_inst = lib@OPAL_LIB_PREFIX@mca_common_ofacm.la
+comp_noinst = lib@OPAL_LIB_PREFIX@mca_common_ofacm_noinst.la

 if MCA_BUILD_opal_common_ofacm_DSO
 lib_LTLIBRARIES += $(comp_inst)
@ -46,13 +46,14 @@ else
 noinst_LTLIBRARIES += $(comp_noinst)
 endif

-libmca_common_ofacm_la_SOURCES = $(headers) $(sources)
-libmca_common_ofacm_la_CPPFLAGS = $(common_ofacm_CPPFLAGS)
-libmca_common_ofacm_la_LDFLAGS = \
+lib@OPAL_LIB_PREFIX@mca_common_ofacm_la_SOURCES = $(headers) $(sources)
+lib@OPAL_LIB_PREFIX@mca_common_ofacm_la_CPPFLAGS = $(common_ofacm_CPPFLAGS)
+lib@OPAL_LIB_PREFIX@mca_common_ofacm_la_LDFLAGS = \
        -version-info $(libmca_common_ofacm_so_version) \
        $(common_ofacm_LDFLAGS)
-libmca_common_ofacm_la_LIBADD = $(common_ofacm_LIBS)
-libmca_common_ofacm_noinst_la_SOURCES = $(libmca_common_ofacm_la_SOURCES)
+lib@OPAL_LIB_PREFIX@mca_common_ofacm_la_LIBADD = $(common_ofacm_LIBS)
+lib@OPAL_LIB_PREFIX@mca_common_ofacm_noinst_la_SOURCES = \
+        $(lib@OPAL_LIB_PREFIX@mca_common_ofacm_la_SOURCES)

 # Conditionally install the header files

--- a/opal/mca/common/sm/Makefile.am
+++ b/opal/mca/common/sm/Makefile.am
@ -72,8 +72,8 @@ dist_opaldata_DATA = help-mpi-common-sm.txt

 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
-comp_inst = libmca_common_sm.la
-comp_noinst = libmca_common_sm_noinst.la
+comp_inst = lib@OPAL_LIB_PREFIX@mca_common_sm.la
+comp_noinst = lib@OPAL_LIB_PREFIX@mca_common_sm_noinst.la

 if MCA_BUILD_opal_common_sm_DSO
 lib_LTLIBRARIES += $(comp_inst)
@ -81,9 +81,12 @@ else
 noinst_LTLIBRARIES += $(comp_noinst)
 endif

-libmca_common_sm_la_SOURCES = $(headers) $(sources)
-libmca_common_sm_la_LDFLAGS = -version-info $(libmca_common_sm_so_version)
-libmca_common_sm_noinst_la_SOURCES = $(libmca_common_sm_la_SOURCES)
+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)
+lib@OPAL_LIB_PREFIX@mca_common_sm_noinst_la_SOURCES = \
+        $(lib@OPAL_LIB_PREFIX@mca_common_sm_la_SOURCES)

 # Conditionally install the header files

--- a/opal/mca/common/ugni/Makefile.am
+++ b/opal/mca/common/ugni/Makefile.am
@ -15,8 +15,8 @@

 AM_CPPFLAGS = $(common_ugni_CPPFLAGS)

-component_noinst = libmca_common_ugni_noinst.la
-component_install = libmca_common_ugni.la
+component_noinst = lib@OPAL_LIB_PREFIX@mca_common_ugni_noinst.la
+component_install = lib@OPAL_LIB_PREFIX@mca_common_ugni.la

 if MCA_BUILD_opal_common_ugni_DSO
 mcacomponent_LTLIBRARIES = $(component_install)
@ -31,17 +31,20 @@ ugni_SOURCES = common_ugni.c \
               common_ugni_ep.c

 mcacomponentdir = $(opallibdir)
-libmca_common_ugni_la_SOURCES = $(headers) $(ugni_SOURCES)
-nodist_libmca_common_ugni_la_SOURCES = $(ugni_nodist_SOURCES)
-libmca_common_ugni_la_LIBADD = $(common_ugni_LIBS) 
-libmca_common_ugni_la_LDFLAGS = \
+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) \
        $(common_ugni_LDFLAGS)

-libmca_common_ugni_noinst_la_SOURCES = $(headers) $(ugni_SOURCES)
-nodist_libmca_common_ugni_noinst_la_SOURCES = $(ugni_nodist_SOURCES)
-libmca_common_ugni_noinst_la_LIBADD = $(common_ugni_LIBS)
-libmca_common_ugni_noinst_la_LDFLAGS = -module -avoid-version $(common_ugni_LDFLAGS)
+lib@OPAL_LIB_PREFIX@mca_common_ugni_noinst_la_SOURCES = \
+        $(headers) $(ugni_SOURCES)
+nodist_lib@OPAL_LIB_PREFIX@mca_common_ugni_noinst_la_SOURCES = \
+        $(ugni_nodist_SOURCES)
+lib@OPAL_LIB_PREFIX@mca_common_ugni_noinst_la_LIBADD = $(common_ugni_LIBS)
+lib@OPAL_LIB_PREFIX@mca_common_ugni_noinst_la_LDFLAGS = \
+        -module -avoid-version $(common_ugni_LDFLAGS)

 # These two rules will sym link the "noinst" libtool library filename
 # to the installable libtool library filename in the case where we are
--- a/opal/mca/common/verbs/Makefile.am
+++ b/opal/mca/common/verbs/Makefile.am
@ -37,8 +37,8 @@ dist_opaldata_DATA = \

 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
-comp_inst = libmca_common_verbs.la
-comp_noinst = libmca_common_verbs_noinst.la
+comp_inst = lib@OPAL_LIB_PREFIX@mca_common_verbs.la
+comp_noinst = lib@OPAL_LIB_PREFIX@mca_common_verbs_noinst.la

 if MCA_BUILD_opal_common_verbs_DSO
 lib_LTLIBRARIES += $(comp_inst)
@ -46,14 +46,14 @@ else
 noinst_LTLIBRARIES += $(comp_noinst)
 endif

-libmca_common_verbs_la_SOURCES = $(headers) $(sources)
-# TBD: create own config file 
-libmca_common_verbs_la_CPPFLAGS = $(common_verbs_CPPFLAGS)
-libmca_common_verbs_la_LDFLAGS =  \
+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) \
        $(common_verbs_LDFLAGS)
-libmca_common_verbs_la_LIBADD =   $(common_verbs_LIBS)
-libmca_common_verbs_noinst_la_SOURCES = $(libmca_common_verbs_la_SOURCES)
+lib@OPAL_LIB_PREFIX@mca_common_verbs_la_LIBADD = $(common_verbs_LIBS)
+lib@OPAL_LIB_PREFIX@mca_common_verbs_noinst_la_SOURCES = \
+        $(lib@OPAL_LIB_PREFIX@mca_common_verbs_la_SOURCES)

 # Conditionally install the header files

--- a/opal/mca/mpool/gpusm/Makefile.am
+++ b/opal/mca/mpool/gpusm/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      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012      NVIDIA Corporation.  All rights reserved.
 # $COPYRIGHT$
 #
@ -48,7 +48,7 @@ mca_mpool_gpusm_la_LDFLAGS = -module -avoid-version
 mca_mpool_gpusm_la_LIBADD = $(mpool_gpusm_LIBS)
 if OPAL_cuda_support
 mca_mpool_gpusm_la_LIBADD += \
-    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
 endif

 noinst_LTLIBRARIES = $(component_noinst)
--- a/opal/mca/mpool/grdma/Makefile.am
+++ b/opal/mca/mpool/grdma/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      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012      Los Alamos National Security, LLC. All rights
 #                         reserved.
 # $COPYRIGHT$
@ -49,7 +49,7 @@ mca_mpool_grdma_la_LDFLAGS = -module -avoid-version
 mca_mpool_grdma_la_LIBADD = $(mpool_grdma_LIBS)
 if OPAL_cuda_support
 mca_mpool_grdma_la_LIBADD += \
-    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
 endif

 noinst_LTLIBRARIES = $(component_noinst)
--- a/opal/mca/mpool/rgpusm/Makefile.am
+++ b/opal/mca/mpool/rgpusm/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      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012      NVIDIA Corporation.  All rights reserved.
 # $COPYRIGHT$
 #
@ -48,7 +48,7 @@ mca_mpool_rgpusm_la_LDFLAGS = -module -avoid-version
 mca_mpool_rgpusm_la_LIBADD = $(mpool_rgpusm_LIBS)
 if OPAL_cuda_support
 mca_mpool_rgpusm_la_LIBADD += \
-    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
 endif

 noinst_LTLIBRARIES = $(component_noinst)
--- a/opal/mca/mpool/sm/Makefile.am
+++ b/opal/mca/mpool/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      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2011      NVIDIA Corporation.  All rights reserved.
 # $COPYRIGHT$
 # 
@ -43,10 +43,10 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_mpool_sm_la_SOURCES = $(sources)
 mca_mpool_sm_la_LDFLAGS = -module -avoid-version
 mca_mpool_sm_la_LIBADD = \
-    $(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/libmca_common_sm.la
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/lib@OPAL_LIB_PREFIX@mca_common_sm.la
 if OPAL_cuda_support
 mca_mpool_sm_la_LIBADD += \
-    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la
+    $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
 endif

 noinst_LTLIBRARIES = $(component_noinst)
--- a/opal/memoryhooks/Makefile.am
+++ b/opal/memoryhooks/Makefile.am
@ -9,6 +9,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -23,5 +24,5 @@ headers += \
 	memoryhooks/memory.h \
 	memoryhooks/memory_internal.h

-libopen_pal_la_SOURCES += \
+lib@OPAL_LIB_PREFIX@open_pal_la_SOURCES += \
 	memoryhooks/memory.c
--- a/opal/runtime/Makefile.am
+++ b/opal/runtime/Makefile.am
@ -13,6 +13,7 @@
 # Copyright (c) 2012      Los Alamos National Security, LLC.
 #                         All rights reserved.
 # Copyright (c) 2014      Intel, Inc. All rights reserved
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -37,7 +38,7 @@ headers += \
        runtime/opal_params.h \
        runtime/opal_progress_threads.h

-libopen_pal_la_SOURCES += \
+lib@OPAL_LIB_PREFIX@open_pal_la_SOURCES += \
        runtime/opal_progress.c \
        runtime/opal_finalize.c \
        runtime/opal_init.c \
--- a/opal/threads/Makefile.am
+++ b/opal/threads/Makefile.am
@ -10,6 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -27,7 +28,7 @@ headers += \
        threads/threads.h \
 	threads/tsd.h

-libopen_pal_la_SOURCES += \
+lib@OPAL_LIB_PREFIX@open_pal_la_SOURCES += \
        threads/condition.c \
        threads/mutex.c \
        threads/thread.c \
--- a/opal/tools/opal-checkpoint/Makefile.am
+++ b/opal/tools/opal-checkpoint/Makefile.am
@ -41,7 +41,7 @@ dist_opaldata_DATA = help-opal-checkpoint.txt
 endif # OPAL_INSTALL_BINARIES

 opal_checkpoint_SOURCES = opal-checkpoint.c
-opal_checkpoint_LDADD = $(top_builddir)/opal/libopen-pal.la
+opal_checkpoint_LDADD = $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 endif # WANT_FT_CR

--- a/opal/tools/opal-restart/Makefile.am
+++ b/opal/tools/opal-restart/Makefile.am
@ -41,7 +41,7 @@ dist_opaldata_DATA = help-opal-restart.txt
 endif # OPAL_INSTALL_BINARIES

 opal_restart_SOURCES = opal-restart.c
-opal_restart_LDADD = $(top_builddir)/opal/libopen-pal.la
+opal_restart_LDADD = $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 endif # WANT_FT_CR

--- a/opal/tools/wrappers/Makefile.am
+++ b/opal/tools/wrappers/Makefile.am
@ -60,7 +60,7 @@ endif # OPAL_INSTALL_BINARIES
 endif # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS

 opal_wrapper_SOURCES = opal_wrapper.c
-opal_wrapper_LDADD = $(top_builddir)/opal/libopen-pal.la
+opal_wrapper_LDADD = $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 # Ensure that the man pages are rebuilt if the opal_config.h file
 # changes; a "good enough" way to know if configure was run again (and
--- a/opal/tools/wrappers/opalc++-wrapper-data.txt.in
+++ b/opal/tools/wrappers/opalc++-wrapper-data.txt.in
@ -16,10 +16,10 @@ preprocessor_flags=@OPAL_WRAPPER_EXTRA_CPPFLAGS@
 compiler_flags_prefix=@OPAL_WRAPPER_EXTRA_CXXFLAGS_PREFIX@
 compiler_flags=@OPAL_WRAPPER_EXTRA_CXXFLAGS@
 linker_flags=@OPAL_WRAPPER_EXTRA_LDFLAGS@
-libs=-lopen-pal
-libs_static=-lopen-pal @OPAL_WRAPPER_EXTRA_LIBS@
-dyn_lib_file=libopen-pal.@OPAL_DYN_LIB_SUFFIX@
-static_lib_file=libopen-pal.a
+libs=-l@OPAL_LIB_PREFIX@open-pal
+libs_static=-l@OPAL_LIB_PREFIX@open-pal @OPAL_WRAPPER_EXTRA_LIBS@
+dyn_lib_file=lib@OPAL_LIB_PREFIX@open-pal.@OPAL_DYN_LIB_SUFFIX@
+static_lib_file=lib@OPAL_LIB_PREFIX@open-pal.a
 required_file=
 includedir=${includedir}
 libdir=${libdir}
--- a/opal/tools/wrappers/opalcc-wrapper-data.txt.in
+++ b/opal/tools/wrappers/opalcc-wrapper-data.txt.in
@ -16,10 +16,10 @@ preprocessor_flags=@OPAL_WRAPPER_EXTRA_CPPFLAGS@
 compiler_flags_prefix=@OPAL_WRAPPER_EXTRA_CFLAGS_PREFIX@
 compiler_flags=@OPAL_WRAPPER_EXTRA_CFLAGS@
 linker_flags=@OPAL_WRAPPER_EXTRA_LDFLAGS@
-libs=-lopen-pal
-libs_static=-lopen-pal @OPAL_WRAPPER_EXTRA_LIBS@
-dyn_lib_file=libopen-pal.@OPAL_DYN_LIB_SUFFIX@
-static_lib_file=libopen-pal.a
+libs=-l@OPAL_LIB_PREFIX@open-pal
+libs_static=-l@OPAL_LIB_PREFIX@open-pal @OPAL_WRAPPER_EXTRA_LIBS@
+dyn_lib_file=lib@OPAL_LIB_PREFIX@open-pal.@OPAL_DYN_LIB_SUFFIX@
+static_lib_file=lib@OPAL_LIB_PREFIX@open-pal.a
 required_file=
 includedir=${includedir}
 libdir=${libdir}
--- a/orte/Makefile.am
+++ b/orte/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) 2009-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -33,19 +33,19 @@ DIST_SUBDIRS = \

 # Build the main ORTE library

-lib_LTLIBRARIES = libopen-rte.la
-libopen_rte_la_SOURCES =
-libopen_rte_la_LIBADD = \
+lib_LTLIBRARIES = lib@ORTE_LIB_PREFIX@open-rte.la
+lib@ORTE_LIB_PREFIX@open_rte_la_SOURCES =
+lib@ORTE_LIB_PREFIX@open_rte_la_LIBADD = \
 	$(MCA_orte_FRAMEWORK_LIBS) \
-	$(ORTE_TOP_BUILDDIR)/opal/libopen-pal.la
-libopen_rte_la_DEPENDENCIES = $(libopen_rte_la_LIBADD)
-libopen_rte_la_LDFLAGS = -version-info $(libopen_rte_so_version)
+	$(ORTE_TOP_BUILDDIR)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
+lib@ORTE_LIB_PREFIX@open_rte_la_DEPENDENCIES = $(libopen_rte_la_LIBADD)
+lib@ORTE_LIB_PREFIX@open_rte_la_LDFLAGS = -version-info $(libopen_rte_so_version)

 # included subdirectory Makefile.am's and appended-to variables
 headers =
 noinst_LTLIBRARIES =
 dist_ortedata_DATA =
-libopen_rte_la_SOURCES += $(headers)
+lib@ORTE_LIB_PREFIX@open_rte_la_SOURCES += $(headers)

 # Conditionally install the header files

--- a/orte/orted/Makefile.am
+++ b/orte/orted/Makefile.am
@ -10,6 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -24,7 +25,7 @@ dist_ortedata_DATA += orted/help-orted.txt
 headers += \
 	orted/orted.h

-libopen_rte_la_SOURCES += \
+lib@ORTE_LIB_PREFIX@open_rte_la_SOURCES += \
        orted/orted_main.c \
        orted/orted_comm.c

--- a/orte/orted/pmix/Makefile.am
+++ b/orte/orted/pmix/Makefile.am
@ -1,5 +1,6 @@
 #
 # Copyright (c) 2014      Intel, Inc. All rights reserved.
+# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@ -11,7 +12,7 @@ headers += \
          orted/pmix/pmix_server.h \
          orted/pmix/pmix_server_internal.h

-libopen_rte_la_SOURCES += \
+lib@ORTE_LIB_PREFIX@open_rte_la_SOURCES += \
          orted/pmix/pmix_server.c \
          orted/pmix/pmix_server_connection.c \
          orted/pmix/pmix_server_sendrecv.c
--- a/orte/runtime/Makefile.am
+++ b/orte/runtime/Makefile.am
@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2014 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012      Los Alamos National Security, LLC.
 #                         All rights reserved.
 # $COPYRIGHT$
@ -36,7 +36,7 @@ headers += \
        runtime/orte_data_server.h \
        runtime/orte_info_support.h

-libopen_rte_la_SOURCES += \
+lib@ORTE_LIB_PREFIX@open_rte_la_SOURCES += \
        runtime/orte_finalize.c \
        runtime/orte_init.c \
        runtime/orte_locks.c \
--- a/orte/tools/orte-checkpoint/Makefile.am
+++ b/orte/tools/orte-checkpoint/Makefile.am
@ -41,7 +41,9 @@ dist_ortedata_DATA = help-orte-checkpoint.txt
 endif # OPAL_INSTALL_BINARIES

 orte_checkpoint_SOURCES = orte-checkpoint.c
-orte_checkpoint_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
+orte_checkpoint_LDADD = \
+	$(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \
+	$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 endif # WANT_FT_CR

--- a/orte/tools/orte-clean/Makefile.am
+++ b/orte/tools/orte-clean/Makefile.am
@ -39,7 +39,9 @@ dist_ortedata_DATA = help-orte-clean.txt
 endif # OPAL_INSTALL_BINARIES

 orte_clean_SOURCES = orte-clean.c
-orte_clean_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
+orte_clean_LDADD = \
+	$(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \
+	$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 distclean-local:
 	rm -f $(man_pages)
--- a/orte/tools/orte-info/Makefile.am
+++ b/orte/tools/orte-info/Makefile.am
@ -64,7 +64,9 @@ orte_info_SOURCES = \
        components.c \
        version.c

-orte_info_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
+orte_info_LDADD = \
+	$(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \
+	$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 clean-local:
 	test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)
--- a/orte/tools/orte-migrate/Makefile.am
+++ b/orte/tools/orte-migrate/Makefile.am
@ -34,7 +34,9 @@ dist_ortedata_DATA = help-orte-migrate.txt
 endif # OPAL_INSTALL_BINARIES

 orte_migrate_SOURCES = orte-migrate.c
-orte_migrate_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
+orte_migrate_LDADD = \
+	$(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \
+	$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 endif # WANT_FT_CR

--- a/orte/tools/orte-ps/Makefile.am
+++ b/orte/tools/orte-ps/Makefile.am
@ -39,7 +39,9 @@ dist_ortedata_DATA = help-orte-ps.txt
 endif # OPAL_INSTALL_BINARIES

 orte_ps_SOURCES = orte-ps.c
-orte_ps_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
+orte_ps_LDADD = \
+	$(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \
+	$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 distclean-local:
 	rm -f $(man_pages)
--- a/orte/tools/orte-restart/Makefile.am
+++ b/orte/tools/orte-restart/Makefile.am
@ -41,7 +41,9 @@ dist_ortedata_DATA = help-orte-restart.txt
 endif # OPAL_INSTALL_BINARIES

 orte_restart_SOURCES = orte-restart.c
-orte_restart_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
+orte_restart_LDADD = \
+	$(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \
+	$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 endif # WANT_FT_CR

--- a/orte/tools/orte-server/Makefile.am
+++ b/orte/tools/orte-server/Makefile.am
@ -39,7 +39,9 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
 endif # OPAL_INSTALL_BINARIES

 orte_server_SOURCES = orte-server.c 
-orte_server_LDADD =  $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
+orte_server_LDADD = \
+	$(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \
+	$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 distclean-local:
 	rm -f $(man_pages)
--- a/orte/tools/orte-top/Makefile.am
+++ b/orte/tools/orte-top/Makefile.am
@ -39,7 +39,9 @@ dist_ortedata_DATA = help-orte-top.txt
 endif # OPAL_INSTALL_BINARIES

 orte_top_SOURCES = orte-top.c
-orte_top_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
+orte_top_LDADD = \
+	$(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \
+	$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 distclean-local:
 	rm -f $(man_pages)
--- a/orte/tools/orted/Makefile.am
+++ b/orte/tools/orted/Makefile.am
@ -44,7 +44,9 @@ orted_SOURCES = orted.c
 #  nice for systems that don't have all the shared 
 #  libraries on the computes 
 orted_LDFLAGS =
-orted_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
+orted_LDADD = \
+	$(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \
+	$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 distclean-local:
 	rm -f $(man_pages)
--- a/orte/tools/orterun/Makefile.am
+++ b/orte/tools/orterun/Makefile.am
@ -52,7 +52,9 @@ orterun_SOURCES = \
        orterun.c \
        orterun.h

-orterun_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
+orterun_LDADD = \
+	$(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \
+	$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 distclean-local:
 	rm -f $(man_pages)
--- a/orte/util/Makefile.am
+++ b/orte/util/Makefile.am
@ -58,7 +58,7 @@ headers += \
        util/regex.h \
        util/attr.h

-libopen_rte_la_SOURCES += \
+lib@ORTE_LIB_PREFIX@open_rte_la_SOURCES += \
        util/error_strings.c \
        util/name_fns.c \
        util/proc_info.c \
--- a/oshmem/tools/oshmem_info/Makefile.am
+++ b/oshmem/tools/oshmem_info/Makefile.am
@ -69,9 +69,9 @@ oshmem_info_SOURCES = \
 oshmem_info_LDADD = $(top_builddir)/ompi/libmpi.la
 oshmem_info_LDADD += $(top_builddir)/oshmem/liboshmem.la
 if OMPI_RTE_ORTE
-oshmem_info_LDADD +=  $(top_builddir)/orte/libopen-rte.la
+oshmem_info_LDADD +=  $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la
 endif
-oshmem_info_LDADD += $(top_builddir)/opal/libopen-pal.la
+oshmem_info_LDADD += $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la

 clean-local:
 	test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)