Rework things to replace hard-coded '-lopen-pal' with @OPAL_LIB_NAME@.

This makes it consistent with OMPI_LIBMPI_NAME.

Replace/remove OPAL_LIB_PREFIX since it currently is unused/dead code.

Signed-off-by: Austen Lauria <awlauria@us.ibm.com>

Author: awlauria

config/opal_mca.m4

@@ -767,12 +767,12 @@ AC_DEFUN([MCA_PROCESS_COMPONENT],[
     else
         if test "$2" = "common"; then
             # Static libraries in "common" frameworks are installed, and
-            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # therefore must obey the $FRAMEWORK_LIB_NAME that was
             # set.
-            $7="mca/$2/$3/lib${m4_translit([$1], [a-z], [A-Z])_LIB_PREFIX}mca_$2_$3.la $$7"
+            $7="mca/$2/$3/lib${m4_translit([$1], [a-z], [A-Z])_LIB_NAME}mca_$2_$3.la $$7"
         else
             # Other frameworks do not have to obey the
-            # $FRAMEWORK_LIB_PREFIX prefix.
+            # $FRAMEWORK_LIB_NAME prefix.
             $7="mca/$2/$3/libmca_$2_$3.la $$7"
         fi
         echo "extern const mca_base_component_t mca_$2_$3_component;" >> $outfile.extern

config/opal_set_lib_prefix.m4 renamed to config/opal_set_lib_name.m4

@@ -12,19 +12,19 @@
 
 # OPAL_SET_LIB_PREFIX([library_prefix]
 #
-# This macro sets a prefix for the libopen-pal library.  Specifically,
-# libopen-pal.la becomes libPREFIXopen-pal.la.
+# This macro sets a name for the libopen-pal library.  Specifically,
+# libopen-pal.la becomes libopen-pal.la by default.
 #
 # --------------------------------------------------------
-AC_DEFUN([OPAL_SET_LIB_PREFIX],[
+AC_DEFUN([OPAL_SET_LIB_NAME],[
     AS_IF([test "$opal_lib_prefix_set" = "yes"],
-          [AC_MSG_WARN([OPAL lib prefix was already set!])
+          [AC_MSG_WARN([OPAL lib name was already set!])
            AC_MSG_WARN([This is a configury programming error])
            AC_MSG_ERROR([Cannot continue])])
 
-    OPAL_LIB_PREFIX=$1
+    OPAL_LIB_NAME=$1
     opal_lib_prefix_set=yes
-    AC_SUBST(OPAL_LIB_PREFIX)
+    AC_SUBST(OPAL_LIB_NAME)
 ])dnl
 
 #

configure.ac

@@ -328,7 +328,9 @@ fi
 
 # The library prefixes must be set before we call OPAL MCA.  Here is
 # as good a place as any.
-OPAL_SET_LIB_PREFIX([])
+m4_ifdef([project_opal],
+[OPAL_SET_LIB_NAME([open-pal])])
+
 m4_ifdef([project_ompi],
           [OMPI_SET_LIB_NAME([])])
 

contrib/libadd_mca_comp_update.py

@@ -7,7 +7,7 @@
 
 import glob, os, re, shutil
 
-projects= {'opal' : ["$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la"],
+projects= {'opal' : ["$(top_builddir)/opal/lib@OPAL_LIB_NAME@.la"],
            'ompi' : ["$(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la"],
            'oshmem' : ["$(top_builddir)/oshmem/liboshmem.la"],
           }

ompi/Makefile.am

@@ -157,7 +157,7 @@ lib@OMPI_LIBMPI_NAME@_la_LIBADD = \
 
 
 lib@OMPI_LIBMPI_NAME@_la_LIBADD += \
-        $(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
+        $(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB_NAME@.la
 lib@OMPI_LIBMPI_NAME@_la_DEPENDENCIES = $(lib@OMPI_LIBMPI_NAME@_la_LIBADD)
 lib@OMPI_LIBMPI_NAME@_la_LDFLAGS = \
        -version-info $(libmpi_so_version) \

ompi/debuggers/Makefile.am

@@ -46,7 +46,7 @@ headers = \
 dlopen_test_SOURCES = dlopen_test.c
 dlopen_test_LDADD = \
         $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
-        $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
+        $(top_builddir)/opal/lib@OPAL_LIB_NAME@.la
 dlopen_test_DEPENDENCIES = $(ompi_predefined_LDADD)
 
 predefined_gap_test_SOURCES = predefined_gap_test.c

ompi/mca/coll/sm/Makefile.am

@@ -63,7 +63,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_sm_la_SOURCES = $(sources)
 mca_coll_sm_la_LDFLAGS = -module -avoid-version
 mca_coll_sm_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
-        $(OMPI_TOP_BUILDDIR)/opal/mca/common/sm/lib@OPAL_LIB_PREFIX@mca_common_sm.la
+        $(OMPI_TOP_BUILDDIR)/opal/mca/common/sm/lib@OPAL_LIB_NAME@mca_common_sm.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_sm_la_SOURCES =$(sources)

ompi/mca/common/monitoring/Makefile.am

@@ -35,7 +35,7 @@ ompi_monitoring_prof_la_LDFLAGS= \
     -module -avoid-version -shared $(WRAPPER_EXTRA_LDFLAGS)
 ompi_monitoring_prof_la_LIBADD = \
     $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
-    $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
+    $(top_builddir)/opal/lib@OPAL_LIB_NAME@.la
 
 if OPAL_INSTALL_BINARIES
 bin_SCRIPTS = profile2mat.pl aggregate_profile.pl

ompi/mca/mtl/ofi/Makefile.am

@@ -80,7 +80,7 @@ mca_mtl_ofi_la_LDFLAGS = \
         $(opal_ofi_LDFLAGS) \
         -module -avoid-version
 mca_mtl_ofi_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
-        $(OPAL_TOP_BUILDDIR)/opal/mca/common/ofi/lib@OPAL_LIB_PREFIX@mca_common_ofi.la \
+        $(OPAL_TOP_BUILDDIR)/opal/mca/common/ofi/lib@OPAL_LIB_NAME@mca_common_ofi.la \
         $(opal_ofi_LIBS)
 
 noinst_LTLIBRARIES = $(component_noinst)

ompi/mca/osc/ucx/Makefile.am

@@ -35,7 +35,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_osc_ucx_la_SOURCES = $(ucx_sources)
 mca_osc_ucx_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la $(osc_ucx_LIBS) \
-                        $(OPAL_TOP_BUILDDIR)/opal/mca/common/ucx/lib@OPAL_LIB_PREFIX@mca_common_ucx.la
+                        $(OPAL_TOP_BUILDDIR)/opal/mca/common/ucx/lib@OPAL_LIB_NAME@mca_common_ucx.la
 mca_osc_ucx_la_LDFLAGS = -module -avoid-version $(osc_ucx_LDFLAGS)
 
 noinst_LTLIBRARIES = $(component_noinst)