Changes to make "make dist" work properly

This commit was SVN r1501.

src/Makefile.am

@@ -31,9 +31,6 @@ SUBDIRS = \
         . \
         dynamic-mca \
         tools
-# JMS Temporary hack to make "make dist" function properly.  Directories
-# mentioned here will eventually move into SUBDIRS.
-DIST_SUBDIRS = $(SUBDIRS) rte
 
 lib_LTLIBRARIES = libmpi.la
 libmpi_la_SOURCES =

src/runtime/Makefile.am

@@ -13,8 +13,6 @@ noinst_LTLIBRARIES = libruntime.la
 
 headers = \
 	runtime.h \
-        universe_init.h \
-        universe_connect.h \
 	ompi_progress.h
 
 libruntime_la_SOURCES = \
@@ -25,9 +23,7 @@ libruntime_la_SOURCES = \
         ompi_mpi_init.c \
         ompi_mpi_finalize.c \
 	ompi_progress.c \
-        universe_init.c \
         ompi_rte_finalize.c \
-        universe_connect.c \
         ompi_rte_init.c
 
 # Conditionally install the header files