Fixes for "make dist"

This commit was SVN r1278.

configure.ac

@@ -856,6 +856,7 @@ AC_CONFIG_FILES([
     src/tools/mpirun/Makefile
     src/tools/wrappers/Makefile
 
+    src/rte/Makefile
     src/rte/universe/Makefile
 
     test/Makefile

src/Makefile.am

@@ -30,6 +30,9 @@ SUBDIRS = \
         win \
         . \
         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/mca/Makefile.am

@@ -18,6 +18,9 @@ SUBDIRS = \
         ptl \
         topo \
         registry
+# JMS Temporary hack to make "make dist" function properly; directories 
+# mentioned here will eventually be moved into SUBDIRS
+DIST_SUBDIRS = $(SUBDIRS) gpr
 
 # Source code files
 

src/mca/topo/unity/configure.params

@@ -6,5 +6,5 @@
 # Specific to this module
 
 PARAM_INIT_FILE=src/topo_unity.c
-PARAM_CONFIG_FILES="Makefile src/Makefile config/Makefile"
+PARAM_CONFIG_FILES="Makefile src/Makefile"
 

src/rte/Makefile.am

@@ -0,0 +1,8 @@
+# -*- makefile -*-
+#
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+SUBDIRS = universe

src/rte/universe/Makefile.am

@@ -23,11 +23,11 @@ bin_PROGRAMS = \
 
 openmpi_SOURCES = \
         openmpi.h \
-        ompi_init.h \
         os_session_dir.c \
-        ompi_init.c \
         openmpi.c 
 
+old_sources = ompi_init.h ompi_init.c
+
 openmpi_LDADD = \
         $(libs) \
         $(LIBMPI_EXTRA_LIBS) \

src/runtime/Makefile.am

@@ -12,7 +12,8 @@ noinst_LTLIBRARIES = libruntime.la
 # Source code files
 
 headers = \
-	runtime.h
+	runtime.h \
+	ompi_progress.h
 
 libruntime_la_SOURCES = \
 	$(headers) \

test/Makefile.am

@@ -6,3 +6,6 @@
 include $(top_srcdir)/config/Makefile.options
 
 SUBDIRS		= support class util threads 
+# JMS Temporary hack to make "make dist" work.  The directories mentioned
+# here will eventually moved into SUBDIRS.
+DIST_SUBDIRS = $(SUBDIRS) rte 

test/rte/Makefile.am

@@ -22,9 +22,11 @@ bin_PROGRAMS = \
         openmpi
 
 openmpi_SOURCES = \
+        ompi_session_dir.c
+
+bogus_sources = \
         openmpi.h \
         ompi_init.h \
-        os_session_dir.c \
         ompi_init.c \
         openmpi.c