Crumby - get the make tarball correct! Earlier commit was from intermediate state...

This commit was SVN r20504.

orte/Makefile.am

@@ -27,7 +27,6 @@ SUBDIRS = \
 DIST_SUBDIRS = \
 	include \
 	etc \
-	test \
 	$(MCA_orte_FRAMEWORKS_SUBDIRS) \
 	$(MCA_orte_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
 
@@ -57,7 +56,12 @@ else
 ortedir = $(includedir)
 endif
 
+# setup to catch extra files to be included in tarballs
+EXTRA_DIST = 
+
 include runtime/Makefile.am
 include util/Makefile.am
 include tools/Makefile.am
 include orted/Makefile.am
+include test/mpi/Makefile.include
+include test/system/Makefile.include

orte/test/mpi/Makefile.include

@@ -0,0 +1,47 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# Note that this file does not stand on its own.  It is included by a
+# higher-level Makefile so that Automake features such as "make dist"
+# work properly (and include all the relevant files in this directory
+# in the distribution tarball).
+
+# If you are looking for the file that builds these examples, look at
+# "Makefile" in this same directory (it is *NOT* generated by
+# Automake).
+
+EXTRA_DIST += \
+        test/mpi/Makefile \
+        test/mpi/accept.c \
+        test/mpi/cell_spawn.c \
+        test/mpi/concurrent_spawn.c \
+        test/mpi/connect.c \
+        test/mpi/crisscross.c \
+        test/mpi/delayed_abort.c \
+        test/mpi/loop_child.c \
+        test/mpi/loop_spawn.c \
+        test/mpi/mpi_spin.c \
+        test/mpi/multi_abort.c \
+        test/mpi/pubsub.c \
+        test/mpi/simple_spawn.c \
+        test/mpi/slave_spawn.c \
+        test/mpi/slave.c \
+        test/mpi/spawn_multiple.c

orte/test/system/Makefile.include

@@ -0,0 +1,45 @@
+# -*- makefile -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# Note that this file does not stand on its own.  It is included by a
+# higher-level Makefile so that Automake features such as "make dist"
+# work properly (and include all the relevant files in this directory
+# in the distribution tarball).
+
+# If you are looking for the file that builds these examples, look at
+# "Makefile" in this same directory (it is *NOT* generated by
+# Automake).
+
+EXTRA_DIST += \
+        test/system/Makefile \
+        test/system/iof_delay.c \
+        test/system/iof_stress.c \
+        test/system/oob_stress.c \
+        test/system/orte_abort.c \
+        test/system/orte_barrier.c \
+        test/system/orte_loop_child.c \
+        test/system/orte_loop_spawn.c \
+        test/system/orte_ring.c \
+        test/system/orte_spawn.c \
+        test/system/sigusr_trap.c \
+        test/system/spawn_child.c \
+        test/system/spin.c
+

orte/util/Makefile.am

@@ -32,7 +32,7 @@ nodist_man_MANS = util/hostfile/orte_hosts.7
 # in the util/Makefile
 $(nodist_man_MANS): util/hostfile/$(am__dirstamp) $(top_builddir)/opal/include/opal_config.h
 
-EXTRA_DIST = $(nodist_man_MANS:.7=.7in)
+EXTRA_DIST += $(nodist_man_MANS:.7=.7in)
 
 AM_LFLAGS = -Porte_util_hostfile_
 LEX_OUTPUT_ROOT = lex.orte_util_hostfile_