Remove a lot of kruft that wasn't necessary (looks like a resuly of a

previous cut-n-paste, perhaps from ompi_info's Makefile.am).

This commit was SVN r2592.

src/tools/mpirun/Makefile.am

@@ -1,21 +1,9 @@
-# -*- makefile -*-
 #
 # $HEADER$
 #
 
 include $(top_srcdir)/config/Makefile.options
 
-AM_CPPFLAGS = \
-            -DOMPI_PREFIX="\"$(prefix)\"" \
-            -DOMPI_BINDIR="\"$(bindir)\"" \
-            -DOMPI_LIBDIR="\"$(libdir)\"" \
-            -DOMPI_INCDIR="\"$(includedir)\"" \
-            -DOMPI_PKGLIBDIR="\"$(pkglibdir)\"" \
-            -DOMPI_SYSCONFDIR="\"$(sysconfdir)\"" \
-            -DOMPI_CONFIGURE_USER="\"@OMPI_CONFIGURE_USER@\"" \
-            -DOMPI_CONFIGURE_HOST="\"@OMPI_CONFIGURE_HOST@\"" \
-            -DOMPI_CONFIGURE_DATE="\"@OMPI_CONFIGURE_DATE@\""
-
 libs = $(top_builddir)/src/libmpi.la
 
 bin_PROGRAMS = \
@@ -24,15 +12,8 @@ bin_PROGRAMS = \
 mpirun2_SOURCES = \
         mpirun2.c 
 
-mpirun2_LDADD = \
-        $(libs) \
-        $(LIBMPI_EXTRA_LIBS) \
-        $(LIBOMPI_EXTRA_LIBS) \
-        $(top_builddir)/src/libmpi.la
-
-mpirun2_DFLAGS = $(LIBMPI_EXTRA_LDFLAGS) $(LIBOMPI_EXTRA_LDFLAGS)
-mpirun2_DEPENDENCIES = $(libs) \
-                       $(mpirun2_LDADD)
+mpirun2_LDADD = $(libs) 
+mpirun2_DEPENDENCIES = $(mpirun2_LDADD)
 
 clean-local:
 	test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || $(RM) -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)