From be1c8c0e2bdaa4ddc395b9bf21ae0aa01b080bbe Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Fri, 12 Jul 2019 00:17:32 -0700 Subject: [PATCH] Fix ORTE prefixes Signed-off-by: Ralph Castain --- contrib/libadd_mca_comp_update.py | 2 +- orte/Makefile.am | 12 ++++++------ orte/mca/common/alps/Makefile.am | 15 ++++++++------- orte/mca/ess/alps/Makefile.am | 2 +- orte/mca/iof/hnp/Makefile.am | 4 ++-- orte/mca/iof/orted/Makefile.am | 4 ++-- orte/mca/odls/alps/Makefile.am | 2 +- orte/mca/oob/alps/Makefile.am | 4 ++-- orte/mca/oob/tcp/Makefile.am | 2 +- orte/mca/plm/alps/Makefile.am | 2 +- orte/mca/rmaps/ppr/Makefile.am | 4 ++-- orte/mca/rmaps/rank_file/Makefile.am | 4 ++-- orte/mca/rmaps/resilient/Makefile.am | 4 ++-- orte/mca/rmaps/round_robin/Makefile.am | 4 ++-- orte/mca/rmaps/seq/Makefile.am | 4 ++-- orte/mca/rml/oob/Makefile.am | 2 +- orte/mca/routed/binomial/Makefile.am | 2 +- orte/mca/routed/debruijn/Makefile.am | 2 +- orte/mca/routed/direct/Makefile.am | 2 +- orte/mca/routed/radix/Makefile.am | 2 +- orte/mca/rtc/hwloc/Makefile.am | 4 ++-- orte/mca/schizo/alps/Makefile.am | 4 ++-- orte/mca/schizo/flux/Makefile.am | 4 ++-- orte/mca/schizo/moab/Makefile.am | 4 ++-- orte/mca/schizo/ompi/Makefile.am | 4 ++-- orte/mca/schizo/orte/Makefile.am | 4 ++-- orte/mca/schizo/slurm/Makefile.am | 4 ++-- orte/mca/state/dvm/Makefile.am | 4 ++-- orte/mca/state/orted/Makefile.am | 4 ++-- orte/orted/Makefile.am | 4 ++-- orte/orted/pmix/Makefile.am | 2 +- orte/runtime/Makefile.am | 4 ++-- orte/tools/prte/Makefile.am | 2 +- orte/tools/prte_info/Makefile.am | 2 +- orte/tools/prted/Makefile.am | 2 +- orte/tools/prun/Makefile.am | 2 +- orte/tools/wrappers/pcc.pc.in | 2 +- orte/util/Makefile.am | 2 +- 38 files changed, 69 insertions(+), 68 deletions(-) diff --git a/contrib/libadd_mca_comp_update.py b/contrib/libadd_mca_comp_update.py index e35654d577..c5bcc72cc5 100644 --- a/contrib/libadd_mca_comp_update.py +++ b/contrib/libadd_mca_comp_update.py @@ -8,7 +8,7 @@ import glob, os, re, shutil projects= {'opal' : ["$(top_builddir)/opal/libprteopen-pal.la"], - 'orte' : ["$(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la"], + 'orte' : ["$(top_builddir)/orte/libprteopen-rte.la"], 'ompi' : ["$(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la"], 'oshmem' : ["$(top_builddir)/oshmem/liboshmem.la"], } diff --git a/orte/Makefile.am b/orte/Makefile.am index 6b4ed50545..7d07587f5a 100644 --- a/orte/Makefile.am +++ b/orte/Makefile.am @@ -38,19 +38,19 @@ DIST_SUBDIRS = \ # Build the main ORTE library -lib_LTLIBRARIES = lib@ORTE_LIB_PREFIX@open-rte.la -lib@ORTE_LIB_PREFIX@open_rte_la_SOURCES = -lib@ORTE_LIB_PREFIX@open_rte_la_LIBADD = \ +lib_LTLIBRARIES = libprteopen-rte.la +libprteopen_rte_la_SOURCES = +libprteopen_rte_la_LIBADD = \ $(MCA_orte_FRAMEWORK_LIBS) \ $(ORTE_TOP_BUILDDIR)/opal/libprteopen-pal.la -lib@ORTE_LIB_PREFIX@open_rte_la_DEPENDENCIES = $(libprteopen_rte_la_LIBADD) -lib@ORTE_LIB_PREFIX@open_rte_la_LDFLAGS = -version-info $(libprteopen_rte_so_version) -lpmix +libprteopen_rte_la_DEPENDENCIES = $(libprteopen_rte_la_LIBADD) +libprteopen_rte_la_LDFLAGS = -version-info $(libprteopen_rte_so_version) -lpmix # included subdirectory Makefile.am's and appended-to variables headers = noinst_LTLIBRARIES = dist_ortedata_DATA = -lib@ORTE_LIB_PREFIX@open_rte_la_SOURCES += $(headers) +libprteopen_rte_la_SOURCES += $(headers) # Conditionally install the header files diff --git a/orte/mca/common/alps/Makefile.am b/orte/mca/common/alps/Makefile.am index e01aa93436..c6e9a9b1d6 100644 --- a/orte/mca/common/alps/Makefile.am +++ b/orte/mca/common/alps/Makefile.am @@ -2,6 +2,7 @@ # Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. # Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. # Copyright (c) 2012-2015 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2019 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -20,8 +21,8 @@ sources = \ lib_LTLIBRARIES = noinst_LTLIBRARIES = -comp_inst = lib@ORTE_LIB_PREFIX@mca_common_alps.la -comp_noinst = lib@ORTE_LIB_PREFIX@mca_common_alps_noinst.la +comp_inst = libprtemca_common_alps.la +comp_noinst = libprtemca_common_alps_noinst.la if MCA_BUILD_orte_common_alps_DSO lib_LTLIBRARIES += $(comp_inst) @@ -29,13 +30,13 @@ else noinst_LTLIBRARIES += $(comp_noinst) endif -lib@ORTE_LIB_PREFIX@mca_common_alps_la_SOURCES = $(headers) $(sources) -lib@ORTE_LIB_PREFIX@mca_common_alps_la_CPPFLAGS = $(common_alps_CPPFLAGS) -lib@ORTE_LIB_PREFIX@mca_common_alps_la_LDFLAGS = \ +libprtemca_common_alps_la_SOURCES = $(headers) $(sources) +libprtemca_common_alps_la_CPPFLAGS = $(common_alps_CPPFLAGS) +libprtemca_common_alps_la_LDFLAGS = \ -version-info $(libmca_orte_common_alps_so_version) \ $(common_alps_LDFLAGS) -lib@ORTE_LIB_PREFIX@mca_common_alps_la_LIBADD = $(common_alps_LIBS) -lib@ORTE_LIB_PREFIX@mca_common_alps_noinst_la_SOURCES = $(headers) $(sources) +libprtemca_common_alps_la_LIBADD = $(common_alps_LIBS) +libprtemca_common_alps_noinst_la_SOURCES = $(headers) $(sources) # Conditionally install the header files diff --git a/orte/mca/ess/alps/Makefile.am b/orte/mca/ess/alps/Makefile.am index b4e73c226a..f7163e1e43 100644 --- a/orte/mca/ess/alps/Makefile.am +++ b/orte/mca/ess/alps/Makefile.am @@ -45,7 +45,7 @@ mca_ess_alps_la_SOURCES = $(sources) mca_ess_alps_la_CPPFLAGS = $(ess_alps_CPPFLAGS) mca_ess_alps_la_LDFLAGS = -module -avoid-version $(ess_alps_LDFLAGS) mca_ess_alps_la_LIBADD = $(ess_alps_LIBS) \ - $(ORTE_TOP_BUILDDIR)/orte/mca/common/alps/lib@ORTE_LIB_PREFIX@mca_common_alps.la + $(ORTE_TOP_BUILDDIR)/orte/mca/common/alps/libprtemca_common_alps.la noinst_LTLIBRARIES = $(component_noinst) diff --git a/orte/mca/iof/hnp/Makefile.am b/orte/mca/iof/hnp/Makefile.am index d9a8d982e9..415f2478c3 100644 --- a/orte/mca/iof/hnp/Makefile.am +++ b/orte/mca/iof/hnp/Makefile.am @@ -11,7 +11,7 @@ # All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. -# Copyright (c) 2017-2018 Intel, Inc. All rights reserved. +# Copyright (c) 2017-2019 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -43,7 +43,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_iof_hnp_la_SOURCES = $(hnp_SOURCES) mca_iof_hnp_la_LDFLAGS = -module -avoid-version -mca_iof_hnp_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_iof_hnp_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_iof_hnp_la_SOURCES = $(hnp_SOURCES) diff --git a/orte/mca/iof/orted/Makefile.am b/orte/mca/iof/orted/Makefile.am index e578fb55ff..6ec3c72438 100644 --- a/orte/mca/iof/orted/Makefile.am +++ b/orte/mca/iof/orted/Makefile.am @@ -11,7 +11,7 @@ # All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. -# Copyright (c) 2017-2018 Intel, Inc. All rights reserved. +# Copyright (c) 2017-2019 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -42,7 +42,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_iof_orted_la_SOURCES = $(orted_SOURCES) mca_iof_orted_la_LDFLAGS = -module -avoid-version -mca_iof_orted_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_iof_orted_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_iof_orted_la_SOURCES = $(orted_SOURCES) diff --git a/orte/mca/odls/alps/Makefile.am b/orte/mca/odls/alps/Makefile.am index 5d98e7e3c1..eb387f6bdb 100644 --- a/orte/mca/odls/alps/Makefile.am +++ b/orte/mca/odls/alps/Makefile.am @@ -47,7 +47,7 @@ mca_odls_alps_la_SOURCES = $(sources) mca_odls_alps_la_CPPFLAGS = $(odls_alps_CPPFLAGS) mca_odls_alps_la_LDFLAGS = -module -avoid-version $(odls_alps_LDFLAGS) mca_odls_alps_la_LIBADD = $(odls_alps_LIBS) \ - $(ORTE_TOP_BUILDDIR)/orte/mca/common/alps/lib@ORTE_LIB_PREFIX@mca_common_alps.la + $(ORTE_TOP_BUILDDIR)/orte/mca/common/alps/libprtemca_common_alps.la noinst_LTLIBRARIES = $(component_noinst) libmca_odls_alps_la_SOURCES =$(sources) diff --git a/orte/mca/oob/alps/Makefile.am b/orte/mca/oob/alps/Makefile.am index 3d6827f247..562b53105d 100644 --- a/orte/mca/oob/alps/Makefile.am +++ b/orte/mca/oob/alps/Makefile.am @@ -36,9 +36,9 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_oob_alps_la_SOURCES = $(sources) mca_oob_alps_la_LDFLAGS = -module -avoid-version -mca_oob_alps_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \ +mca_oob_alps_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la \ $(ooob_alps_LIBS) \ - $(ORTE_TOP_BUILDDIR)/orte/mca/common/alps/lib@ORTE_LIB_PREFIX@mca_common_alps.la + $(ORTE_TOP_BUILDDIR)/orte/mca/common/alps/libprtemca_common_alps.la noinst_LTLIBRARIES = $(component_noinst) diff --git a/orte/mca/oob/tcp/Makefile.am b/orte/mca/oob/tcp/Makefile.am index 9931aa986b..a1a9018dc7 100644 --- a/orte/mca/oob/tcp/Makefile.am +++ b/orte/mca/oob/tcp/Makefile.am @@ -55,7 +55,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_oob_tcp_la_SOURCES = $(sources) mca_oob_tcp_la_LDFLAGS = -module -avoid-version -mca_oob_tcp_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_oob_tcp_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_oob_tcp_la_SOURCES = $(sources) diff --git a/orte/mca/plm/alps/Makefile.am b/orte/mca/plm/alps/Makefile.am index ecee5fa9d4..a437e8aabc 100644 --- a/orte/mca/plm/alps/Makefile.am +++ b/orte/mca/plm/alps/Makefile.am @@ -46,7 +46,7 @@ mca_plm_alps_la_SOURCES = $(sources) mca_plm_alps_la_CPPFLAGS = $(plm_alps_CPPFLAGS) mca_plm_alps_la_LDFLAGS = -module -avoid-version $(plm_alps_LDFLAGS) mca_plm_alps_la_LIBADD = $(plm_alps_LIBS) \ - $(ORTE_TOP_BUILDDIR)/orte/mca/common/alps/lib@ORTE_LIB_PREFIX@mca_common_alps.la + $(ORTE_TOP_BUILDDIR)/orte/mca/common/alps/libprtemca_common_alps.la noinst_LTLIBRARIES = $(component_noinst) libmca_plm_alps_la_SOURCES =$(sources) diff --git a/orte/mca/rmaps/ppr/Makefile.am b/orte/mca/rmaps/ppr/Makefile.am index 8f3de8ffea..c9e8471c3e 100644 --- a/orte/mca/rmaps/ppr/Makefile.am +++ b/orte/mca/rmaps/ppr/Makefile.am @@ -1,7 +1,7 @@ # # Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. +# Copyright (c) 2017-2019 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -32,7 +32,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rmaps_ppr_la_SOURCES = $(sources) mca_rmaps_ppr_la_LDFLAGS = -module -avoid-version -mca_rmaps_ppr_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_rmaps_ppr_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_rmaps_ppr_la_SOURCES =$(sources) diff --git a/orte/mca/rmaps/rank_file/Makefile.am b/orte/mca/rmaps/rank_file/Makefile.am index 404e606c12..1d1fb7a5f4 100644 --- a/orte/mca/rmaps/rank_file/Makefile.am +++ b/orte/mca/rmaps/rank_file/Makefile.am @@ -15,7 +15,7 @@ # Copyright (c) 2016 Research Organization for Information Science # and Technology (RIST). All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. +# Copyright (c) 2017-2019 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -50,7 +50,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rmaps_rank_file_la_SOURCES = $(sources) mca_rmaps_rank_file_la_LDFLAGS = -module -avoid-version -mca_rmaps_rank_file_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_rmaps_rank_file_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_rmaps_rank_file_la_SOURCES =$(sources) diff --git a/orte/mca/rmaps/resilient/Makefile.am b/orte/mca/rmaps/resilient/Makefile.am index a414bd40ff..069b033752 100644 --- a/orte/mca/rmaps/resilient/Makefile.am +++ b/orte/mca/rmaps/resilient/Makefile.am @@ -2,7 +2,7 @@ # Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved. # # Copyright (c) 2017 IBM Corporation. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. +# Copyright (c) 2017-2019 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -33,7 +33,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rmaps_resilient_la_SOURCES = $(sources) mca_rmaps_resilient_la_LDFLAGS = -module -avoid-version -mca_rmaps_resilient_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_rmaps_resilient_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_rmaps_resilient_la_SOURCES =$(sources) diff --git a/orte/mca/rmaps/round_robin/Makefile.am b/orte/mca/rmaps/round_robin/Makefile.am index 47262b989d..32a48e8d63 100644 --- a/orte/mca/rmaps/round_robin/Makefile.am +++ b/orte/mca/rmaps/round_robin/Makefile.am @@ -10,7 +10,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. +# Copyright (c) 2017-2019 Intel, Inc. All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. # $COPYRIGHT$ # @@ -44,7 +44,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rmaps_round_robin_la_SOURCES = $(sources) mca_rmaps_round_robin_la_LDFLAGS = -module -avoid-version -mca_rmaps_round_robin_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_rmaps_round_robin_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_rmaps_round_robin_la_SOURCES =$(sources) diff --git a/orte/mca/rmaps/seq/Makefile.am b/orte/mca/rmaps/seq/Makefile.am index 59a3d30cf6..0c6e5a161e 100644 --- a/orte/mca/rmaps/seq/Makefile.am +++ b/orte/mca/rmaps/seq/Makefile.am @@ -11,7 +11,7 @@ # All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. +# Copyright (c) 2017-2019 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -42,7 +42,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rmaps_seq_la_SOURCES = $(sources) mca_rmaps_seq_la_LDFLAGS = -module -avoid-version -mca_rmaps_seq_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_rmaps_seq_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_rmaps_seq_la_SOURCES =$(sources) diff --git a/orte/mca/rml/oob/Makefile.am b/orte/mca/rml/oob/Makefile.am index cca44f2a35..a646c5a63d 100644 --- a/orte/mca/rml/oob/Makefile.am +++ b/orte/mca/rml/oob/Makefile.am @@ -40,7 +40,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rml_oob_la_SOURCES = $(sources) mca_rml_oob_la_LDFLAGS = -module -avoid-version -mca_rml_oob_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_rml_oob_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_rml_oob_la_SOURCES = $(sources) diff --git a/orte/mca/routed/binomial/Makefile.am b/orte/mca/routed/binomial/Makefile.am index 1b05f5d5e2..a50577574e 100644 --- a/orte/mca/routed/binomial/Makefile.am +++ b/orte/mca/routed/binomial/Makefile.am @@ -34,7 +34,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_routed_binomial_la_SOURCES = $(sources) mca_routed_binomial_la_LDFLAGS = -module -avoid-version -mca_routed_binomial_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_routed_binomial_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_routed_binomial_la_SOURCES = $(sources) diff --git a/orte/mca/routed/debruijn/Makefile.am b/orte/mca/routed/debruijn/Makefile.am index f4415f02dc..11058ae8eb 100644 --- a/orte/mca/routed/debruijn/Makefile.am +++ b/orte/mca/routed/debruijn/Makefile.am @@ -34,7 +34,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_routed_debruijn_la_SOURCES = $(sources) mca_routed_debruijn_la_LDFLAGS = -module -avoid-version -mca_routed_debruijn_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_routed_debruijn_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_routed_debruijn_la_SOURCES = $(sources) diff --git a/orte/mca/routed/direct/Makefile.am b/orte/mca/routed/direct/Makefile.am index 67dfee1b9c..6d91f0579b 100644 --- a/orte/mca/routed/direct/Makefile.am +++ b/orte/mca/routed/direct/Makefile.am @@ -32,7 +32,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_routed_direct_la_SOURCES = $(sources) mca_routed_direct_la_LDFLAGS = -module -avoid-version -mca_routed_direct_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_routed_direct_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_routed_direct_la_SOURCES = $(sources) diff --git a/orte/mca/routed/radix/Makefile.am b/orte/mca/routed/radix/Makefile.am index be28a6d58f..255692d7ce 100644 --- a/orte/mca/routed/radix/Makefile.am +++ b/orte/mca/routed/radix/Makefile.am @@ -32,7 +32,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_routed_radix_la_SOURCES = $(sources) mca_routed_radix_la_LDFLAGS = -module -avoid-version -mca_routed_radix_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_routed_radix_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_routed_radix_la_SOURCES = $(sources) diff --git a/orte/mca/rtc/hwloc/Makefile.am b/orte/mca/rtc/hwloc/Makefile.am index 4bd11c7154..58d0f2086f 100644 --- a/orte/mca/rtc/hwloc/Makefile.am +++ b/orte/mca/rtc/hwloc/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2014-2019 Intel, Inc. All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. # $COPYRIGHT$ # @@ -31,7 +31,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rtc_hwloc_la_SOURCES = $(sources) mca_rtc_hwloc_la_LDFLAGS = -module -avoid-version -mca_rtc_hwloc_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_rtc_hwloc_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_rtc_hwloc_la_SOURCES =$(sources) diff --git a/orte/mca/schizo/alps/Makefile.am b/orte/mca/schizo/alps/Makefile.am index 880b021ea7..cec649eac9 100644 --- a/orte/mca/schizo/alps/Makefile.am +++ b/orte/mca/schizo/alps/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2016-2018 Intel, Inc. All rights reserved. +# Copyright (c) 2016-2019 Intel, Inc. All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. # $COPYRIGHT$ # @@ -29,7 +29,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_schizo_alps_la_SOURCES = $(sources) mca_schizo_alps_la_LDFLAGS = -module -avoid-version -mca_schizo_alps_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_schizo_alps_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_schizo_alps_la_SOURCES = $(sources) diff --git a/orte/mca/schizo/flux/Makefile.am b/orte/mca/schizo/flux/Makefile.am index a97270e271..e5f4c80e8e 100644 --- a/orte/mca/schizo/flux/Makefile.am +++ b/orte/mca/schizo/flux/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016-2019 Intel, Inc. All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. # $COPYRIGHT$ # @@ -29,7 +29,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_schizo_flux_la_SOURCES = $(sources) mca_schizo_flux_la_LDFLAGS = -module -avoid-version -mca_schizo_flux_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_schizo_flux_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_schizo_flux_la_SOURCES = $(sources) diff --git a/orte/mca/schizo/moab/Makefile.am b/orte/mca/schizo/moab/Makefile.am index 90ff606042..4bc9afbed6 100644 --- a/orte/mca/schizo/moab/Makefile.am +++ b/orte/mca/schizo/moab/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016-2019 Intel, Inc. All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. # $COPYRIGHT$ # @@ -31,7 +31,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_schizo_moab_la_SOURCES = $(sources) mca_schizo_moab_la_LDFLAGS = -module -avoid-version $(schizo_moab_LDFLAGS) -mca_schizo_moab_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \ +mca_schizo_moab_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la \ $(schizo_moab_LIBS) noinst_LTLIBRARIES = $(component_noinst) diff --git a/orte/mca/schizo/ompi/Makefile.am b/orte/mca/schizo/ompi/Makefile.am index f0544699b1..d76ac24855 100644 --- a/orte/mca/schizo/ompi/Makefile.am +++ b/orte/mca/schizo/ompi/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2015-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2015-2019 Intel, Inc. All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. # $COPYRIGHT$ # @@ -29,7 +29,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_schizo_ompi_la_SOURCES = $(sources) mca_schizo_ompi_la_LDFLAGS = -module -avoid-version -mca_schizo_ompi_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_schizo_ompi_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_schizo_ompi_la_SOURCES = $(sources) diff --git a/orte/mca/schizo/orte/Makefile.am b/orte/mca/schizo/orte/Makefile.am index f76271faf5..829d41b7d0 100644 --- a/orte/mca/schizo/orte/Makefile.am +++ b/orte/mca/schizo/orte/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016-2019 Intel, Inc. All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. # $COPYRIGHT$ # @@ -29,7 +29,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_schizo_orte_la_SOURCES = $(sources) mca_schizo_orte_la_LDFLAGS = -module -avoid-version -mca_schizo_orte_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_schizo_orte_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_schizo_orte_la_SOURCES = $(sources) diff --git a/orte/mca/schizo/slurm/Makefile.am b/orte/mca/schizo/slurm/Makefile.am index 64e580bdc8..7beba8c3e8 100644 --- a/orte/mca/schizo/slurm/Makefile.am +++ b/orte/mca/schizo/slurm/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016-2019 Intel, Inc. All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. # $COPYRIGHT$ # @@ -29,7 +29,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_schizo_slurm_la_SOURCES = $(sources) mca_schizo_slurm_la_LDFLAGS = -module -avoid-version -mca_schizo_slurm_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_schizo_slurm_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_schizo_slurm_la_SOURCES = $(sources) diff --git a/orte/mca/state/dvm/Makefile.am b/orte/mca/state/dvm/Makefile.am index 6122ab0e7f..5d6f6ca84f 100644 --- a/orte/mca/state/dvm/Makefile.am +++ b/orte/mca/state/dvm/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2015-2018 Intel, Inc. All rights reserved. +# Copyright (c) 2015-2019 Intel, Inc. All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. # $COPYRIGHT$ # @@ -29,7 +29,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_state_dvm_la_SOURCES = $(sources) mca_state_dvm_la_LDFLAGS = -module -avoid-version -mca_state_dvm_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_state_dvm_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_state_dvm_la_SOURCES =$(sources) diff --git a/orte/mca/state/orted/Makefile.am b/orte/mca/state/orted/Makefile.am index 314808a348..02e64266fb 100644 --- a/orte/mca/state/orted/Makefile.am +++ b/orte/mca/state/orted/Makefile.am @@ -2,7 +2,7 @@ # Copyright (c) 2011 Los Alamos National Security, LLC. # All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. +# Copyright (c) 2017-2019 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -31,7 +31,7 @@ mcacomponentdir = $(ortelibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_state_orted_la_SOURCES = $(sources) mca_state_orted_la_LDFLAGS = -module -avoid-version -mca_state_orted_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la +mca_state_orted_la_LIBADD = $(top_builddir)/orte/libprteopen-rte.la noinst_LTLIBRARIES = $(component_noinst) libmca_state_orted_la_SOURCES =$(sources) diff --git a/orte/orted/Makefile.am b/orte/orted/Makefile.am index 0c0e28f328..4d9eee8f6d 100644 --- a/orte/orted/Makefile.am +++ b/orte/orted/Makefile.am @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2015-2018 Intel, Inc. All rights reserved. +# Copyright (c) 2015-2019 Intel, Inc. All rights reserved. # Copyright (c) 2018 IBM Corporation. All rights reserved. # $COPYRIGHT$ # @@ -28,7 +28,7 @@ headers += \ orted/orted.h \ orted/orted_submit.h -lib@ORTE_LIB_PREFIX@open_rte_la_SOURCES += \ +libprteopen_rte_la_SOURCES += \ orted/orted_main.c \ orted/orted_comm.c diff --git a/orte/orted/pmix/Makefile.am b/orte/orted/pmix/Makefile.am index ec6d15fbd7..7212fba31d 100644 --- a/orte/orted/pmix/Makefile.am +++ b/orte/orted/pmix/Makefile.am @@ -12,7 +12,7 @@ headers += \ orted/pmix/pmix_server.h \ orted/pmix/pmix_server_internal.h -lib@ORTE_LIB_PREFIX@open_rte_la_SOURCES += \ +libprteopen_rte_la_SOURCES += \ orted/pmix/pmix_server.c \ orted/pmix/pmix_server_fence.c \ orted/pmix/pmix_server_register_fns.c \ diff --git a/orte/runtime/Makefile.am b/orte/runtime/Makefile.am index 75d2468930..93edfcec8f 100644 --- a/orte/runtime/Makefile.am +++ b/orte/runtime/Makefile.am @@ -13,7 +13,7 @@ # Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2012 Los Alamos National Security, LLC. # All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. +# Copyright (c) 2017-2019 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -36,7 +36,7 @@ headers += \ runtime/orte_data_server.h \ runtime/orte_info_support.h -lib@ORTE_LIB_PREFIX@open_rte_la_SOURCES += \ +libprteopen_rte_la_SOURCES += \ runtime/orte_finalize.c \ runtime/orte_init.c \ runtime/orte_locks.c \ diff --git a/orte/tools/prte/Makefile.am b/orte/tools/prte/Makefile.am index 079538fad8..0942314e95 100644 --- a/orte/tools/prte/Makefile.am +++ b/orte/tools/prte/Makefile.am @@ -50,7 +50,7 @@ prte_SOURCES = \ prte.c prte_LDADD = \ - $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \ + $(top_builddir)/orte/libprteopen-rte.la \ $(top_builddir)/opal/libprteopen-pal.la distclean-local: diff --git a/orte/tools/prte_info/Makefile.am b/orte/tools/prte_info/Makefile.am index 4f397e3f7c..86c2c5bfa6 100644 --- a/orte/tools/prte_info/Makefile.am +++ b/orte/tools/prte_info/Makefile.am @@ -68,7 +68,7 @@ prte_info_SOURCES = \ version.c prte_info_LDADD = \ - $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \ + $(top_builddir)/orte/libprteopen-rte.la \ $(top_builddir)/opal/libprteopen-pal.la clean-local: diff --git a/orte/tools/prted/Makefile.am b/orte/tools/prted/Makefile.am index 9a47fe653e..db846802de 100644 --- a/orte/tools/prted/Makefile.am +++ b/orte/tools/prted/Makefile.am @@ -46,7 +46,7 @@ prted_SOURCES = prted.c # libraries on the computes prted_LDFLAGS = prted_LDADD = \ - $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \ + $(top_builddir)/orte/libprteopen-rte.la \ $(top_builddir)/opal/libprteopen-pal.la distclean-local: diff --git a/orte/tools/prun/Makefile.am b/orte/tools/prun/Makefile.am index 296059d75c..d3c9f73fb7 100644 --- a/orte/tools/prun/Makefile.am +++ b/orte/tools/prun/Makefile.am @@ -56,7 +56,7 @@ prun_SOURCES = \ prun.h prun_LDADD = \ - $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la \ + $(top_builddir)/orte/libprteopen-rte.la \ $(top_builddir)/opal/libprteopen-pal.la prun_LDFLAGS = \ diff --git a/orte/tools/wrappers/pcc.pc.in b/orte/tools/wrappers/pcc.pc.in index 0c2c41434f..48816fae3a 100644 --- a/orte/tools/wrappers/pcc.pc.in +++ b/orte/tools/wrappers/pcc.pc.in @@ -15,7 +15,7 @@ pkgincludedir=@opalincludedir@ # static linking (they're pulled in by libopen-rte.so's implicit # dependencies), so only list these in Libs.private. # -Libs: -L${libdir} @ORTE_PKG_CONFIG_LDFLAGS@ -l@ORTE_LIB_PREFIX@open-rte +Libs: -L${libdir} @ORTE_PKG_CONFIG_LDFLAGS@ -lprteopen-rte Libs.private: -lprteopen-pal @ORTE_WRAPPER_EXTRA_LIBS@ # # It is safe to hard-wire the -I before the EXTRA_INCLUDES because we diff --git a/orte/util/Makefile.am b/orte/util/Makefile.am index 8c69858424..511e238bdd 100644 --- a/orte/util/Makefile.am +++ b/orte/util/Makefile.am @@ -58,7 +58,7 @@ headers += \ util/nidmap.h \ util/threads.h -lib@ORTE_LIB_PREFIX@open_rte_la_SOURCES += \ +libprteopen_rte_la_SOURCES += \ util/error_strings.c \ util/name_fns.c \ util/proc_info.c \