1
1

Per RFC: OMPI_INSTALL_BINARIES -> OPAL_INSTALL_BINARIES

This commit was SVN r31634.
This commit is contained in:
Ralph Castain 2014-05-05 21:43:05 +00:00
parent 87d809eefe
commit 4def94900a
19 changed files with 35 additions and 35 deletions

View File

@ -329,7 +329,7 @@ fi
AC_ARG_ENABLE([binaries],
[AC_HELP_STRING([--enable-binaries],
[Build and install binaries required for Open MPI, such as the wrapper compilers. Useful for multi-lib installations. (default: enabled)])])
AM_CONDITIONAL([OMPI_INSTALL_BINARIES], [test "$enable_binaries" != "no"])
AM_CONDITIONAL([OPAL_INSTALL_BINARIES], [test "$enable_binaries" != "no"])
AC_ARG_ENABLE([script-wrapper-compilers],
[AC_HELP_STRING([--enable-script-wrapper-compilers],

View File

@ -18,7 +18,7 @@
#
if !OPAL_WANT_SCRIPT_WRAPPER_COMPILERS
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
dist_pkgdata_DATA = \
mpicc-vt-wrapper-data.txt \
@ -68,5 +68,5 @@ uninstall-local: uninstall-local-always
endif # CASE_SENSITIVE_FS
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
endif # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS

View File

@ -32,7 +32,7 @@ if WANT_FT
man_pages += ompi-checkpoint.1 ompi-restart.1
endif
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
nodist_man_MANS = $(man_pages)
install-exec-hook:
@ -61,7 +61,7 @@ if WANT_FT
$(DESTDIR)$(bindir)/ompi-migrate$(EXEEXT)
endif
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
$(top_builddir)/orte/tools/orterun/orterun.1:
(cd $(top_builddir)/orte/tools/orterun && $(MAKE) $(AM_MAKEFLAGS) orterun.1)

View File

@ -43,7 +43,7 @@ include $(top_srcdir)/Makefile.ompi-rules
man_pages = ompi_info.1
EXTRA_DIST = $(man_pages:.1=.1in)
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = ompi_info

View File

@ -72,7 +72,7 @@ endif # CASE_SENSITIVE_FS
else # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = ompi.pc ompi-c.pc ompi-cxx.pc ompi-fort.pc
@ -144,7 +144,7 @@ uninstall-local: uninstall-local-always
endif # CASE_SENSITIVE_FS
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
endif # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS

View File

@ -25,7 +25,7 @@ man_pages = opal-checkpoint.1
EXTRA_DIST = $(man_pages:.1=.1in)
if WANT_FT_CR
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = opal-checkpoint
@ -38,7 +38,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
dist_ompidata_DATA = help-opal-checkpoint.txt
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
opal_checkpoint_SOURCES = opal-checkpoint.c
opal_checkpoint_LDADD = $(top_builddir)/opal/libopen-pal.la

View File

@ -25,7 +25,7 @@ man_pages = opal-restart.1
EXTRA_DIST = $(man_pages:.1=.1in)
if WANT_FT_CR
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = opal-restart
@ -38,7 +38,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
dist_ompidata_DATA = help-opal-restart.txt
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
opal_restart_SOURCES = opal-restart.c
opal_restart_LDADD = $(top_builddir)/opal/libopen-pal.la

View File

@ -26,7 +26,7 @@ EXTRA_DIST = $(real_man_pages:.1=.1in)
include $(top_srcdir)/Makefile.ompi-rules
if !OPAL_WANT_SCRIPT_WRAPPER_COMPILERS
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = opal_wrapper
@ -56,7 +56,7 @@ uninstall-local:
endif # WANT_INSTALL_HEADERS
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
endif # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS
opal_wrapper_SOURCES = opal_wrapper.c

View File

@ -25,7 +25,7 @@ man_pages = orte-checkpoint.1
EXTRA_DIST = orte-checkpoint.1in
if WANT_FT_CR
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = orte-checkpoint
@ -38,7 +38,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
dist_ompidata_DATA = help-orte-checkpoint.txt
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
orte_checkpoint_SOURCES = orte-checkpoint.c
orte_checkpoint_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la

View File

@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.ompi-rules
man_pages = orte-clean.1
EXTRA_DIST = $(man_pages:.1=.1in)
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = orte-clean
@ -36,7 +36,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
dist_ompidata_DATA = help-orte-clean.txt
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
orte_clean_SOURCES = orte-clean.c
orte_clean_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la

View File

@ -41,7 +41,7 @@ include $(top_srcdir)/Makefile.ompi-rules
man_pages = orte-info.1
EXTRA_DIST = $(man_pages:.1=.1in)
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = orte-info

View File

@ -18,7 +18,7 @@ man_pages = orte-migrate.1
EXTRA_DIST = orte-migrate.1in
if WANT_FT_CR
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = orte-migrate
@ -31,7 +31,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
dist_ompidata_DATA = help-orte-migrate.txt
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
orte_migrate_SOURCES = orte-migrate.c
orte_migrate_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la

View File

@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.ompi-rules
man_pages = orte-ps.1
EXTRA_DIST = $(man_pages:.1=.1in)
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = orte-ps
@ -36,7 +36,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
dist_ompidata_DATA = help-orte-ps.txt
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
orte_ps_SOURCES = orte-ps.c
orte_ps_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la

View File

@ -25,7 +25,7 @@ man_pages = orte-restart.1
EXTRA_DIST = orte-restart.1in
if WANT_FT_CR
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = orte-restart
@ -38,7 +38,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
dist_ompidata_DATA = help-orte-restart.txt
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
orte_restart_SOURCES = orte-restart.c
orte_restart_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la

View File

@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.ompi-rules
man_pages = orte-server.1
EXTRA_DIST = $(man_pages:.1=.1in)
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = orte-server
@ -36,7 +36,7 @@ nodist_man_MANS = $(man_pages)
# therefore the release date or version may have changed)
$(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
orte_server_SOURCES = orte-server.c
orte_server_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la

View File

@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.ompi-rules
man_pages = orte-top.1
EXTRA_DIST = orte-top.1in
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = orte-top
@ -36,7 +36,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
dist_ompidata_DATA = help-orte-top.txt
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
orte_top_SOURCES = orte-top.c
orte_top_LDADD = $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la

View File

@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.ompi-rules
man_pages = orted.1
EXTRA_DIST = $(man_pages:.1=.1in)
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = orted
@ -34,7 +34,7 @@ nodist_man_MANS = $(man_pages)
# therefore the release date or version may have changed)
$(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
orted_SOURCES = orted.c
# the following empty orted_LDFLAGS is used

View File

@ -32,7 +32,7 @@ include $(top_srcdir)/Makefile.ompi-rules
man_pages = orterun.1
EXTRA_DIST = $(man_pages:.1=.1in)
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
bin_PROGRAMS = orterun
@ -45,7 +45,7 @@ $(nodist_man_MANS): $(top_builddir)/opal/include/opal_config.h
dist_ompidata_DATA = help-orterun.txt
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
orterun_SOURCES = \
main.c \

View File

@ -19,7 +19,7 @@
#
if !OPAL_WANT_SCRIPT_WRAPPER_COMPILERS
if OMPI_INSTALL_BINARIES
if OPAL_INSTALL_BINARIES
nodist_ompidata_DATA = ortecc-wrapper-data.txt
@ -33,6 +33,6 @@ install-exec-hook:
uninstall-local:
rm -f $(DESTDIR)$(bindir)/ortecc$(EXEEXT)
endif # OMPI_INSTALL_BINARIES
endif # OPAL_INSTALL_BINARIES
endif # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS