From db89071dc246aa9ea44807cc543db524ddb636e8 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 31 Jul 2014 04:41:04 +0000 Subject: [PATCH] Cleanup the moved component's Makefile.am to use the opal instead of ompi directories This commit was SVN r32370. --- opal/mca/allocator/Makefile.am | 2 +- opal/mca/allocator/basic/Makefile.am | 2 +- opal/mca/allocator/bucket/Makefile.am | 2 +- opal/mca/btl/Makefile.am | 4 ++-- opal/mca/btl/base/Makefile.am | 2 +- opal/mca/btl/openib/Makefile.am | 12 ++++++------ opal/mca/btl/portals4/Makefile.am | 2 +- opal/mca/btl/scif/Makefile.am | 2 +- opal/mca/btl/self/Makefile.am | 2 +- opal/mca/btl/sm/Makefile.am | 6 +++--- opal/mca/btl/smcuda/Makefile.am | 8 ++++---- opal/mca/btl/tcp/Makefile.am | 6 +++--- opal/mca/btl/template/Makefile.am | 2 +- opal/mca/btl/ugni/Makefile.am | 2 +- opal/mca/btl/usnic/Makefile.am | 6 +++--- opal/mca/btl/vader/Makefile.am | 4 ++-- opal/mca/common/cuda/Makefile.am | 2 +- opal/mca/common/ofacm/Makefile.am | 2 +- opal/mca/common/sm/Makefile.am | 2 +- opal/mca/common/ugni/Makefile.am | 2 +- opal/mca/common/verbs/Makefile.am | 8 ++++---- opal/mca/mpool/Makefile.am | 2 +- opal/mca/mpool/base/Makefile.am | 2 +- opal/mca/mpool/gpusm/Makefile.am | 4 ++-- opal/mca/mpool/grdma/Makefile.am | 4 ++-- opal/mca/mpool/rgpusm/Makefile.am | 4 ++-- opal/mca/mpool/sm/Makefile.am | 6 +++--- opal/mca/mpool/udreg/Makefile.am | 2 +- opal/mca/rcache/vma/Makefile.am | 2 +- 29 files changed, 53 insertions(+), 53 deletions(-) diff --git a/opal/mca/allocator/Makefile.am b/opal/mca/allocator/Makefile.am index c51ea97d25..e8c1be97c5 100644 --- a/opal/mca/allocator/Makefile.am +++ b/opal/mca/allocator/Makefile.am @@ -27,7 +27,7 @@ libmca_allocator_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -opaldir = $(ompiincludedir)/$(subdir) +opaldir = $(opalincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) endif diff --git a/opal/mca/allocator/basic/Makefile.am b/opal/mca/allocator/basic/Makefile.am index 215c044340..2ff200ad1c 100644 --- a/opal/mca/allocator/basic/Makefile.am +++ b/opal/mca/allocator/basic/Makefile.am @@ -33,7 +33,7 @@ component_noinst = libmca_allocator_basic.la component_install = endif -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_allocator_basic_la_SOURCES = $(sources) mca_allocator_basic_la_LDFLAGS = -module -avoid-version diff --git a/opal/mca/allocator/bucket/Makefile.am b/opal/mca/allocator/bucket/Makefile.am index 7e8d5084cd..dac7e6d0aa 100644 --- a/opal/mca/allocator/bucket/Makefile.am +++ b/opal/mca/allocator/bucket/Makefile.am @@ -34,7 +34,7 @@ component_noinst = libmca_allocator_bucket.la component_install = endif -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_allocator_bucket_la_SOURCES = $(sources) mca_allocator_bucket_la_LDFLAGS = -module -avoid-version diff --git a/opal/mca/btl/Makefile.am b/opal/mca/btl/Makefile.am index 513bc02ea4..976dab28d0 100644 --- a/opal/mca/btl/Makefile.am +++ b/opal/mca/btl/Makefile.am @@ -29,8 +29,8 @@ libmca_btl_la_SOURCES += $(headers) # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(ompiincludedir)/$(subdir) -nobase_ompi_HEADERS = $(headers) +opaldir = $(opalincludedir)/$(subdir) +nobase_opal_HEADERS = $(headers) endif include base/Makefile.am diff --git a/opal/mca/btl/base/Makefile.am b/opal/mca/btl/base/Makefile.am index dafe14be62..26de26c1ae 100644 --- a/opal/mca/btl/base/Makefile.am +++ b/opal/mca/btl/base/Makefile.am @@ -16,7 +16,7 @@ # $HEADER$ # -dist_ompidata_DATA = base/help-mpi-btl-base.txt +dist_opaldata_DATA = base/help-mpi-btl-base.txt headers += \ base/base.h \ diff --git a/opal/mca/btl/openib/Makefile.am b/opal/mca/btl/openib/Makefile.am index 4863196c5c..dd21e15755 100644 --- a/opal/mca/btl/openib/Makefile.am +++ b/opal/mca/btl/openib/Makefile.am @@ -29,7 +29,7 @@ LEX_OUTPUT_ROOT = lex.btl_openib_ini_yy amca_paramdir = $(AMCA_PARAM_SETS_DIR) dist_amca_param_DATA = btl-openib-benchmark -dist_ompidata_DATA = \ +dist_opaldata_DATA = \ help-mpi-btl-openib.txt \ connect/help-mpi-btl-openib-cpc-base.txt \ mca-btl-openib-device-params.ini @@ -78,7 +78,7 @@ sources += \ connect/btl_openib_connect_rdmacm.c \ connect/btl_openib_connect_rdmacm.h -dist_ompidata_DATA += connect/help-mpi-btl-openib-cpc-rdmacm.txt +dist_opaldata_DATA += connect/help-mpi-btl-openib-cpc-rdmacm.txt endif # If we have udcm support, build that CPC @@ -87,7 +87,7 @@ sources += \ connect/btl_openib_connect_udcm.c \ connect/btl_openib_connect_udcm.h -# dist_ompidata_DATA += connect/help-mpi-btl-openib-cpc-ud.txt +# dist_opaldata_DATA += connect/help-mpi-btl-openib-cpc-ud.txt endif # If we have dynamic SL support, build those files @@ -113,15 +113,15 @@ component = component_sources = endif -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) 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) \ - $(OMPI_TOP_BUILDDIR)/opal/mca/common/verbs/libmca_common_verbs.la + $(OPAL_TOP_BUILDDIR)/opal/mca/common/verbs/libmca_common_verbs.la if OPAL_cuda_support mca_btl_openib_la_LIBADD += \ - $(OMPI_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la + $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la endif noinst_LTLIBRARIES = $(lib) diff --git a/opal/mca/btl/portals4/Makefile.am b/opal/mca/btl/portals4/Makefile.am index 5da99481c7..00256372a0 100644 --- a/opal/mca/btl/portals4/Makefile.am +++ b/opal/mca/btl/portals4/Makefile.am @@ -43,7 +43,7 @@ local_sources = \ btl_portals4_recv.h \ btl_portals4_send.c -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_btl_portals4_la_SOURCES = $(local_sources) mca_btl_portals4_la_LIBADD = \ diff --git a/opal/mca/btl/scif/Makefile.am b/opal/mca/btl/scif/Makefile.am index bc4a3a2370..4a0ea7da32 100644 --- a/opal/mca/btl/scif/Makefile.am +++ b/opal/mca/btl/scif/Makefile.am @@ -35,7 +35,7 @@ scif_SOURCES = \ btl_scif_get.c \ btl_scif.h -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_btl_scif_la_SOURCES = $(scif_SOURCES) nodist_mca_btl_scif_la_SOURCES = $(scif_nodist_SOURCES) diff --git a/opal/mca/btl/self/Makefile.am b/opal/mca/btl/self/Makefile.am index a3aadce2e9..4cecee7c6c 100644 --- a/opal/mca/btl/self/Makefile.am +++ b/opal/mca/btl/self/Makefile.am @@ -36,7 +36,7 @@ component_noinst = libmca_btl_self.la component_install = endif -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_btl_self_la_SOURCES = $(libmca_btl_self_la_sources) mca_btl_self_la_LDFLAGS = -module -avoid-version diff --git a/opal/mca/btl/sm/Makefile.am b/opal/mca/btl/sm/Makefile.am index 10d6d90469..67b399a624 100644 --- a/opal/mca/btl/sm/Makefile.am +++ b/opal/mca/btl/sm/Makefile.am @@ -17,7 +17,7 @@ # $HEADER$ # -dist_ompidata_DATA = help-mpi-btl-sm.txt +dist_opaldata_DATA = help-mpi-btl-sm.txt libmca_btl_sm_la_sources = \ btl_sm.c \ @@ -43,12 +43,12 @@ endif # See opal/mca/common/sm/Makefile.am for an explanation of # libmca_common_sm.la. -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) 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 = \ - $(OMPI_TOP_BUILDDIR)/opal/mca/common/sm/libmca_common_sm.la + $(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/libmca_common_sm.la mca_btl_sm_la_CPPFLAGS = $(btl_sm_CPPFLAGS) noinst_LTLIBRARIES = $(component_noinst) diff --git a/opal/mca/btl/smcuda/Makefile.am b/opal/mca/btl/smcuda/Makefile.am index e2c6399989..ad86dd5e51 100644 --- a/opal/mca/btl/smcuda/Makefile.am +++ b/opal/mca/btl/smcuda/Makefile.am @@ -18,7 +18,7 @@ # $HEADER$ # -dist_ompidata_DATA = help-mpi-btl-smcuda.txt +dist_opaldata_DATA = help-mpi-btl-smcuda.txt libmca_btl_smcuda_la_sources = \ btl_smcuda.c \ @@ -44,16 +44,16 @@ endif # See opal/mca/common/cuda/Makefile.am for an explanation of # libmca_common_sm.la. -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) 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 = \ - $(OMPI_TOP_BUILDDIR)/opal/mca/common/sm/libmca_common_sm.la + $(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/libmca_common_sm.la mca_btl_smcuda_la_CPPFLAGS = $(btl_smcuda_CPPFLAGS) if OPAL_cuda_support mca_btl_smcuda_la_LIBADD += \ - $(OMPI_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la + $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la endif noinst_LTLIBRARIES = $(component_noinst) diff --git a/opal/mca/btl/tcp/Makefile.am b/opal/mca/btl/tcp/Makefile.am index adc815c98e..cbaad4a111 100644 --- a/opal/mca/btl/tcp/Makefile.am +++ b/opal/mca/btl/tcp/Makefile.am @@ -18,7 +18,7 @@ # $HEADER$ # -dist_ompidata_DATA = help-mpi-btl-tcp.txt +dist_opaldata_DATA = help-mpi-btl-tcp.txt sources = \ btl_tcp.c \ @@ -51,13 +51,13 @@ component = component_sources = endif -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component) mca_btl_tcp_la_SOURCES = $(component_sources) mca_btl_tcp_la_LDFLAGS = -module -avoid-version if OPAL_cuda_support mca_btl_tcp_la_LIBADD = \ - $(OMPI_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la + $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la endif noinst_LTLIBRARIES = $(lib) diff --git a/opal/mca/btl/template/Makefile.am b/opal/mca/btl/template/Makefile.am index 82bbf09efc..2a7a074a9a 100644 --- a/opal/mca/btl/template/Makefile.am +++ b/opal/mca/btl/template/Makefile.am @@ -47,7 +47,7 @@ component = component_sources = endif -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component) mca_btl_template_la_SOURCES = $(component_sources) mca_btl_template_la_LDFLAGS = -module -avoid-version diff --git a/opal/mca/btl/ugni/Makefile.am b/opal/mca/btl/ugni/Makefile.am index ce33d38406..39d9cd36dd 100644 --- a/opal/mca/btl/ugni/Makefile.am +++ b/opal/mca/btl/ugni/Makefile.am @@ -40,7 +40,7 @@ ugni_SOURCES = \ btl_ugni_smsg.c \ btl_ugni_prepare.h -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_btl_ugni_la_SOURCES = $(ugni_SOURCES) nodist_mca_btl_ugni_la_SOURCES = $(ugni_nodist_SOURCES) diff --git a/opal/mca/btl/usnic/Makefile.am b/opal/mca/btl/usnic/Makefile.am index f14b70c5b8..6ad76529e1 100644 --- a/opal/mca/btl/usnic/Makefile.am +++ b/opal/mca/btl/usnic/Makefile.am @@ -24,7 +24,7 @@ AM_CFLAGS = $(btl_usnic_CFLAGS) EXTRA_DIST = README.txt README.test -dist_ompidata_DATA = \ +dist_opaldata_DATA = \ help-mpi-btl-usnic.txt test_sources = \ @@ -99,12 +99,12 @@ component = component_sources = endif -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) 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) \ - $(OMPI_TOP_BUILDDIR)/opal/mca/common/verbs/libmca_common_verbs.la + $(OPAL_TOP_BUILDDIR)/opal/mca/common/verbs/libmca_common_verbs.la noinst_LTLIBRARIES = $(lib) libmca_btl_usnic_la_SOURCES = $(lib_sources) diff --git a/opal/mca/btl/vader/Makefile.am b/opal/mca/btl/vader/Makefile.am index dfb662661b..94f11a0e22 100644 --- a/opal/mca/btl/vader/Makefile.am +++ b/opal/mca/btl/vader/Makefile.am @@ -21,7 +21,7 @@ AM_CPPFLAGS = $(btl_vader_CPPFLAGS) -dist_ompidata_DATA = help-mpi-btl-vader.txt +dist_opaldata_DATA = help-mpi-btl-vader.txt libmca_btl_vader_la_sources = \ btl_vader_module.c \ @@ -54,7 +54,7 @@ endif # See opal/mca/common/vader/Makefile.am for an explanation of # libmca_common_vader.la. -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_btl_vader_la_SOURCES = $(libmca_btl_vader_la_sources) mca_btl_vader_la_LDFLAGS = -module -avoid-version $(btl_vader_LDFLAGS) diff --git a/opal/mca/common/cuda/Makefile.am b/opal/mca/common/cuda/Makefile.am index c70ba4c2d5..ac91d6b06e 100644 --- a/opal/mca/common/cuda/Makefile.am +++ b/opal/mca/common/cuda/Makefile.am @@ -52,7 +52,7 @@ headers = \ sources = \ common_cuda.c -dist_ompidata_DATA = help-mpi-common-cuda.txt +dist_opaldata_DATA = help-mpi-common-cuda.txt # As per above, we'll either have an installable or noinst result. # The installable one should follow the same MCA prefix naming rules diff --git a/opal/mca/common/ofacm/Makefile.am b/opal/mca/common/ofacm/Makefile.am index a483b15c4a..be07a3c4b1 100644 --- a/opal/mca/common/ofacm/Makefile.am +++ b/opal/mca/common/ofacm/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = $(common_ofacm_CPPFLAGS) -dist_ompidata_DATA = \ +dist_opaldata_DATA = \ help-mpi-common-ofacm-base.txt \ help-mpi-common-ofacm-oob.txt headers = \ diff --git a/opal/mca/common/sm/Makefile.am b/opal/mca/common/sm/Makefile.am index 9cefac9eeb..b852cf50ca 100644 --- a/opal/mca/common/sm/Makefile.am +++ b/opal/mca/common/sm/Makefile.am @@ -53,7 +53,7 @@ sources = \ # Help file -dist_ompidata_DATA = help-mpi-common-sm.txt +dist_opaldata_DATA = help-mpi-common-sm.txt # As per above, we'll either have an installable or noinst result. # The installable one should follow the same MCA prefix naming rules diff --git a/opal/mca/common/ugni/Makefile.am b/opal/mca/common/ugni/Makefile.am index 4e7ff391e5..ec26c5d6a3 100644 --- a/opal/mca/common/ugni/Makefile.am +++ b/opal/mca/common/ugni/Makefile.am @@ -30,7 +30,7 @@ headers = common_ugni.h \ ugni_SOURCES = common_ugni.c \ common_ugni_ep.c -mcacomponentdir = $(ompilibdir) +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) diff --git a/opal/mca/common/verbs/Makefile.am b/opal/mca/common/verbs/Makefile.am index 05f689348e..e8f6a9bde5 100644 --- a/opal/mca/common/verbs/Makefile.am +++ b/opal/mca/common/verbs/Makefile.am @@ -23,7 +23,7 @@ sources = \ common_verbs_port.c \ common_verbs_qp_type.c -dist_ompidata_DATA = \ +dist_opaldata_DATA = \ help-opal-common-verbs.txt # To simplify components that link to this library, we will *always* @@ -58,10 +58,10 @@ libmca_common_verbs_noinst_la_SOURCES = $(libmca_common_verbs_la_SOURCES) # Conditionally install the header files if WANT_INSTALL_HEADERS -ompidir = $(ompiincludedir)/ompi/mca/common/verbs -ompi_HEADERS = $(headers) +opaldir = $(opalincludedir)/opal/mca/common/verbs +opal_HEADERS = $(headers) else -ompidir = $(includedir) +opaldir = $(includedir) endif # These two rules will sym link the "noinst" libtool library filename diff --git a/opal/mca/mpool/Makefile.am b/opal/mca/mpool/Makefile.am index 8a3fd17a9f..773d96e1a9 100644 --- a/opal/mca/mpool/Makefile.am +++ b/opal/mca/mpool/Makefile.am @@ -31,7 +31,7 @@ opaldir = $(opalincludedir)/$(subdir) nobase_opal_HEADERS = $(headers) endif -dist_ompidata_DATA = +dist_opaldata_DATA = include base/Makefile.am distclean-local: diff --git a/opal/mca/mpool/base/Makefile.am b/opal/mca/mpool/base/Makefile.am index 9df33ceb55..64c3e02558 100644 --- a/opal/mca/mpool/base/Makefile.am +++ b/opal/mca/mpool/base/Makefile.am @@ -29,5 +29,5 @@ libmca_mpool_la_SOURCES += \ base/mpool_base_mem_cb.c \ base/mpool_base_tree.c -dist_ompidata_DATA += \ +dist_opaldata_DATA += \ base/help-mpool-base.txt diff --git a/opal/mca/mpool/gpusm/Makefile.am b/opal/mca/mpool/gpusm/Makefile.am index fbfeb5a187..6bff00b3e5 100644 --- a/opal/mca/mpool/gpusm/Makefile.am +++ b/opal/mca/mpool/gpusm/Makefile.am @@ -41,14 +41,14 @@ component_noinst = libmca_mpool_gpusm.la component_install = endif -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_mpool_gpusm_la_SOURCES = $(sources) 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 += \ - $(OMPI_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la + $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la endif noinst_LTLIBRARIES = $(component_noinst) diff --git a/opal/mca/mpool/grdma/Makefile.am b/opal/mca/mpool/grdma/Makefile.am index 996d4d0ea8..8135c927d2 100644 --- a/opal/mca/mpool/grdma/Makefile.am +++ b/opal/mca/mpool/grdma/Makefile.am @@ -42,14 +42,14 @@ component_noinst = libmca_mpool_grdma.la component_install = endif -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_mpool_grdma_la_SOURCES = $(sources) 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 += \ - $(OMPI_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la + $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la endif noinst_LTLIBRARIES = $(component_noinst) diff --git a/opal/mca/mpool/rgpusm/Makefile.am b/opal/mca/mpool/rgpusm/Makefile.am index 8ace351221..e55b31ed68 100644 --- a/opal/mca/mpool/rgpusm/Makefile.am +++ b/opal/mca/mpool/rgpusm/Makefile.am @@ -41,14 +41,14 @@ component_noinst = libmca_mpool_rgpusm.la component_install = endif -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_mpool_rgpusm_la_SOURCES = $(sources) 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 += \ - $(OMPI_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la + $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la endif noinst_LTLIBRARIES = $(component_noinst) diff --git a/opal/mca/mpool/sm/Makefile.am b/opal/mca/mpool/sm/Makefile.am index 2d877f1f78..824bf6816d 100644 --- a/opal/mca/mpool/sm/Makefile.am +++ b/opal/mca/mpool/sm/Makefile.am @@ -38,15 +38,15 @@ endif # See opal/mca/common/sm/Makefile.am for an explanation of # libmca_common_sm.la. -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_mpool_sm_la_SOURCES = $(sources) mca_mpool_sm_la_LDFLAGS = -module -avoid-version mca_mpool_sm_la_LIBADD = \ - $(OMPI_TOP_BUILDDIR)/opal/mca/common/sm/libmca_common_sm.la + $(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/libmca_common_sm.la if OPAL_cuda_support mca_mpool_sm_la_LIBADD += \ - $(OMPI_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la + $(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/libmca_common_cuda.la endif noinst_LTLIBRARIES = $(component_noinst) diff --git a/opal/mca/mpool/udreg/Makefile.am b/opal/mca/mpool/udreg/Makefile.am index 025f9718b2..dae4519606 100644 --- a/opal/mca/mpool/udreg/Makefile.am +++ b/opal/mca/mpool/udreg/Makefile.am @@ -40,7 +40,7 @@ component_noinst = libmca_mpool_udreg.la component_install = endif -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_mpool_udreg_la_SOURCES = $(sources) mca_mpool_udreg_la_LDFLAGS = -module -avoid-version $(mpool_udreg_LDFLAGS) diff --git a/opal/mca/rcache/vma/Makefile.am b/opal/mca/rcache/vma/Makefile.am index 8083e5e598..f358b6bfe9 100644 --- a/opal/mca/rcache/vma/Makefile.am +++ b/opal/mca/rcache/vma/Makefile.am @@ -40,7 +40,7 @@ component = component_sources = endif -mcacomponentdir = $(ompilibdir) +mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component) mca_rcache_vma_la_SOURCES = $(component_sources) mca_rcache_vma_la_LDFLAGS = -module -avoid-version $(rcache_vma_LDFLAGS)