fix for enable-mca-dso

hppritcha · hppritcha · commit 4d09d853bb98 · 2025-09-03T16:15:34.000-06:00
Signed-off-by: Howard Pritchard &lt;howardp@lanl.gov&gt;
diff --git a/ompi/mca/bml/r2/Makefile.am b/ompi/mca/bml/r2/Makefile.am
@@ -37,7 +37,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_bml_r2_la_SOURCES = $(r2_sources)
 mca_bml_r2_la_LDFLAGS = -module -avoid-version
-mca_bml_r2_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_bml_r2_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_bml_r2_la_SOURCES = $(r2_sources)
diff --git a/ompi/mca/coll/accelerator/Makefile.am b/ompi/mca/coll/accelerator/Makefile.am
@@ -33,7 +33,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_accelerator_la_SOURCES = $(sources)
 mca_coll_accelerator_la_LDFLAGS = -module -avoid-version
-mca_coll_accelerator_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
+mca_coll_accelerator_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_accelerator_la_SOURCES =$(sources)
diff --git a/ompi/mca/coll/acoll/Makefile.am b/ompi/mca/coll/acoll/Makefile.am
@@ -38,7 +38,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_acoll_la_SOURCES = $(sources)
 mca_coll_acoll_la_LDFLAGS = -module -avoid-version $(coll_acoll_LDFLAGS)
-mca_coll_acoll_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la $(coll_acoll_LIBS)
+mca_coll_acoll_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la $(coll_acoll_LIBS)
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_acoll_la_SOURCES =$(sources)
diff --git a/ompi/mca/coll/basic/Makefile.am b/ompi/mca/coll/basic/Makefile.am
@@ -63,7 +63,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_basic_la_SOURCES = $(sources)
 mca_coll_basic_la_LDFLAGS = -module -avoid-version
-mca_coll_basic_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_coll_basic_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_basic_la_SOURCES =$(sources)
diff --git a/ompi/mca/coll/demo/Makefile.am b/ompi/mca/coll/demo/Makefile.am
@@ -57,7 +57,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_demo_la_SOURCES = $(sources)
 mca_coll_demo_la_LDFLAGS = -module -avoid-version
-mca_coll_demo_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_coll_demo_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_demo_la_SOURCES = $(sources)
diff --git a/ompi/mca/coll/hcoll/Makefile.am b/ompi/mca/coll/hcoll/Makefile.am
@@ -39,7 +39,7 @@ endif
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES  = $(component_install)
 mca_coll_hcoll_la_SOURCES = $(coll_hcoll_sources)
-mca_coll_hcoll_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_coll_hcoll_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
 	$(coll_hcoll_LIBS)
 mca_coll_hcoll_la_LDFLAGS = -module -avoid-version $(coll_hcoll_LDFLAGS)
 
diff --git a/ompi/mca/coll/inter/Makefile.am b/ompi/mca/coll/inter/Makefile.am
@@ -34,7 +34,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_inter_la_SOURCES = $(sources)
 mca_coll_inter_la_LDFLAGS = -module -avoid-version
-mca_coll_inter_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_coll_inter_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_inter_la_SOURCES = $(sources)
diff --git a/ompi/mca/coll/libnbc/Makefile.am b/ompi/mca/coll/libnbc/Makefile.am
@@ -72,7 +72,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_libnbc_la_SOURCES = $(sources)
 mca_coll_libnbc_la_LDFLAGS = -module -avoid-version
-mca_coll_libnbc_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_coll_libnbc_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_libnbc_la_SOURCES =$(sources)
diff --git a/ompi/mca/coll/monitoring/Makefile.am b/ompi/mca/coll/monitoring/Makefile.am
@@ -46,7 +46,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_monitoring_la_SOURCES = $(monitoring_sources)
 mca_coll_monitoring_la_LDFLAGS = -module -avoid-version
-mca_coll_monitoring_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_coll_monitoring_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
 	$(OMPI_TOP_BUILDDIR)/ompi/mca/common/monitoring/libmca_common_monitoring.la
 
 noinst_LTLIBRARIES = $(component_noinst)
diff --git a/ompi/mca/coll/portals4/Makefile.am b/ompi/mca/coll/portals4/Makefile.am
@@ -33,7 +33,7 @@ AM_CPPFLAGS = $(coll_portals4_CPPFLAGS)
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_portals4_la_SOURCES = $(local_sources)
-mca_coll_portals4_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_coll_portals4_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
 	$(coll_portals4_LIBS)
 mca_coll_portals4_la_LDFLAGS = -module -avoid-version $(coll_portals4_LDFLAGS)
 
diff --git a/ompi/mca/coll/self/Makefile.am b/ompi/mca/coll/self/Makefile.am
@@ -55,7 +55,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_self_la_SOURCES = $(sources)
 mca_coll_self_la_LDFLAGS = -module -avoid-version
-mca_coll_self_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_coll_self_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_self_la_SOURCES =$(sources)
diff --git a/ompi/mca/coll/sync/Makefile.am b/ompi/mca/coll/sync/Makefile.am
@@ -46,7 +46,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_sync_la_SOURCES = $(sources)
 mca_coll_sync_la_LDFLAGS = -module -avoid-version
-mca_coll_sync_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_coll_sync_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_sync_la_SOURCES =$(sources)
diff --git a/ompi/mca/coll/tuned/Makefile.am b/ompi/mca/coll/tuned/Makefile.am
@@ -61,7 +61,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_tuned_la_SOURCES = $(sources)
 mca_coll_tuned_la_LDFLAGS = -module -avoid-version
-mca_coll_tuned_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_coll_tuned_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_tuned_la_SOURCES =$(sources)
diff --git a/ompi/mca/coll/ucc/Makefile.am b/ompi/mca/coll/ucc/Makefile.am
@@ -50,7 +50,7 @@ endif
 mcacomponentdir          = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_ucc_la_SOURCES  = $(coll_ucc_sources)
-mca_coll_ucc_la_LIBADD   = $(top_builddir)/ompi/libopen-mpi.la \
+mca_coll_ucc_la_LIBADD   = $(top_builddir)/ompi/libopen_mpi.la \
 	                     $(coll_ucc_LIBS)
 mca_coll_ucc_la_LDFLAGS  = -module -avoid-version $(coll_ucc_LDFLAGS)
 
diff --git a/ompi/mca/coll/xhc/Makefile.am b/ompi/mca/coll/xhc/Makefile.am
@@ -40,7 +40,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_xhc_la_SOURCES = $(sources)
 mca_coll_xhc_la_LDFLAGS = -module -avoid-version
-mca_coll_xhc_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
+mca_coll_xhc_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_xhc_la_SOURCES = $(sources)
diff --git a/ompi/mca/common/monitoring/Makefile.am b/ompi/mca/common/monitoring/Makefile.am
@@ -34,7 +34,7 @@ endif
 ompi_monitoring_prof_la_LDFLAGS= \
     -module -avoid-version -shared $(WRAPPER_EXTRA_LDFLAGS)
 ompi_monitoring_prof_la_LIBADD = \
-    $(top_builddir)/ompi/libopen-mpi.la \
+    $(top_builddir)/ompi/libopen_mpi.la \
     $(top_builddir)/opal/lib@OPAL_LIB_NAME@.la
 
 if OPAL_INSTALL_BINARIES
diff --git a/ompi/mca/fbtl/ime/Makefile.am b/ompi/mca/fbtl/ime/Makefile.am
@@ -30,11 +30,11 @@ AM_CPPFLAGS = $(fbtl_ime_CPPFLAGS)
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fbtl_ime_la_SOURCES = $(fbtl_ime_sources)
-mca_fbtl_ime_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_fbtl_ime_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
 	$(fbtl_ime_LIBS)
 mca_fbtl_ime_la_LDFLAGS = -module -avoid-version $(fbtl_ime_LDFLAGS)
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_fbtl_ime_la_SOURCES = $(fbtl_ime_sources)
 libmca_fbtl_ime_la_LIBADD = $(fbtl_ime_LIBS)
-libmca_fbtl_ime_la_LDFLAGS = -module -avoid-version $(fbtl_ime_LDFLAGS)
+libmca_fbtl_ime_la_LDFLAGS = -module -avoid-version $(fbtl_ime_LDFLAGS)
diff --git a/ompi/mca/fbtl/posix/Makefile.am b/ompi/mca/fbtl/posix/Makefile.am
@@ -34,7 +34,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fbtl_posix_la_SOURCES = $(sources)
 mca_fbtl_posix_la_LDFLAGS = -module -avoid-version
-mca_fbtl_posix_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_fbtl_posix_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
     $(OMPI_TOP_BUILDDIR)/ompi/mca/common/ompio/libmca_common_ompio.la
 
 noinst_LTLIBRARIES = $(component_noinst)
diff --git a/ompi/mca/fs/ime/Makefile.am b/ompi/mca/fs/ime/Makefile.am
@@ -37,11 +37,11 @@ AM_CPPFLAGS = $(fs_ime_CPPFLAGS)
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fs_ime_la_SOURCES = $(fs_ime_sources)
-mca_fs_ime_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_fs_ime_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
         $(fs_ime_LIBS)
 mca_fs_ime_la_LDFLAGS = -module -avoid-version $(fs_ime_LDFLAGS)
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_fs_ime_la_SOURCES = $(fs_ime_sources)
 libmca_fs_ime_la_LIBADD =  $(fs_ime_LIBS)
-libmca_fs_ime_la_LDFLAGS = -module -avoid-version $(fs_ime_LDFLAGS)
+libmca_fs_ime_la_LDFLAGS = -module -avoid-version $(fs_ime_LDFLAGS)
diff --git a/ompi/mca/fs/lustre/Makefile.am b/ompi/mca/fs/lustre/Makefile.am
@@ -43,7 +43,7 @@ AM_CPPFLAGS = $(fs_lustre_CPPFLAGS)
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fs_lustre_la_SOURCES = $(fs_lustre_sources)
-mca_fs_lustre_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_fs_lustre_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
 	$(fs_lustre_LIBS)
 mca_fs_lustre_la_LDFLAGS = -module -avoid-version $(fs_lustre_LDFLAGS)
 
diff --git a/ompi/mca/fs/ufs/Makefile.am b/ompi/mca/fs/ufs/Makefile.am
@@ -34,7 +34,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fs_ufs_la_SOURCES = $(sources)
 mca_fs_ufs_la_LDFLAGS = -module -avoid-version
-mca_fs_ufs_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_fs_ufs_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_fs_ufs_la_SOURCES = $(sources)
diff --git a/ompi/mca/mtl/ofi/Makefile.am b/ompi/mca/mtl/ofi/Makefile.am
@@ -81,7 +81,7 @@ mca_mtl_ofi_la_SOURCES = $(mtl_ofi_sources)
 mca_mtl_ofi_la_LDFLAGS = \
         $(mtl_ofi_LDFLAGS) \
         -module -avoid-version
-mca_mtl_ofi_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_mtl_ofi_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
         $(OPAL_TOP_BUILDDIR)/opal/mca/common/ofi/lib@OPAL_LIB_NAME@mca_common_ofi.la \
         $(mtl_ofi_LIBS)
 
diff --git a/ompi/mca/mtl/portals4/Makefile.am b/ompi/mca/mtl/portals4/Makefile.am
@@ -60,7 +60,7 @@ endif
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mtl_portals4_la_SOURCES = $(local_sources)
-mca_mtl_portals4_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_mtl_portals4_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
 	$(mtl_portals4_LIBS)
 mca_mtl_portals4_la_LDFLAGS = -module -avoid-version $(mtl_portals4_LDFLAGS)
 
diff --git a/ompi/mca/mtl/psm2/Makefile.am b/ompi/mca/mtl/psm2/Makefile.am
@@ -59,7 +59,7 @@ endif
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_mtl_psm2_la_SOURCES = $(mtl_psm2_sources)
-mca_mtl_psm2_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_mtl_psm2_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
 	$(mtl_psm2_LIBS)
 mca_mtl_psm2_la_LDFLAGS = -module -avoid-version $(mtl_psm2_LDFLAGS)
 
diff --git a/ompi/mca/op/aarch64/Makefile.am b/ompi/mca/op/aarch64/Makefile.am
@@ -68,7 +68,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_op_aarch64_la_SOURCES = $(sources)
 mca_op_aarch64_la_LIBADD = $(specialized_op_libs)
-mca_op_aarch64_la_LDFLAGS = -module -avoid-version $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
+mca_op_aarch64_la_LDFLAGS = -module -avoid-version $(top_builddir)/ompi/libopen_mpi.la
 
 
 # Specific information for static builds.
diff --git a/ompi/mca/op/avx/Makefile.am b/ompi/mca/op/avx/Makefile.am
@@ -86,7 +86,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_op_avx_la_SOURCES = $(sources)
 mca_op_avx_la_LIBADD = $(specialized_op_libs)
-mca_op_avx_la_LDFLAGS = -module -avoid-version $(top_builddir)/ompi/libopen-mpi.la
+mca_op_avx_la_LDFLAGS = -module -avoid-version $(top_builddir)/ompi/libopen_mpi.la
 
 
 # Specific information for static builds.
diff --git a/ompi/mca/op/example/Makefile.am b/ompi/mca/op/example/Makefile.am
@@ -71,7 +71,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_op_example_la_SOURCES = $(component_sources)
 mca_op_example_la_LDFLAGS = -module -avoid-version
-mca_op_example_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_op_example_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 # Specific information for static builds.
 #
diff --git a/ompi/mca/osc/monitoring/Makefile.am b/ompi/mca/osc/monitoring/Makefile.am
@@ -31,7 +31,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_osc_monitoring_la_SOURCES = $(monitoring_sources)
 mca_osc_monitoring_la_LDFLAGS = -module -avoid-version
-mca_osc_monitoring_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_osc_monitoring_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
 		$(OMPI_TOP_BUILDDIR)/ompi/mca/common/monitoring/libmca_common_monitoring.la
 
 noinst_LTLIBRARIES = $(component_noinst)
diff --git a/ompi/mca/osc/portals4/Makefile.am b/ompi/mca/osc/portals4/Makefile.am
@@ -36,7 +36,7 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_osc_portals4_la_SOURCES = $(portals4_sources)
-mca_osc_portals4_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_osc_portals4_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
 	$(osc_portals4_LIBS)
 mca_osc_portals4_la_LDFLAGS = -module -avoid-version $(osc_portals4_LDFLAGS)
 
diff --git a/ompi/mca/osc/rdma/Makefile.am b/ompi/mca/osc/rdma/Makefile.am
@@ -63,7 +63,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_osc_rdma_la_SOURCES = $(rdma_sources)
 mca_osc_rdma_la_LDFLAGS = -module -avoid-version
-mca_osc_rdma_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_osc_rdma_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_osc_rdma_la_SOURCES = $(rdma_sources)
diff --git a/ompi/mca/osc/sm/Makefile.am b/ompi/mca/osc/sm/Makefile.am
@@ -34,7 +34,7 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_osc_sm_la_SOURCES = $(sm_sources)
-mca_osc_sm_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_osc_sm_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
 	$(osc_sm_LIBS)
 mca_osc_sm_la_LDFLAGS = -module -avoid-version $(osc_sm_LDFLAGS)
 
diff --git a/ompi/mca/osc/ucx/Makefile.am b/ompi/mca/osc/ucx/Makefile.am
@@ -34,7 +34,7 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_osc_ucx_la_SOURCES = $(ucx_sources)
-mca_osc_ucx_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la $(osc_ucx_LIBS) \
+mca_osc_ucx_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la $(osc_ucx_LIBS) \
                         $(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)
 
diff --git a/ompi/mca/part/persist/Makefile.am b/ompi/mca/part/persist/Makefile.am
@@ -42,7 +42,7 @@ local_sources = \
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_part_persist_la_SOURCES = $(local_sources)
-mca_part_persist_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_part_persist_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
 	$(part_persist_LIBS)
 mca_part_persist_la_LDFLAGS = -module -avoid-version $(part_persist_LDFLAGS)
 
diff --git a/ompi/mca/pml/cm/Makefile.am b/ompi/mca/pml/cm/Makefile.am
@@ -43,7 +43,7 @@ local_sources = \
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_cm_la_SOURCES = $(local_sources)
-mca_pml_cm_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_pml_cm_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
 	$(pml_cm_LIBS)
 mca_pml_cm_la_LDFLAGS = -module -avoid-version $(pml_cm_LDFLAGS)
 
diff --git a/ompi/mca/pml/example/Makefile.am b/ompi/mca/pml/example/Makefile.am
@@ -53,7 +53,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_example_la_SOURCES = $(local_sources)
 mca_pml_example_la_LDFLAGS = -module -avoid-version
-mca_pml_example_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_pml_example_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pml_example_la_SOURCES = $(local_sources)
diff --git a/ompi/mca/pml/monitoring/Makefile.am b/ompi/mca/pml/monitoring/Makefile.am
@@ -32,7 +32,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_monitoring_la_SOURCES = $(monitoring_sources)
 mca_pml_monitoring_la_LDFLAGS = -module -avoid-version
-mca_pml_monitoring_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
+mca_pml_monitoring_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la \
 	$(OMPI_TOP_BUILDDIR)/ompi/mca/common/monitoring/libmca_common_monitoring.la
 
 noinst_LTLIBRARIES = $(component_noinst)
diff --git a/ompi/mca/pml/ob1/Makefile.am b/ompi/mca/pml/ob1/Makefile.am
@@ -72,7 +72,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_ob1_la_SOURCES = $(ob1_sources)
 mca_pml_ob1_la_LDFLAGS = -module -avoid-version
 
-mca_pml_ob1_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_pml_ob1_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pml_ob1_la_SOURCES = $(ob1_sources)
diff --git a/ompi/mca/pml/ucx/Makefile.am b/ompi/mca/pml/ucx/Makefile.am
@@ -37,7 +37,7 @@ endif
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_ucx_la_SOURCES = $(local_sources)
-mca_pml_ucx_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la $(pml_ucx_LIBS) \
+mca_pml_ucx_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la $(pml_ucx_LIBS) \
                         $(OPAL_TOP_BUILDDIR)/opal/mca/common/ucx/lib@OPAL_LIB_NAME@mca_common_ucx.la
 mca_pml_ucx_la_LDFLAGS = -module -avoid-version $(pml_ucx_LDFLAGS)
 
diff --git a/ompi/mca/pml/v/Makefile.am b/ompi/mca/pml/v/Makefile.am
@@ -32,7 +32,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_pml_v_la_SOURCES = $(local_sources)
 mca_pml_v_la_LDFLAGS = -module -avoid-version
-mca_pml_v_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_pml_v_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_pml_v_la_SOURCES = $(local_sources)
diff --git a/ompi/mca/topo/basic/Makefile.am b/ompi/mca/topo/basic/Makefile.am
@@ -37,7 +37,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_topo_basic_la_SOURCES = $(component_sources)
 mca_topo_basic_la_LDFLAGS = -module -avoid-version
-mca_topo_basic_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_topo_basic_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(lib)
 libmca_topo_basic_la_SOURCES = $(lib_sources)
diff --git a/ompi/mca/topo/example/Makefile.am b/ompi/mca/topo/example/Makefile.am
@@ -46,7 +46,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_topo_example_la_SOURCES = $(component_sources)
 mca_topo_example_la_LDFLAGS = -module -avoid-version
-mca_topo_example_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_topo_example_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 
 noinst_LTLIBRARIES = $(lib)
 libmca_topo_example_la_SOURCES = $(lib_sources)
diff --git a/ompi/mca/topo/treematch/Makefile.am b/ompi/mca/topo/treematch/Makefile.am
@@ -43,7 +43,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_topo_treematch_la_SOURCES = $(component_sources)
 mca_topo_treematch_la_LDFLAGS = -module -avoid-version $(topo_treematch_LDFLAGS)
-mca_topo_treematch_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la $(topo_treematch_LIBS)
+mca_topo_treematch_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la $(topo_treematch_LIBS)
 
 noinst_LTLIBRARIES = $(lib)
 libmca_topo_treematch_la_SOURCES = $(lib_sources)
diff --git a/ompi/mca/vprotocol/example/Makefile.am b/ompi/mca/vprotocol/example/Makefile.am
@@ -37,7 +37,7 @@ local_sources = \
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_vprotocol_example_la_SOURCES = $(local_sources)
-mca_vprotocol_example_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
+mca_vprotocol_example_la_LIBADD = $(top_builddir)/ompi/libopen_mpi.la
 mca_vprotocol_example_la_CFLAGS =
 mca_vprotocol_example_la_LDFLAGS = -module -avoid-version
 
diff --git a/ompi/mca/vprotocol/pessimist/Makefile.am b/ompi/mca/vprotocol/pessimist/Makefile.am
