- Remove extra whitespace from Makefile.am's from when we removed

Makefile.options - Sample in each of the three projects of how to link againt the relevant libraries so that when components are loaded into a parent process' space, we don't rely on the libopal/liborte/libmpi symbols being in the parent's public symbol namespace -- instead, dynamically link to the relevant libraries, allowing the dynamic linker to pull those libraries in at run-time, if needed This commit was SVN r7397.
2005-09-15 20:56:18 +00:00 · 2005-09-15 20:56:18 +00:00 · 15d0a95202
--- a/ompi/mca/coll/basic/Makefile.am
+++ b/ompi/mca/coll/basic/Makefile.am
@ -14,10 +14,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
        coll_basic.h \
        coll_basic_allgather.c \
@ -55,6 +51,10 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_basic_la_SOURCES = $(sources)
 mca_coll_basic_la_LDFLAGS = -module -avoid-version
+mca_coll_basic_la_LIBADD = \
+        $(top_ompi_builddir)/ompi/libmpi.la \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_basic_la_SOURCES =$(sources)
--- a/ompi/mca/coll/demo/Makefile.am
+++ b/ompi/mca/coll/demo/Makefile.am
@ -62,6 +62,10 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_demo_la_SOURCES = $(sources)
 mca_coll_demo_la_LIBADD = $(LIBMPI_LA)
 mca_coll_demo_la_LDFLAGS = -module -avoid-version
+mca_coll_demo_la_LIBADD = \
+        $(top_ompi_builddir)/ompi/libmpi.la \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_demo_la_SOURCES = $(sources)
--- a/ompi/mca/coll/hierarch/Makefile.am
+++ b/ompi/mca/coll/hierarch/Makefile.am
@ -39,6 +39,10 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_hierarch_la_SOURCES = $(sources)
 mca_coll_hierarch_la_LIBADD = $(LIBMPI_LA)
 mca_coll_hierarch_la_LDFLAGS = -module -avoid-version
+mca_coll_hierarch_la_LIBADD = \
+        $(top_ompi_builddir)/ompi/libmpi.la \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_hierarch_la_SOURCES = $(sources)
--- a/ompi/mca/coll/self/Makefile.am
+++ b/ompi/mca/coll/self/Makefile.am
@ -14,10 +14,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
        coll_self.h \
        coll_self_allgather.c \
@ -55,6 +51,10 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_self_la_SOURCES = $(sources)
 mca_coll_self_la_LDFLAGS = -module -avoid-version
+mca_coll_self_la_LIBADD = \
+        $(top_ompi_builddir)/ompi/libmpi.la \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_self_la_SOURCES =$(sources)
--- a/ompi/mca/coll/sm/Makefile.am
+++ b/ompi/mca/coll/sm/Makefile.am
@ -14,7 +14,6 @@
 # $HEADER$
 #

-
 not_used_yet = \
        coll_sm_allgather.c \
        coll_sm_allgatherv.c \
@ -58,7 +57,10 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_sm_la_SOURCES = $(sources)
 mca_coll_sm_la_LDFLAGS = -module -avoid-version
 mca_coll_sm_la_LIBADD = \
-        $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la
+        $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la \
+        $(top_ompi_builddir)/ompi/libmpi.la \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_sm_la_SOURCES =$(sources)
--- a/ompi/mca/coll/tuned/Makefile.am
+++ b/ompi/mca/coll/tuned/Makefile.am
@ -14,10 +14,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-include $(top_ompi_srcdir)/config/Makefile.options
-
 sources = \
        coll_tuned.h \
        coll_tuned_topo.h \
@ -55,6 +51,10 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_tuned_la_SOURCES = $(sources)
 mca_coll_tuned_la_LDFLAGS = -module -avoid-version
+mca_coll_tuned_la_LIBADD = \
+        $(top_ompi_builddir)/ompi/libmpi.la \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_tuned_la_SOURCES =$(sources)
--- a/opal/mca/paffinity/linux/Makefile.am
+++ b/opal/mca/paffinity/linux/Makefile.am
@ -14,10 +14,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
        paffinity_linux.h \
        paffinity_linux_component.c \
@ -39,6 +35,8 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_paffinity_linux_la_SOURCES = $(sources)
 mca_paffinity_linux_la_LDFLAGS = -module -avoid-version
+mca_paffinity_linux_la_LIBADD = \
+        $(top_ompi_builddir)/opal/libopal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_paffinity_linux_la_SOURCES =$(sources)
--- a/opal/mca/paffinity/solaris/Makefile.am
+++ b/opal/mca/paffinity/solaris/Makefile.am
@ -14,10 +14,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
        paffinity_solaris.h \
        paffinity_solaris_component.c \
@ -39,6 +35,8 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_paffinity_solaris_la_SOURCES = $(sources)
 mca_paffinity_solaris_la_LDFLAGS = -module -avoid-version
+mca_paffinity_solaris_la_LIBADD = \
+        $(top_ompi_builddir)/opal/libopal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_paffinity_solaris_la_SOURCES =$(sources)
--- a/orte/mca/gpr/null/Makefile.am
+++ b/orte/mca/gpr/null/Makefile.am
@ -14,10 +14,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
        gpr_null_component.c \
        gpr_null.c
@ -38,6 +34,9 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_gpr_null_la_SOURCES = $(sources)
 mca_gpr_null_la_LDFLAGS = -module -avoid-version
+mca_gpr_null_la_LIBADD = \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_gpr_null_la_SOURCES =$(sources)
--- a/orte/mca/gpr/proxy/Makefile.am
+++ b/orte/mca/gpr/proxy/Makefile.am
@ -14,10 +14,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 sources = \
        gpr_proxy_arithmetic_ops.c \
        gpr_proxy_cleanup.c \
@ -49,6 +45,9 @@ mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_gpr_proxy_la_SOURCES = $(sources)
 mca_gpr_proxy_la_LDFLAGS = -module -avoid-version
+mca_gpr_proxy_la_LIBADD = \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_gpr_proxy_la_SOURCES =$(sources)
--- a/orte/mca/gpr/replica/Makefile.am
+++ b/orte/mca/gpr/replica/Makefile.am
@ -14,10 +14,6 @@
 # $HEADER$
 #

-# Use the top-level Makefile.options
-
-
-
 SUBDIRS = api_layer functional_layer transition_layer communications

 # Make the output library in this directory, and name it either
@ -44,6 +40,9 @@ mca_gpr_replica_la_LIBADD = \
 	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 = \
+        $(top_ompi_builddir)/orte/liborte.la \
+        $(top_ompi_builddir)/opal/libopal.la

 noinst_LTLIBRARIES = $(component_noinst)
 libmca_gpr_replica_la_SOURCES = gpr_replica.h \