Cleanup the moved component's Makefile.am to use the opal instead of ompi directories

This commit was SVN r32370.
2014-07-31 04:41:04 +00:00 · 2014-07-31 04:41:04 +00:00 · db89071dc2
--- 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

--- 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
--- 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
--- 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
--- 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 \
--- 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)
--- 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 = \
--- 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)
--- 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
--- 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)
--- 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)
--- 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)
--- 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
--- 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)
--- 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)
--- 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)
--- 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
--- 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 = \
--- 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
--- 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) 
--- 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
--- 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:
--- 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
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)