From 35f721a706a2dc71ffb597746a66e3b549160757 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 4 Aug 2008 14:35:40 +0000 Subject: [PATCH] Suggestion from Ralf W. to clean up sub-make's properly. This commit was SVN r19136. --- ompi/tools/ortetools/Makefile.am | 6 +++--- ompi/tools/wrappers/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ompi/tools/ortetools/Makefile.am b/ompi/tools/ortetools/Makefile.am index f4b5d4ca66..149282d239 100644 --- a/ompi/tools/ortetools/Makefile.am +++ b/ompi/tools/ortetools/Makefile.am @@ -41,7 +41,7 @@ endif # !ORTE_DISABLE_FULL_SUPPORT endif # OMPI_INSTALL_BINARIES $(top_srcdir)/orte/tools/orterun/orterun.1: - (cd $(top_srcdir)/orte/tools/orterun ; make orterun.1) + (cd $(top_srcdir)/orte/tools/orterun && $(MAKE) $(AM_MAKEFLAGS) orterun.1) mpirun.1: $(top_srcdir)/orte/tools/orterun/orterun.1 cp -f $(top_srcdir)/orte/tools/orterun/orterun.1 mpirun.1 @@ -50,13 +50,13 @@ mpiexec.1: $(top_srcdir)/orte/tools/orterun/orterun.1 cp -f $(top_srcdir)/orte/tools/orterun/orterun.1 mpiexec.1 $(top_srcdir)/orte/tools/orte-ps/orte-ps.1: - (cd $(top_srcdir)/orte/tools/orte-ps ; make orte-ps.1) + (cd $(top_srcdir)/orte/tools/orte-ps && $(MAKE) $(AM_MAKEFLAGS) orte-ps.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 $(top_srcdir)/orte/tools/orte-clean/orte-clean.1: - (cd $(top_srcdir)/orte/tools/orte-clean ; make orte-clean.1) + (cd $(top_srcdir)/orte/tools/orte-clean && $(MAKE) $(AM_MAKEFLAGS) orte-clean.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 diff --git a/ompi/tools/wrappers/Makefile.am b/ompi/tools/wrappers/Makefile.am index 29993eb324..e2c2e941eb 100644 --- a/ompi/tools/wrappers/Makefile.am +++ b/ompi/tools/wrappers/Makefile.am @@ -113,7 +113,7 @@ maintainer-clean-local: rm -f $(man_pages) $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1: - (cd $(top_srcdir)/opal/tools/wrappers ; make generic_wrapper.1) + (cd $(top_srcdir)/opal/tools/wrappers && $(MAKE) $(AM_MAKEFLAGS) generic_wrapper.1) mpicc.1: $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 rm -f mpicc.1