diff --git a/config/opal_configure_options.m4 b/config/opal_configure_options.m4 index 9c83ba69d5..802093d8b9 100644 --- a/config/opal_configure_options.m4 +++ b/config/opal_configure_options.m4 @@ -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], diff --git a/ompi/contrib/vt/wrappers/Makefile.am b/ompi/contrib/vt/wrappers/Makefile.am index 1d3e666ab2..97d72f42c2 100644 --- a/ompi/contrib/vt/wrappers/Makefile.am +++ b/ompi/contrib/vt/wrappers/Makefile.am @@ -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 diff --git a/ompi/mca/rte/orte/Makefile.am b/ompi/mca/rte/orte/Makefile.am index 5d8a48f3f1..6e41f04906 100644 --- a/ompi/mca/rte/orte/Makefile.am +++ b/ompi/mca/rte/orte/Makefile.am @@ -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) diff --git a/ompi/tools/ompi_info/Makefile.am b/ompi/tools/ompi_info/Makefile.am index acd18c46e1..de9d1e6097 100644 --- a/ompi/tools/ompi_info/Makefile.am +++ b/ompi/tools/ompi_info/Makefile.am @@ -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 diff --git a/ompi/tools/wrappers/Makefile.am b/ompi/tools/wrappers/Makefile.am index 0a6a3a75e8..9214b74850 100644 --- a/ompi/tools/wrappers/Makefile.am +++ b/ompi/tools/wrappers/Makefile.am @@ -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 diff --git a/opal/tools/opal-checkpoint/Makefile.am b/opal/tools/opal-checkpoint/Makefile.am index 2a628b4327..a0c91aeee2 100644 --- a/opal/tools/opal-checkpoint/Makefile.am +++ b/opal/tools/opal-checkpoint/Makefile.am @@ -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 diff --git a/opal/tools/opal-restart/Makefile.am b/opal/tools/opal-restart/Makefile.am index 0cfb3b1dbc..d03bb6b39a 100644 --- a/opal/tools/opal-restart/Makefile.am +++ b/opal/tools/opal-restart/Makefile.am @@ -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 diff --git a/opal/tools/wrappers/Makefile.am b/opal/tools/wrappers/Makefile.am index 793a60c9fb..9d75ffccef 100644 --- a/opal/tools/wrappers/Makefile.am +++ b/opal/tools/wrappers/Makefile.am @@ -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 diff --git a/orte/tools/orte-checkpoint/Makefile.am b/orte/tools/orte-checkpoint/Makefile.am index 7f0ea84afa..908ce9b24b 100644 --- a/orte/tools/orte-checkpoint/Makefile.am +++ b/orte/tools/orte-checkpoint/Makefile.am @@ -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 diff --git a/orte/tools/orte-clean/Makefile.am b/orte/tools/orte-clean/Makefile.am index 61ce1218bf..9c2f6244f7 100644 --- a/orte/tools/orte-clean/Makefile.am +++ b/orte/tools/orte-clean/Makefile.am @@ -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 diff --git a/orte/tools/orte-info/Makefile.am b/orte/tools/orte-info/Makefile.am index e116bfb14d..3de7bf38eb 100644 --- a/orte/tools/orte-info/Makefile.am +++ b/orte/tools/orte-info/Makefile.am @@ -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 diff --git a/orte/tools/orte-migrate/Makefile.am b/orte/tools/orte-migrate/Makefile.am index 52885b3b72..968d4f1b2f 100644 --- a/orte/tools/orte-migrate/Makefile.am +++ b/orte/tools/orte-migrate/Makefile.am @@ -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 diff --git a/orte/tools/orte-ps/Makefile.am b/orte/tools/orte-ps/Makefile.am index eccd352ed2..46245bb610 100644 --- a/orte/tools/orte-ps/Makefile.am +++ b/orte/tools/orte-ps/Makefile.am @@ -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 diff --git a/orte/tools/orte-restart/Makefile.am b/orte/tools/orte-restart/Makefile.am index d5e368beb0..94b13d81b3 100644 --- a/orte/tools/orte-restart/Makefile.am +++ b/orte/tools/orte-restart/Makefile.am @@ -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 diff --git a/orte/tools/orte-server/Makefile.am b/orte/tools/orte-server/Makefile.am index 780bf7aa76..8997811ebd 100644 --- a/orte/tools/orte-server/Makefile.am +++ b/orte/tools/orte-server/Makefile.am @@ -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 diff --git a/orte/tools/orte-top/Makefile.am b/orte/tools/orte-top/Makefile.am index 35b78ae016..3cb06b34d2 100644 --- a/orte/tools/orte-top/Makefile.am +++ b/orte/tools/orte-top/Makefile.am @@ -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 diff --git a/orte/tools/orted/Makefile.am b/orte/tools/orted/Makefile.am index f0d9408955..a5c706cbe0 100644 --- a/orte/tools/orted/Makefile.am +++ b/orte/tools/orted/Makefile.am @@ -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 diff --git a/orte/tools/orterun/Makefile.am b/orte/tools/orterun/Makefile.am index 0b2c67a21e..4321c20f56 100644 --- a/orte/tools/orterun/Makefile.am +++ b/orte/tools/orterun/Makefile.am @@ -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 \ diff --git a/orte/tools/wrappers/Makefile.am b/orte/tools/wrappers/Makefile.am index ed01690b17..65ff907801 100644 --- a/orte/tools/wrappers/Makefile.am +++ b/orte/tools/wrappers/Makefile.am @@ -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