Provide a mechanism by which an upstream project can rename the OPAL and ORTE libraries. This is required by projects such as ORCM that have their own ORTE and OPAL libraries in order to avoid library confusion. By renaming their version of the libraries, the OMPI applications can correctly dynamically load the correct one for their build.

2014-10-10 11:39:08 -07:00 · 2014-10-10 11:39:08 -07:00 · 63f619f871
--- a/configure.ac
+++ b/configure.ac
@ -1406,6 +1406,8 @@ opalincludedir='${includedir}/openmpi'
 AC_SUBST(opaldatadir)
 AC_SUBST(opallibdir)
 AC_SUBST(opalincludedir)
+OPAL_LIB="open-pal"
+AC_SUBST(OPAL_LIB)

 m4_ifdef([project_orte],
         [ortedatadir="$opaldatadir"
@ -1413,7 +1415,9 @@ m4_ifdef([project_orte],
          ortelibdir="$opallibdir"
          AC_SUBST(ortelibdir)
          orteincludedir="$opalincludedir"
-          AC_SUBST(orteincludedir)])
+          AC_SUBST(orteincludedir)
+          ORTE_LIB="open-rte"
+          AC_SUBST(ORTE_LIB)])
 m4_ifdef([project_ompi],
         [ompidatadir="$opaldatadir"
          AC_SUBST(ompidatadir)
--- a/ompi/Makefile.am
+++ b/ompi/Makefile.am
@ -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@.la
 endif
 libmpi_la_LIBADD += \
-        $(OMPI_TOP_BUILDDIR)/opal/libopen-pal.la
+        $(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB@.la
 libmpi_la_DEPENDENCIES = $(libmpi_la_LIBADD)
 libmpi_la_LDFLAGS = \
       -version-info $(libmpi_so_version) \
--- a/ompi/mca/rte/orte/Makefile.am
+++ b/ompi/mca/rte/orte/Makefile.am
@ -24,7 +24,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@.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@.la
 endif
-mpisync_LDADD += $(top_builddir)/opal/libopen-pal.la
+mpisync_LDADD += $(top_builddir)/opal/lib@OPAL_LIB@.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@.la
 endif
-ompi_info_LDADD += $(top_builddir)/opal/libopen-pal.la
+ompi_info_LDADD += $(top_builddir)/opal/lib@OPAL_LIB@.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@ -l@OPAL_LIB@ @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@ -l@OPAL_LIB@ @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@ -l@OPAL_LIB@  @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/ompi/tools/wrappers/ompi_wrapper_script.in
+++ b/ompi/tools/wrappers/ompi_wrapper_script.in
@ -62,7 +62,7 @@ my $linker_flags = $libdir_flag . $libdir . " " . $extra_ldflags;
 # pulled in implicitly) because we intend MPI applications to only use
 # the MPI API.
 my $libs = "-lmpi " . $extra_libs;
-my $libs_static = "-lmpi -lopen-rte -lopen-pal " . $extra_libs;
+my $libs_static = "-lmpi -l@ORTE_LIB@ -l@OPAL_LIB@ " . $extra_libs;

 my $have_dynamic = 0;
 if (-e $libdir . "/libmpi." . $dynamic_lib_suffix) {
--- a/opal/Makefile.am
+++ b/opal/Makefile.am
@ -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@.la
+lib@OPAL_LIB@_la_SOURCES =
+lib@OPAL_LIB@_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@_la_DEPENDENCIES = $(lib@OPAL_LIB@_la_LIBADD)
+lib@OPAL_LIB@_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@_la_SOURCES += $(headers)

 # Conditionally install the header files

--- a/opal/class/Makefile.am
+++ b/opal/class/Makefile.am
@ -37,7 +37,7 @@ headers += \
        class/opal_rb_tree.h \
        class/ompi_free_list.h

-libopen_pal_la_SOURCES += \
+lib@OPAL_LIB@_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
@ -25,7 +25,7 @@ headers += \
        dss/dss_types.h \
        dss/dss_internal.h

-libopen_pal_la_SOURCES += \
+lib@OPAL_LIB@_la_SOURCES += \
        dss/dss_internal_functions.c \
        dss/dss_compare.c \
        dss/dss_copy.c \
--- a/opal/memoryhooks/Makefile.am
+++ b/opal/memoryhooks/Makefile.am
@ -23,5 +23,5 @@ headers += \
 	memoryhooks/memory.h \
 	memoryhooks/memory_internal.h

-libopen_pal_la_SOURCES += \
+lib@OPAL_LIB@_la_SOURCES += \
 	memoryhooks/memory.c
--- a/opal/runtime/Makefile.am
+++ b/opal/runtime/Makefile.am
@ -37,7 +37,7 @@ headers += \
        runtime/opal_params.h \
        runtime/opal_progress_threads.h

-libopen_pal_la_SOURCES += \
+lib@OPAL_LIB@_la_SOURCES += \
        runtime/opal_progress.c \
        runtime/opal_finalize.c \
        runtime/opal_init.c \
--- a/opal/threads/Makefile.am
+++ b/opal/threads/Makefile.am
@ -27,7 +27,7 @@ headers += \
        threads/threads.h \
 	threads/tsd.h

-libopen_pal_la_SOURCES += \
+lib@OPAL_LIB@_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@.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@.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@.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/opal.pc.in
+++ b/opal/tools/wrappers/opal.pc.in
@ -14,7 +14,7 @@ libdir=@libdir@
 # (they're pulled in via libopen-pal.so's implicit dependencies), so
 # list them in Libs.private.
 #
-Libs: -L${libdir} @OPAL_WRAPPER_EXTRA_LDFLAGS@ -lopen-pal 
+Libs: -L${libdir} @OPAL_WRAPPER_EXTRA_LDFLAGS@ -l@OPAL_LIB@ 
 Libs.private: @OPAL_WRAPPER_EXTRA_LIBS@
 #
 # It is safe to hard-wire the -I before the EXTRA_INCLUDES because we
--- 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@
+libs_static=-l@OPAL_LIB@ @OPAL_WRAPPER_EXTRA_LIBS@
+dyn_lib_file=lib@OPAL_LIB@.@OPAL_DYN_LIB_SUFFIX@
+static_lib_file=lib@OPAL_LIB@.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@
+libs_static=-l@OPAL_LIB@ @OPAL_WRAPPER_EXTRA_LIBS@
+dyn_lib_file=lib@OPAL_LIB@.@OPAL_DYN_LIB_SUFFIX@
+static_lib_file=lib@OPAL_LIB@.a
 required_file=
 includedir=${includedir}
 libdir=${libdir}
--- a/orte/Makefile.am
+++ b/orte/Makefile.am
@ -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@.la
+lib@ORTE_LIB@_la_SOURCES =
+lib@ORTE_LIB@_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@.la
+lib@ORTE_LIB@_la_DEPENDENCIES = $(lib@ORTE_LIB@_la_LIBADD)
+lib@ORTE_LIB@_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@_la_SOURCES += $(headers)

 # Conditionally install the header files

--- a/orte/orted/Makefile.am
+++ b/orte/orted/Makefile.am
@ -24,7 +24,7 @@ dist_ortedata_DATA += orted/help-orted.txt
 headers += \
 	orted/orted.h

-libopen_rte_la_SOURCES += \
+lib@ORTE_LIB@_la_SOURCES += \
        orted/orted_main.c \
        orted/orted_comm.c

--- a/orte/orted/pmix/Makefile.am
+++ b/orte/orted/pmix/Makefile.am
@ -11,7 +11,7 @@ headers += \
          orted/pmix/pmix_server.h \
          orted/pmix/pmix_server_internal.h

-libopen_rte_la_SOURCES += \
+lib@ORTE_LIB@_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
@ -36,7 +36,7 @@ headers += \
        runtime/orte_data_server.h \
        runtime/orte_info_support.h

-libopen_rte_la_SOURCES += \
+lib@ORTE_LIB@_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,7 @@ 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@.la $(top_builddir)/opal/lib@OPAL_LIB@.la

 endif # WANT_FT_CR

--- a/orte/tools/orte-clean/Makefile.am
+++ b/orte/tools/orte-clean/Makefile.am
@ -39,7 +39,7 @@ 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@.la $(top_builddir)/opal/lib@OPAL_LIB@.la

 distclean-local:
 	rm -f $(man_pages)
--- a/orte/tools/orte-info/Makefile.am
+++ b/orte/tools/orte-info/Makefile.am
@ -64,7 +64,7 @@ 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@.la $(top_builddir)/opal/lib@OPAL_LIB@.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,7 @@ 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@.la $(top_builddir)/opal/lib@OPAL_LIB@.la

 endif # WANT_FT_CR

--- a/orte/tools/orte-ps/Makefile.am
+++ b/orte/tools/orte-ps/Makefile.am
@ -39,7 +39,7 @@ 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@.la $(top_builddir)/opal/lib@OPAL_LIB@.la

 distclean-local:
 	rm -f $(man_pages)
--- a/orte/tools/orte-restart/Makefile.am
+++ b/orte/tools/orte-restart/Makefile.am
@ -41,7 +41,7 @@ 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@.la $(top_builddir)/opal/lib@OPAL_LIB@.la

 endif # WANT_FT_CR

--- a/orte/tools/orte-server/Makefile.am
+++ b/orte/tools/orte-server/Makefile.am
@ -39,7 +39,7 @@ $(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@.la $(top_builddir)/opal/lib@OPAL_LIB@.la

 distclean-local:
 	rm -f $(man_pages)
--- a/orte/tools/orte-top/Makefile.am
+++ b/orte/tools/orte-top/Makefile.am
@ -39,7 +39,7 @@ 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@.la $(top_builddir)/opal/lib@OPAL_LIB@.la

 distclean-local:
 	rm -f $(man_pages)
--- a/orte/tools/orted/Makefile.am
+++ b/orte/tools/orted/Makefile.am
@ -44,7 +44,7 @@ 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@.la $(top_builddir)/opal/lib@OPAL_LIB@.la

 distclean-local:
 	rm -f $(man_pages)
--- a/orte/tools/orterun/Makefile.am
+++ b/orte/tools/orterun/Makefile.am
@ -52,7 +52,7 @@ 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@.la $(top_builddir)/opal/lib@OPAL_LIB@.la

 distclean-local:
 	rm -f $(man_pages)
--- a/orte/tools/wrappers/orte_wrapper_script.in
+++ b/orte/tools/wrappers/orte_wrapper_script.in
@ -51,7 +51,7 @@ my $preproc_flags = $include_flag . $includedir;
 my $comp_flags = "";
 my $comp_flags_prefix = "";
 my $linker_flags = $libdir_flag . $libdir . " " . $extra_ldflags;
-my $libs = "-lopen-rte -lopen-pal " . $extra_libs;
+my $libs = "-l@ORTE_LIB@ -l@OPAL_LIB@ " . $extra_libs;


 sub check_env {
--- a/orte/tools/wrappers/ortecc-wrapper-data.txt.in
+++ b/orte/tools/wrappers/ortecc-wrapper-data.txt.in
@ -20,10 +20,10 @@ linker_flags=@ORTE_WRAPPER_EXTRA_LDFLAGS@
 # intentionally always link in open-pal and open-rte in
 # ortecc/ortec++ because we intend ORTE applications to use both the
 # ORTE and OPAL APIs.
-libs=-lopen-rte -lopen-pal
-libs_static=-lopen-rte -lopen-pal @ORTE_WRAPPER_EXTRA_LIBS@
+libs=-l@ORTE_LIB@ -l@OPAL_LIB@
+libs_static=-l@ORTE_LIB@ -l@OPAL_LIB@ @ORTE_WRAPPER_EXTRA_LIBS@
 dyn_lib_file=libopen-rte.@OPAL_DYN_LIB_SUFFIX@
-static_lib_file=libopen-rte.a
+static_lib_file=lib@ORTE_LIB@.a
 required_file=
 includedir=${includedir}
 libdir=${libdir}
--- 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@_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@.la
 endif
-oshmem_info_LDADD += $(top_builddir)/opal/libopen-pal.la
+oshmem_info_LDADD += $(top_builddir)/opal/lib@OPAL_LIB@.la

 clean-local:
 	test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)
--- a/test/class/Makefile.am
+++ b/test/class/Makefile.am
@ -38,37 +38,37 @@ TESTS =

 opal_bitmap_SOURCES = opal_bitmap.c 
 opal_bitmap_LDADD = \
-        $(top_builddir)/opal/libopen-pal.la \
+        $(top_builddir)/opal/lib@OPAL_LIB@.la \
        $(top_builddir)/test/support/libsupport.a
 opal_bitmap_DEPENDENCIES = $(opal_bitmap_LDADD)

 opal_list_SOURCES = opal_list.c 
 opal_list_LDADD = \
-        $(top_builddir)/opal/libopen-pal.la \
+        $(top_builddir)/opal/lib@OPAL_LIB@.la \
        $(top_builddir)/test/support/libsupport.a
 opal_list_DEPENDENCIES = $(opal_list_LDADD)

 opal_tree_SOURCES = opal_tree.c 
 opal_tree_LDADD = \
-        $(top_builddir)/opal/libopen-pal.la \
+        $(top_builddir)/opal/lib@OPAL_LIB@.la \
        $(top_builddir)/test/support/libsupport.a
 opal_tree_DEPENDENCIES = $(opal_tree_LDADD)

 opal_hash_table_SOURCES = opal_hash_table.c
 opal_hash_table_LDADD = \
-        $(top_builddir)/opal/libopen-pal.la \
+        $(top_builddir)/opal/lib@OPAL_LIB@.la \
        $(top_builddir)/test/support/libsupport.a
 opal_hash_table_DEPENDENCIES = $(opal_hash_table_LDADD)

 opal_pointer_array_SOURCES = opal_pointer_array.c
 opal_pointer_array_LDADD = \
-        $(top_builddir)/opal/libopen-pal.la \
+        $(top_builddir)/opal/lib@OPAL_LIB@.la \
        $(top_builddir)/test/support/libsupport.a
 opal_pointer_array_DEPENDENCIES = $(opal_pointer_array_LDADD)

 opal_value_array_SOURCES = opal_value_array.c
 opal_value_array_LDADD = \
-        $(top_builddir)/opal/libopen-pal.la \
+        $(top_builddir)/opal/lib@OPAL_LIB@.la \
        $(top_builddir)/test/support/libsupport.a
 opal_value_array_DEPENDENCIES = $(opal_value_array_LDADD)

--- a/test/datatype/Makefile.am
+++ b/test/datatype/Makefile.am
@ -55,5 +55,5 @@ to_self_LDADD = $(top_builddir)/ompi/libmpi.la

 opal_datatype_test_SOURCES = opal_datatype_test.c opal_ddt_lib.c opal_ddt_lib.h
 opal_datatype_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
-opal_datatype_test_LDADD = $(top_builddir)/opal/libopen-pal.la
+opal_datatype_test_LDADD = $(top_builddir)/opal/lib@OPAL_LIB@.la

--- a/test/event/Makefile.am
+++ b/test/event/Makefile.am
@ -28,17 +28,17 @@ TESTS = $(check_PROGRAMS)
 signal_test_SOURCES = signal-test.c
 signal_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
 signal_test_LDADD = \
-        $(top_builddir)/opal/libopen-pal.la
+        $(top_builddir)/opal/lib@OPAL_LIB@.la
 signal_test_DEPENDENCIES = $(signal_test_LDADD)

 time_test_SOURCES = time-test.c
 time_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
 time_test_LDADD = \
-        $(top_builddir)/opal/libopen-pal.la
+        $(top_builddir)/opal/lib@OPAL_LIB@.la
 time_test_DEPENDENCIES = $(time_test_LDADD)

 event_test_SOURCES = event-test.c
 event_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
 event_test_LDADD = \
-        $(top_builddir)/opal/libopen-pal.la
+        $(top_builddir)/opal/lib@OPAL_LIB@.la
 event_test_DEPENDENCIES = $(event_test_LDADD)
--- a/test/runtime/Makefile.am
+++ b/test/runtime/Makefile.am
@ -31,26 +31,26 @@ TESTS = \
 sigchld_SOURCES = \
 	sigchld.c
 sigchld_LDADD = \
-	$(top_builddir)/orte/libopen-rte.la \
+	$(top_builddir)/orte/lib@ORTE_LIB@.la \
 	$(top_builddir)/test/support/libsupport.a
 sigchld_DEPENDENCIES = $(sigchld_LDADD)

 start_shut_SOURCES = \
    start_shut.c
 start_shut_LDADD = \
-	$(top_builddir)/orte/libopen-rte.la \
+	$(top_builddir)/orte/lib@ORTE_LIB@.la \
 	$(top_builddir)/test/support/libsupport.a
 start_shut_DEPENDENCIES = $(start_shut_LDADD)

 orte_init_finalize_SOURCES = \
    orte_init_finalize.c
 orte_init_finalize_LDADD = \
-	$(top_builddir)/orte/libopen-rte.la \
+	$(top_builddir)/orte/lib@ORTE_LIB@.la \
 orte_init_finalize_DEPENDENCIES = $(orte_init_finalize_LDADD)

 opal_init_finalize_SOURCES = \
    opal_init_finalize.c
 opal_init_finalize_LDADD = \
-	$(top_builddir)/opal/libopen-pal.la \
+	$(top_builddir)/opal/lib@OPAL_LIB@.la \
 	$(top_builddir)/test/support/libsupport.a
 opal_init_finalize_DEPENDENCIES = $(opal_init_finalize_LDADD)
--- a/test/threads/Makefile.am
+++ b/test/threads/Makefile.am
@ -32,12 +32,12 @@ TESTS =
 opal_thread_SOURCES = opal_thread.c
 opal_thread_LDADD = \
        $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/opal/libopen-pal.la
+        $(top_builddir)/opal/lib@OPAL_LIB@.la
 opal_thread_DEPENDENCIES = $(opal_thread_LDADD)

 opal_condition_SOURCES = opal_condition.c
 opal_condition_LDADD = \
        $(top_builddir)/test/support/libsupport.a \
-        $(top_builddir)/opal/libopen-pal.la
+        $(top_builddir)/opal/lib@OPAL_LIB@.la
 opal_condition_DEPENDENCIES = $(opal_condition_LDADD)

--- a/test/util/Makefile.am
+++ b/test/util/Makefile.am
@ -40,80 +40,80 @@ TESTS = \

 #ompi_numtostr_SOURCES = ompi_numtostr.c
 #ompi_numtostr_LDADD = \
-#        $(top_builddir)/opal/libopen-pal.la \
+#        $(top_builddir)/opal/lib@OPAL_LIB@.la \
 #        $(top_builddir)/test/support/libsupport.a 
 #ompi_numtostr_DEPENDENCIES = $(ompi_numtostr_LDADD)

 #opal_error_SOURCES = opal_error.c
 #opal_error_LDADD = \
-#        $(top_builddir)/orte/libopen-rte.la \
+#        $(top_builddir)/orte/lib@ORTE_LIB@.la \
 #opal_error_DEPENDENCIES = $(opal_error_LDADD)

 #opal_if_SOURCES = opal_if.c
 #opal_if_LDADD = \
-#        $(top_builddir)/opal/libopen-pal.la \
+#        $(top_builddir)/opal/lib@OPAL_LIB@.la \
 #        $(top_builddir)/test/support/libsupport.a 
 #opal_if_DEPENDENCIES = $(opal_if_LDADD)

 #opal_argv_SOURCES = opal_argv.c
 #opal_argv_LDADD = \
-#        $(top_builddir)/opal/libopen-pal.la \
+#        $(top_builddir)/opal/lib@OPAL_LIB@.la \
 #        $(top_builddir)/test/support/libsupport.a 
 #opal_argv_DEPENDENCIES = $(opal_argv_LDADD)

 #opal_basename_SOURCES = opal_basename.c
 #opal_basename_LDADD = \
-#        $(top_builddir)/opal/libopen-pal.la \
+#        $(top_builddir)/opal/lib@OPAL_LIB@.la \
 #        $(top_builddir)/test/support/libsupport.a 
 #opal_basename_DEPENDENCIES = $(opal_basename_LDADD)

 opal_bit_ops_SOURCES = opal_bit_ops.c
 opal_bit_ops_LDADD = \
-        $(top_builddir)/opal/libopen-pal.la \
+        $(top_builddir)/opal/lib@OPAL_LIB@.la \
        $(top_builddir)/test/support/libsupport.a
 opal_bit_ops_DEPENDENCIES = $(opal_path_nfs_LDADD)


 opal_path_nfs_SOURCES = opal_path_nfs.c
 opal_path_nfs_LDADD = \
-        $(top_builddir)/opal/libopen-pal.la \
+        $(top_builddir)/opal/lib@OPAL_LIB@.la \
        $(top_builddir)/test/support/libsupport.a
 opal_path_nfs_DEPENDENCIES = $(opal_path_nfs_LDADD)

 #opal_os_path_SOURCES = opal_os_path.c
 #opal_os_path_LDADD = \
-#        $(top_builddir)/opal/libopen-pal.la \
+#        $(top_builddir)/opal/lib@OPAL_LIB@.la \
 #        $(top_builddir)/test/support/libsupport.a 
 #opal_os_path_DEPENDENCIES = $(opal_os_path_LDADD)

 #opal_timer_SOURCES = opal_timer.c
 #opal_timer_LDADD = \
-#        $(top_builddir)/opal/libopen-pal.la \
+#        $(top_builddir)/opal/lib@OPAL_LIB@.la \
 #        $(top_builddir)/test/support/libsupport.a 
 #opal_timer_DEPENDENCIES = $(opal_timer_LDADD)


 #orte_sys_info_SOURCES = orte_sys_info.c
 #orte_sys_info_LDADD = \
-#        $(top_builddir)/orte/libopen-rte.la \
+#        $(top_builddir)/orte/lib@ORTE_LIB@.la \
 #        $(top_builddir)/test/support/libsupport.a 
 #orte_sys_info_DEPENDENCIES = $(orte_sys_info_LDADD)

 #opal_os_create_dirpath_SOURCES = opal_os_create_dirpath.c
 #opal_os_create_dirpath_LDADD = \
-#        $(top_builddir)/opal/libopen-pal.la \
+#        $(top_builddir)/opal/lib@OPAL_LIB@.la \
 #        $(top_builddir)/test/support/libsupport.a 
 #opal_os_create_dirpath_DEPENDENCIES = $(opal_os_create_dirpath_LDADD)

 #orte_session_dir_SOURCES = orte_session_dir.c
 #orte_session_dir_LDADD = \
-#        $(top_builddir)/orte/libopen-rte.la \
+#        $(top_builddir)/orte/lib@ORTE_LIB@.la \
 #        $(top_builddir)/test/support/libsupport.a 
 #orte_session_dir_DEPENDENCIES = $(orte_session_dir_LDADD)

 #orte_universe_setup_file_io_SOURCES = orte_universe_setup_file_io.c
 #orte_universe_setup_file_io_LDADD = \
-#        $(top_builddir)/orte/libopen-rte.la \
+#        $(top_builddir)/orte/lib@ORTE_LIB@.la \
 #        $(top_builddir)/test/support/libsupport.a 
 #orte_universe_setup_file_io_DEPENDENCIES = $(orte_universe_setup_file_io_LDADD)