From f4e8fe4817eeff1ef5b2bc27b101e73531bd7f53 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Thu, 15 Sep 2005 21:37:24 +0000
Subject: [PATCH] Arrgh -- stupid mistake on last commit -- accidentally
 replaced a LIBADD instead of appending to the existing one.

Also removed some more Makefile.options whitespace, and I think emacs
removed some tabs (i.e., replaced them with whitespace).

This commit was SVN r7399.
---
 orte/mca/gpr/replica/Makefile.am              |  5 ++--
 orte/mca/gpr/replica/api_layer/Makefile.am    |  2 --
 .../gpr/replica/communications/Makefile.am    | 24 ++++++++---------
 .../gpr/replica/functional_layer/Makefile.am  | 26 +++++++++----------
 .../gpr/replica/transition_layer/Makefile.am  |  2 --
 5 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/orte/mca/gpr/replica/Makefile.am b/orte/mca/gpr/replica/Makefile.am
index 8afadd8932..5f0062c2e4 100644
--- a/orte/mca/gpr/replica/Makefile.am
+++ b/orte/mca/gpr/replica/Makefile.am
@@ -38,11 +38,10 @@ mca_gpr_replica_la_LIBADD = \
 	api_layer/libmca_gpr_replica_api.la \
 	transition_layer/libmca_gpr_replica_tl.la \
 	functional_layer/libmca_gpr_replica_fn.la \
-	communications/libmca_gpr_replica_comm.la
-mca_gpr_replica_la_LDFLAGS = -module -avoid-version
-mca_gpr_replica_la_LIBADD = \
+	communications/libmca_gpr_replica_comm.la \
         $(top_ompi_builddir)/orte/liborte.la \
         $(top_ompi_builddir)/opal/libopal.la
+mca_gpr_replica_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_gpr_replica_la_SOURCES = gpr_replica.h \
diff --git a/orte/mca/gpr/replica/api_layer/Makefile.am b/orte/mca/gpr/replica/api_layer/Makefile.am
index 2ef057b851..c0ed84e9b1 100644
--- a/orte/mca/gpr/replica/api_layer/Makefile.am
+++ b/orte/mca/gpr/replica/api_layer/Makefile.am
@@ -14,8 +14,6 @@
 # $HEADER$
 #
 
-
-
 noinst_LTLIBRARIES = libmca_gpr_replica_api.la
 libmca_gpr_replica_api_la_SOURCES = \
         gpr_replica_api.h \
diff --git a/orte/mca/gpr/replica/communications/Makefile.am b/orte/mca/gpr/replica/communications/Makefile.am
index 5f05483c10..cf2d55ae08 100644
--- a/orte/mca/gpr/replica/communications/Makefile.am
+++ b/orte/mca/gpr/replica/communications/Makefile.am
@@ -14,18 +14,16 @@
 # $HEADER$
 #
 
-
-
 noinst_LTLIBRARIES = libmca_gpr_replica_comm.la
 libmca_gpr_replica_comm_la_SOURCES = \
-	gpr_replica_comm.h \
-	gpr_replica_recv_proxy_msgs.c \
-    gpr_replica_remote_msg.c \
-	gpr_replica_cmd_processor.c \
-	gpr_replica_compound_cmd_cm.c \
-    gpr_replica_cleanup_cm.c \
-    gpr_replica_del_index_cm.c \
-    gpr_replica_dump_cm.c \
-    gpr_replica_arithmetic_ops_cm.c \
-    gpr_replica_put_get_cm.c \
-    gpr_replica_subscribe_cm.c
+        gpr_replica_comm.h \
+        gpr_replica_recv_proxy_msgs.c \
+        gpr_replica_remote_msg.c \
+        gpr_replica_cmd_processor.c \
+        gpr_replica_compound_cmd_cm.c \
+        gpr_replica_cleanup_cm.c \
+        gpr_replica_del_index_cm.c \
+        gpr_replica_dump_cm.c \
+        gpr_replica_arithmetic_ops_cm.c \
+        gpr_replica_put_get_cm.c \
+        gpr_replica_subscribe_cm.c
diff --git a/orte/mca/gpr/replica/functional_layer/Makefile.am b/orte/mca/gpr/replica/functional_layer/Makefile.am
index 97a7e55cf6..6bfab95a97 100644
--- a/orte/mca/gpr/replica/functional_layer/Makefile.am
+++ b/orte/mca/gpr/replica/functional_layer/Makefile.am
@@ -14,19 +14,17 @@
 # $HEADER$
 #
 
-
-
 noinst_LTLIBRARIES = libmca_gpr_replica_fn.la
 libmca_gpr_replica_fn_la_SOURCES = \
-	gpr_replica_fn.h \
-    gpr_replica_arithmetic_ops_fn.c \
-	gpr_replica_cleanup_fn.c \
-	gpr_replica_del_index_fn.c \
-	gpr_replica_dict_fn.c \
-	gpr_replica_dump_fn.c \
-    gpr_replica_local_trig_ops_fn.c \
-	gpr_replica_messaging_fn.c \
-    gpr_replica_put_get_fn.c \
-	gpr_replica_segment_fn.c \
-	gpr_replica_subscribe_fn.c \
-	gpr_replica_trig_ops_fn.c
+        gpr_replica_fn.h \
+        gpr_replica_arithmetic_ops_fn.c \
+        gpr_replica_cleanup_fn.c \
+        gpr_replica_del_index_fn.c \
+        gpr_replica_dict_fn.c \
+        gpr_replica_dump_fn.c \
+        gpr_replica_local_trig_ops_fn.c \
+        gpr_replica_messaging_fn.c \
+        gpr_replica_put_get_fn.c \
+        gpr_replica_segment_fn.c \
+        gpr_replica_subscribe_fn.c \
+        gpr_replica_trig_ops_fn.c
diff --git a/orte/mca/gpr/replica/transition_layer/Makefile.am b/orte/mca/gpr/replica/transition_layer/Makefile.am
index d2ed6fc9ae..efd1145ca6 100644
--- a/orte/mca/gpr/replica/transition_layer/Makefile.am
+++ b/orte/mca/gpr/replica/transition_layer/Makefile.am
@@ -14,8 +14,6 @@
 # $HEADER$
 #
 
-
-
 noinst_LTLIBRARIES = libmca_gpr_replica_tl.la
 libmca_gpr_replica_tl_la_SOURCES = \
 	gpr_replica_tl.h \