Skip to content

Only build prun if building --with-devel-headers #4209

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

Merged
merged 2 commits into from
Sep 13, 2017
Merged

Only build prun if building --with-devel-headers #4209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
589cc03
Only build prun if building --with-devel-headers
Sep 13, 2017
3f89088
Since the DVM is now tied to prun, don't build the DVM either unless …
Sep 13, 2017
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
32 changes: 18 additions & 14 deletions ompi/mca/rte/orte/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (c) 2012 Los Alamos National Security, LLC.
# All rights reserved.
# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2016 Intel, Inc. All rights reserved.
# Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand All @@ -28,10 +28,12 @@ libmca_rte_orte_la_SOURCES =$(sources) $(headers)
libmca_rte_orte_la_LDFLAGS = -module -avoid-version
libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/lib@[email protected]

man_pages = mpirun.1 mpiexec.1 ompi-ps.1 ompi-clean.1 ompi-top.1 ompi-server.1 ompi-dvm.1
man_pages = mpirun.1 mpiexec.1 ompi-ps.1 ompi-clean.1 ompi-top.1 ompi-server.1

if WANT_FT
man_pages += ompi-checkpoint.1 ompi-restart.1
if OPAL_WANT_PRUN
if WANT_INSTALL_HEADERS
man_pages += ompi-dvm.1
endif
endif

if OPAL_INSTALL_BINARIES
Expand All @@ -44,11 +46,10 @@ install-exec-hook:
(cd $(DESTDIR)$(bindir); rm -f ompi-clean$(EXEEXT); $(LN_S) orte-clean$(EXEEXT) ompi-clean$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f ompi-top$(EXEEXT); $(LN_S) orte-top$(EXEEXT) ompi-top$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f ompi-server$(EXEEXT); $(LN_S) orte-server$(EXEEXT) ompi-server$(EXEEXT))
if OPAL_WANT_PRUN
if WANT_INSTALL_HEADERS
(cd $(DESTDIR)$(bindir); rm -f ompi-dvm$(EXEEXT); $(LN_S) orte-dvm$(EXEEXT) ompi-dvm$(EXEEXT))
if WANT_FT
(cd $(DESTDIR)$(bindir); rm -f ompi-checkpoint$(EXEEXT); $(LN_S) orte-checkpoint$(EXEEXT) ompi-checkpoint$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f ompi-restart$(EXEEXT); $(LN_S) orte-restart$(EXEEXT) ompi-restart$(EXEEXT))
(cd $(DESTDIR)$(bindir); rm -f ompi-migrate$(EXEEXT); $(LN_S) orte-migrate$(EXEEXT) ompi-migrate$(EXEEXT))
endif
endif

uninstall-local:
Expand All @@ -57,12 +58,11 @@ uninstall-local:
$(DESTDIR)$(bindir)/ompi-ps$(EXEEXT) \
$(DESTDIR)$(bindir)/ompi-clean$(EXEEXT) \
$(DESTDIR)$(bindir)/ompi-top$(EXEEXT) \
$(DESTDIR)$(bindir)/ompi-server$(EXEEXT) \
$(DESTDIR)$(bindir)/ompi-dvm$(EXEEXT)
if WANT_FT
rm -f $(DESTDIR)$(bindir)/ompi-checkpoint$(EXEEXT) \
$(DESTDIR)$(bindir)/ompi-restart$(EXEEXT) \
$(DESTDIR)$(bindir)/ompi-migrate$(EXEEXT)
$(DESTDIR)$(bindir)/ompi-server$(EXEEXT)
if OPAL_WANT_PRUN
if WANT_INSTALL_HEADERS
m -f $(DESTDIR)$(bindir)/ompi-dvm$(EXEEXT)
endif
endif

endif # OPAL_INSTALL_BINARIES
Expand Down Expand Up @@ -118,8 +118,12 @@ $(top_builddir)/orte/tools/orte-server/orte-server.1:
ompi-server.1: $(top_builddir)/orte/tools/orte-server/orte-server.1
cp -f $(top_builddir)/orte/tools/orte-server/orte-server.1 ompi-server.1

if OPAL_WANT_PRUN
if WANT_INSTALL_HEADERS
ompi-dvm.1: $(top_builddir)/orte/tools/orte-dvm/orte-dvm.1
cp -f $(top_builddir)/orte/tools/orte-dvm/orte-dvm.1 ompi-dvm.1
endif
endif

clean-local:
rm -f $(man_pages)
8 changes: 5 additions & 3 deletions orte/tools/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ SUBDIRS += \
tools/orte-top \
tools/orte-info \
tools/orte-migrate \
tools/orte-server \
tools/orte-dvm
tools/orte-server

DIST_SUBDIRS += \
tools/orte-checkpoint \
Expand All @@ -54,6 +53,9 @@ DIST_SUBDIRS += \
tools/prun

if OPAL_WANT_PRUN
if WANT_INSTALL_HEADERS
SUBDIRS += \
tools/prun
tools/prun \
tools/orte-dvm
endif
endif