Skip to content

v3.x: mca/sensor: replace OMPI macro with ORTE macro #3806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

v3.x: mca/sensor: replace OMPI macro with ORTE macro #3806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion orte/mca/sensor/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
#
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# Copyright (c) 2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand All @@ -21,7 +23,7 @@ libmca_sensor_la_SOURCES += $(headers)

# Conditionally install the header files
if WANT_INSTALL_HEADERS
ortedir = $(ompiincludedir)/$(subdir)
ortedir = $(orteincludedir)/$(subdir)
nobase_orte_HEADERS = $(headers)
endif

Expand Down
6 changes: 4 additions & 2 deletions orte/mca/sensor/file/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
#
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# Copyright (c) 2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#

dist_ompidata_DATA = help-orte-sensor-file.txt
dist_ortedata_DATA = help-orte-sensor-file.txt

sources = \
sensor_file.c \
Expand All @@ -27,7 +29,7 @@ component_noinst = libmca_sensor_file.la
component_install =
endif

mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_sensor_file_la_SOURCES = $(sources)
mca_sensor_file_la_LDFLAGS = -module -avoid-version
Expand Down
6 changes: 4 additions & 2 deletions orte/mca/sensor/heartbeat/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
#
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# Copyright (c) 2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#

dist_ompidata_DATA = help-orte-sensor-heartbeat.txt
dist_ortedata_DATA = help-orte-sensor-heartbeat.txt

sources = \
sensor_heartbeat.c \
Expand All @@ -28,7 +30,7 @@ component_noinst = libmca_sensor_heartbeat.la
component_install =
endif

mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_sensor_heartbeat_la_SOURCES = $(sources)
mca_sensor_heartbeat_la_LDFLAGS = -module -avoid-version
Expand Down
6 changes: 4 additions & 2 deletions orte/mca/sensor/resusage/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
# Copyright (c) 2009-2010 Cisco Systems, Inc. All rights reserved.
#
# Copyright (c) 2017 Intel, Inc. All rights reserved.
# Copyright (c) 2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#

dist_ompidata_DATA = help-orte-sensor-resusage.txt
dist_ortedata_DATA = help-orte-sensor-resusage.txt

sources = \
sensor_resusage.c \
Expand All @@ -28,7 +30,7 @@ component_noinst = libmca_sensor_resusage.la
component_install =
endif

mcacomponentdir = $(ompilibdir)
mcacomponentdir = $(ortelibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_sensor_resusage_la_SOURCES = $(sources)
mca_sensor_resusage_la_LDFLAGS = -module -avoid-version
Expand Down