* Only link in the top-most library that is necessary; it is no

longer necessary to link in libopen-rte if you link in libmpi (for
   example) because of the fact that libmpi now completely slurps in
   libopen-rte (ditto with libopen-rte and libopen-pal).
 * Only build ompi_rb_tree if we have the OMPI layer.

This commit was SVN r23521.

test/class/Makefile.am

@@ -10,6 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,13 +20,16 @@
 
 AM_CPPFLAGS="-I$(top_srcdir)/test/support"
 
+if PROJECT_OMPI
+  REQUIRES_OMPI = ompi_rb_tree
+endif
+
 check_PROGRAMS = \
-	opal_bitmap \
+	$(REQUIRES_OMPI) opal_bitmap \
 	opal_hash_table \
 	opal_list \
 	opal_value_array \
-	opal_pointer_array \
-	ompi_rb_tree
+	opal_pointer_array
 
 # The tests are built, but since they're not actively maintained, they
 # are not run during "make check".
@@ -51,8 +55,6 @@ opal_hash_table_DEPENDENCIES = $(opal_hash_table_LDADD)
 
 opal_pointer_array_SOURCES = opal_pointer_array.c
 opal_pointer_array_LDADD = \
-        $(top_builddir)/ompi/libmpi.la \
-        $(top_builddir)/orte/libopen-rte.la \
         $(top_builddir)/opal/libopen-pal.la \
         $(top_builddir)/test/support/libsupport.a
 opal_pointer_array_DEPENDENCIES = $(opal_pointer_array_LDADD)
@@ -66,8 +68,6 @@ opal_value_array_DEPENDENCIES = $(opal_value_array_LDADD)
 ompi_rb_tree_SOURCES = ompi_rb_tree.c
 ompi_rb_tree_LDADD = \
         $(top_builddir)/ompi/libmpi.la \
-        $(top_builddir)/orte/libopen-rte.la \
-        $(top_builddir)/opal/libopen-pal.la \
 	$(top_builddir)/test/support/libsupport.a
 ompi_rb_tree_DEPENDENCIES = $(ompi_rb_tree_LDADD)
 

test/runtime/Makefile.am

@@ -32,7 +32,6 @@ sigchld_SOURCES = \
 	sigchld.c
 sigchld_LDADD = \
 	$(top_builddir)/orte/libopen-rte.la \
-	$(top_builddir)/opal/libopen-pal.la \
 	$(top_builddir)/test/support/libsupport.a
 sigchld_DEPENDENCIES = $(sigchld_LDADD)
 
@@ -40,7 +39,6 @@ start_shut_SOURCES = \
     start_shut.c
 start_shut_LDADD = \
 	$(top_builddir)/orte/libopen-rte.la \
-	$(top_builddir)/opal/libopen-pal.la \
 	$(top_builddir)/test/support/libsupport.a
 start_shut_DEPENDENCIES = $(start_shut_LDADD)
 
@@ -48,7 +46,6 @@ orte_init_finalize_SOURCES = \
     orte_init_finalize.c
 orte_init_finalize_LDADD = \
 	$(top_builddir)/orte/libopen-rte.la \
-	$(top_builddir)/opal/libopen-pal.la
 orte_init_finalize_DEPENDENCIES = $(orte_init_finalize_LDADD)
 
 opal_init_finalize_SOURCES = \

test/util/Makefile.am

@@ -46,7 +46,6 @@ TESTS = \
 #opal_error_SOURCES = opal_error.c
 #opal_error_LDADD = \
 #        $(top_builddir)/orte/libopen-rte.la \
-#        $(top_builddir)/opal/libopen-pal.la
 #opal_error_DEPENDENCIES = $(opal_error_LDADD)
 
 #opal_if_SOURCES = opal_if.c
@@ -95,7 +94,6 @@ opal_sos_DEPENDENCIES = $(opal_error_LDADD)
 #orte_sys_info_SOURCES = orte_sys_info.c
 #orte_sys_info_LDADD = \
 #        $(top_builddir)/orte/libopen-rte.la \
-#        $(top_builddir)/opal/libopen-pal.la \
 #        $(top_builddir)/test/support/libsupport.a 
 #orte_sys_info_DEPENDENCIES = $(orte_sys_info_LDADD)
 
@@ -108,14 +106,12 @@ opal_sos_DEPENDENCIES = $(opal_error_LDADD)
 #orte_session_dir_SOURCES = orte_session_dir.c
 #orte_session_dir_LDADD = \
 #        $(top_builddir)/orte/libopen-rte.la \
-#        $(top_builddir)/opal/libopen-pal.la \
 #        $(top_builddir)/test/support/libsupport.a 
 #orte_session_dir_DEPENDENCIES = $(orte_session_dir_LDADD)
 
 #orte_universe_setup_file_io_SOURCES = orte_universe_setup_file_io.c
 #orte_universe_setup_file_io_LDADD = \
 #        $(top_builddir)/orte/libopen-rte.la \
-#        $(top_builddir)/opal/libopen-pal.la \
 #        $(top_builddir)/test/support/libsupport.a 
 #orte_universe_setup_file_io_DEPENDENCIES = $(orte_universe_setup_file_io_LDADD)