Skip to content

Commit

Permalink
Merge pull request #238 from rhc54/cmr10/pfx
Browse files Browse the repository at this point in the history
Fix ORTE prefixes
  • Loading branch information
rhc54 authored Jul 12, 2019
2 parents a399e06 + be1c8c0 commit 1ce635b
Show file tree
Hide file tree
Showing 38 changed files with 69 additions and 68 deletions.
2 changes: 1 addition & 1 deletion contrib/libadd_mca_comp_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -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@[email protected]"],
'oshmem' : ["$(top_builddir)/oshmem/liboshmem.la"],
}
Expand Down
12 changes: 6 additions & 6 deletions orte/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
15 changes: 8 additions & 7 deletions orte/mca/common/alps/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -20,22 +21,22 @@ 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)
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

Expand Down
2 changes: 1 addition & 1 deletion orte/mca/ess/alps/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/iof/hnp/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/iof/orted/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orte/mca/odls/alps/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/oob/alps/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orte/mca/oob/tcp/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orte/mca/plm/alps/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/rmaps/ppr/Makefile.am
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/rmaps/rank_file/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/rmaps/resilient/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/rmaps/round_robin/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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$
#
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/rmaps/seq/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orte/mca/rml/oob/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orte/mca/routed/binomial/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orte/mca/routed/debruijn/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orte/mca/routed/direct/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion orte/mca/routed/radix/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/rtc/hwloc/Makefile.am
Original file line number Diff line number Diff line change
@@ -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$
#
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/schizo/alps/Makefile.am
Original file line number Diff line number Diff line change
@@ -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$
#
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/schizo/flux/Makefile.am
Original file line number Diff line number Diff line change
@@ -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$
#
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/schizo/moab/Makefile.am
Original file line number Diff line number Diff line change
@@ -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$
#
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/schizo/ompi/Makefile.am
Original file line number Diff line number Diff line change
@@ -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$
#
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions orte/mca/schizo/orte/Makefile.am
Original file line number Diff line number Diff line change
@@ -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$
#
Expand Down Expand Up @@ -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)
Expand Down
Loading

0 comments on commit 1ce635b

Please sign in to comment.