Closes ticket #173 : Split name linking up for orte/ompi shared tools.
This moves the logic to create the symbolic links for: - mpirun - mpiexec - ompi-ps - ompi-clean and their respective man pages to the ompi level from the orte layer. This is a bit pedantic, but orte shouldn't be doing the work of ompi since that is a bit of an abstraction break. Note: need to autogen.sh to get this. Sorry :( This commit was SVN r10602.
Этот коммит содержится в:
Josh Hursey
родитель
f64cbbe8f2
Коммит
2edf1511fd
@ -1132,6 +1132,7 @@ AC_CONFIG_FILES([
|
||||
ompi/tools/wrappers/mpic++-wrapper-data.txt
|
||||
ompi/tools/wrappers/mpif77-wrapper-data.txt
|
||||
ompi/tools/wrappers/mpif90-wrapper-data.txt
|
||||
ompi/tools/ortetools/Makefile
|
||||
|
||||
test/Makefile
|
||||
test/event/Makefile
|
||||
|
||||
@ -23,8 +23,10 @@ EXTRA_DIST += tools/win_makefile
|
||||
|
||||
SUBDIRS += \
|
||||
tools/ompi_info \
|
||||
tools/wrappers
|
||||
tools/wrappers \
|
||||
tools/ortetools
|
||||
|
||||
DIST_SUBDIRS += \
|
||||
tools/ompi_info \
|
||||
tools/wrappers
|
||||
tools/wrappers \
|
||||
tools/ortetools
|
||||
|
||||
51
ompi/tools/ortetools/Makefile.am
Обычный файл
51
ompi/tools/ortetools/Makefile.am
Обычный файл
@ -0,0 +1,51 @@
|
||||
#
|
||||
# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
# University Research and Technology
|
||||
# Corporation. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
# of Tennessee Research Foundation. All rights
|
||||
# reserved.
|
||||
# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
# All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
dist_pkgdata_DATA =
|
||||
|
||||
man_MANS = mpirun.1 \
|
||||
mpiexec.1 \
|
||||
ompi-ps.1 \
|
||||
ompi-clean.1
|
||||
|
||||
install-exec-hook:
|
||||
(cd $(DESTDIR)$(bindir); rm -f mpirun$(EXEEXT); $(LN_S) orterun$(EXEEXT) mpirun$(EXEEXT))
|
||||
(cd $(DESTDIR)$(bindir); rm -f mpiexec$(EXEEXT); $(LN_S) orterun$(EXEEXT) mpiexec$(EXEEXT))
|
||||
(cd $(DESTDIR)$(bindir); rm -f ompi-ps$(EXEEXT); $(LN_S) orte-ps$(EXEEXT) ompi-ps$(EXEEXT))
|
||||
(cd $(DESTDIR)$(bindir); rm -f ompi-clean$(EXEEXT); $(LN_S) orte-clean$(EXEEXT) ompi-clean$(EXEEXT))
|
||||
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(bindir)/mpirun$(EXEEXT) \
|
||||
$(DESTDIR)$(bindir)/mpiexec$(EXEEXT) \
|
||||
$(DESTDIR)$(bindir)/ompi-ps$(EXEEXT) \
|
||||
$(DESTDIR)$(bindir)/ompi-clean$(EXEEXT)
|
||||
|
||||
mpirun.1: $(top_srcdir)/orte/tools/orterun/orterun.1
|
||||
cp -f $(top_srcdir)/orte/tools/orterun/orterun.1 mpirun.1
|
||||
|
||||
mpiexec.1: $(top_srcdir)/orte/tools/orterun/orterun.1
|
||||
cp -f $(top_srcdir)/orte/tools/orterun/orterun.1 mpiexec.1
|
||||
|
||||
ompi-ps.1: $(top_srcdir)/orte/tools/orte-ps/orte-ps.1
|
||||
cp -f $(top_srcdir)/orte/tools/orte-ps/orte-ps.1 ompi-ps.1
|
||||
|
||||
ompi-clean.1: $(top_srcdir)/orte/tools/orte-clean/orte-clean.1
|
||||
cp -f $(top_srcdir)/orte/tools/orte-clean/orte-clean.1 ompi-clean.1
|
||||
|
||||
distclean-local:
|
||||
rm -f mpirun.1 mpiexec.1 ompi-ps.1 ompi-clean.1
|
||||
@ -26,20 +26,9 @@ orte_clean_SOURCES = \
|
||||
orte-clean.c
|
||||
|
||||
# Manual pages
|
||||
man_MANS = orte-clean.1 ompi-clean.1
|
||||
man_MANS = orte-clean.1
|
||||
EXTRA_DIST = orte-clean.1
|
||||
|
||||
orte_clean_LDADD = $(top_builddir)/orte/liborte.la
|
||||
orte_clean_DEPENDENCIES = $(top_builddir)/orte/liborte.la
|
||||
|
||||
install-exec-hook:
|
||||
(cd $(DESTDIR)$(bindir); rm -f ompi-clean$(EXEEXT); $(LN_S) orte-clean$(EXEEXT) ompi-clean$(EXEEXT))
|
||||
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(bindir)/ompi-clean$(EXEEXT)
|
||||
|
||||
ompi-clean.1: $(top_srcdir)/orte/tools/orte-clean/orte-clean.1
|
||||
cp -f $(top_srcdir)/orte/tools/orte-clean/orte-clean.1 ompi-clean.1
|
||||
|
||||
distclean-local:
|
||||
rm -f ompi-clean.1
|
||||
|
||||
@ -26,20 +26,9 @@ orte_ps_SOURCES = \
|
||||
orte-ps.c
|
||||
|
||||
# Manual pages
|
||||
man_MANS = orte-ps.1 ompi-ps.1
|
||||
man_MANS = orte-ps.1
|
||||
EXTRA_DIST = orte-ps.1
|
||||
|
||||
orte_ps_LDADD = $(top_builddir)/orte/liborte.la
|
||||
orte_ps_DEPENDENCIES = $(top_builddir)/orte/liborte.la
|
||||
|
||||
install-exec-hook:
|
||||
(cd $(DESTDIR)$(bindir); rm -f ompi-ps$(EXEEXT); $(LN_S) orte-ps$(EXEEXT) ompi-ps$(EXEEXT))
|
||||
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(bindir)/ompi-ps$(EXEEXT)
|
||||
|
||||
ompi-ps.1: $(top_srcdir)/orte/tools/orte-ps/orte-ps.1
|
||||
cp -f $(top_srcdir)/orte/tools/orte-ps/orte-ps.1 ompi-ps.1
|
||||
|
||||
distclean-local:
|
||||
rm -f ompi-ps.1
|
||||
|
||||
@ -46,24 +46,7 @@ dist_pkgdata_DATA = help-orterun.txt
|
||||
|
||||
# AM 1.9.6 seems to have a bug in it's dependencies for install-man if
|
||||
#dist_ and nodist_ are used, so explicitly add to EXTRA_DIST...
|
||||
man_MANS = orterun.1 mpirun.1 mpiexec.1
|
||||
man_MANS = orterun.1
|
||||
EXTRA_DIST = orterun.1
|
||||
|
||||
install-exec-hook:
|
||||
(cd $(DESTDIR)$(bindir); rm -f mpirun$(EXEEXT); $(LN_S) orterun$(EXEEXT) mpirun$(EXEEXT))
|
||||
(cd $(DESTDIR)$(bindir); rm -f mpiexec$(EXEEXT); $(LN_S) orterun$(EXEEXT) mpiexec$(EXEEXT))
|
||||
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(bindir)/mpirun$(EXEEXT) \
|
||||
$(DESTDIR)$(bindir)/mpiexec$(EXEEXT)
|
||||
|
||||
mpirun.1: $(top_srcdir)/orte/tools/orterun/orterun.1
|
||||
cp -f $(top_srcdir)/orte/tools/orterun/orterun.1 mpirun.1
|
||||
|
||||
mpiexec.1: $(top_srcdir)/orte/tools/orterun/orterun.1
|
||||
cp -f $(top_srcdir)/orte/tools/orterun/orterun.1 mpiexec.1
|
||||
|
||||
distclean-local:
|
||||
rm -f mpirun.1 mpiexec.1
|
||||
|
||||
endif
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user