Brought over from the tim branch:

- Make the DEPENDENCIES a little clearner, and clear up a problem on at
  least one platform
- Remove old/unnecessary mpirun2 rules

This commit was SVN r4397.

src/tools/console/Makefile.am

@@ -23,7 +23,7 @@ ompiconsole_SOURCES = \
         ompiconsole.c 
 
 ompiconsole_LDADD = $(libs) 
-ompiconsole_DEPENDENCIES = $(ompiconsole_LDADD)
+ompiconsole_DEPENDENCIES = $(libs)
 
 clean-local:
 	test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || $(RM) -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)

src/tools/mpirun/Makefile.am

@@ -25,12 +25,4 @@ mpirun_SOURCES = \
         mpirun.c 
 
 mpirun_LDADD = $(libs) 
-mpirun_DEPENDENCIES = $(mpirun_LDADD)
-
-# JMS Temporary hack for those who can't help themselves from typing
-# "mpirun2" :-)
-install-exec-hook:
-	(cd $(DESTDIR)$(bindir); rm -f mpirun2; ln -s mpirun mpirun2)
-
-uninstall-local:
-	rm -f $(DESTDIR)$(bindir)/mpirun2
+mpirun_DEPENDENCIES = $(libs)

src/tools/openmpi/Makefile.am

@@ -33,7 +33,7 @@ bin_PROGRAMS = openmpi
 openmpi_SOURCES = openmpi.h openmpi.c
 openmpi_LDADD = $(libs) $(LIBMPI_EXTRA_LIBS) $(top_builddir)/src/libmpi.la
 openmpi_DFLAGS = $(LIBMPI_EXTRA_LDFLAGS)
-openmpi_DEPENDENCIES = $(libs) $(openmpi_LDADD)
+openmpi_DEPENDENCIES = $(libs)
 
 clean-local:
 	test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || $(RM) -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)