Per long threads on the mailing list and much confusion discussion

about linkers, have all OPAL, ORTE, and OMPI components '''not'' link against the OPAL, ORTE, or OMPI libraries. See ttp://www.open-mpi.org/community/lists/users/2007/10/4220.php for details (or https://svn.open-mpi.org/trac/ompi/wiki/Linkers for a better-formatted version of the same info). This commit was SVN r16968.
open-mpi · Dec 15, 2007 · 213b5d5 · 213b5d5
1 parent 540d483
commit 213b5d5
Show file tree

Hide file tree

Showing 127 changed files with 48 additions and 702 deletions.
diff --git a/ompi/debuggers/Makefile.am b/ompi/debuggers/Makefile.am
@@ -16,8 +16,6 @@
 # $HEADER$
 #
 
-include $(top_srcdir)/config/Makefile.options
-
 noinst_LTLIBRARIES = libdebuggers.la
 inst_LTLIBRARIES = libompitv.la
 

diff --git a/ompi/mca/allocator/basic/Makefile.am b/ompi/mca/allocator/basic/Makefile.am
@@ -16,10 +16,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 sources = \
         allocator_basic.c \
         allocator_basic.h 
@@ -40,10 +36,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_allocator_basic_la_SOURCES = $(sources)
 mca_allocator_basic_la_LDFLAGS = -module -avoid-version
-mca_allocator_basic_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_allocator_basic_la_SOURCES = $(sources)

diff --git a/ompi/mca/allocator/bucket/Makefile.am b/ompi/mca/allocator/bucket/Makefile.am
@@ -16,10 +16,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 sources = \
         allocator_bucket.c \
         allocator_bucket_alloc.c \
@@ -41,10 +37,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_allocator_bucket_la_SOURCES = $(sources)
 mca_allocator_bucket_la_LDFLAGS = -module -avoid-version
-mca_allocator_bucket_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_allocator_bucket_la_SOURCES = $(sources)

diff --git a/ompi/mca/bml/r2/Makefile.am b/ompi/mca/bml/r2/Makefile.am
@@ -14,8 +14,6 @@
 # $HEADER$
 #
 
-
-
 r2_sources  = \
 	bml_r2.c \
 	bml_r2.h \
@@ -39,13 +37,8 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_bml_r2_la_SOURCES = $(r2_sources)
-mca_bml_r2_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 mca_bml_r2_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_bml_r2_la_SOURCES = $(r2_sources)
-libmca_bml_r2_la_LIBADD =
 libmca_bml_r2_la_LDFLAGS = -module -avoid-version
diff --git a/ompi/mca/btl/elan/Makefile.am b/ompi/mca/btl/elan/Makefile.am
@@ -9,10 +9,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 AM_CPPFLAGS = $(btl_elan_CPPFLAGS)
 
 btl_elan_sources = btl_elan.c btl_elan.h btl_elan_component.c btl_elan_endpoint.c \
@@ -33,11 +29,7 @@ endif
 mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_elan_la_SOURCES = $(btl_elan_sources)
-mca_btl_elan_la_LIBADD = \
-    $(btl_elan_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+mca_btl_elan_la_LIBADD = $(btl_elan_LIBS)
 mca_btl_elan_la_LDFLAGS = -module -avoid-version $(btl_elan_LDFLAGS)
 
 noinst_LTLIBRARIES = $(component_noinst)

diff --git a/ompi/mca/btl/gm/Makefile.am b/ompi/mca/btl/gm/Makefile.am
@@ -16,10 +16,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 AM_CPPFLAGS = $(btl_gm_CPPFLAGS)
 
 gm_sources = \
@@ -48,12 +44,7 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_gm_la_SOURCES = $(gm_sources)
-mca_btl_gm_la_LIBADD = \
-    $(btl_gm_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
-
+mca_btl_gm_la_LIBADD = $(btl_gm_LIBS)
 mca_btl_gm_la_LDFLAGS = -module -avoid-version $(btl_gm_LDFLAGS)
 
 noinst_LTLIBRARIES = $(component_noinst)

diff --git a/ompi/mca/btl/mx/Makefile.am b/ompi/mca/btl/mx/Makefile.am
@@ -16,15 +16,11 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 AM_CPPFLAGS = $(btl_mx_CPPFLAGS)
 
 btl_mx_sources = btl_mx.c btl_mx.h btl_mx_component.c btl_mx_endpoint.c \
     btl_mx_endpoint.h btl_mx_frag.c btl_mx_frag.h btl_mx_proc.c btl_mx_proc.h
-     
+
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
@@ -42,10 +38,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_mx_la_SOURCES = $(btl_mx_sources)
 mca_btl_mx_la_LIBADD = \
     $(btl_mx_LIBS) \
-    $(top_ompi_builddir)/ompi/mca/common/mx/libmca_common_mx.la \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+    $(top_ompi_builddir)/ompi/mca/common/mx/libmca_common_mx.la
 mca_btl_mx_la_LDFLAGS = -module -avoid-version $(btl_mx_LDFLAGS)
 
 noinst_LTLIBRARIES = $(component_noinst)

diff --git a/ompi/mca/btl/ofud/Makefile.am b/ompi/mca/btl/ofud/Makefile.am
@@ -18,10 +18,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 AM_CPPFLAGS=$(btl_ofud_CPPFLAGS) 
 
 sources = \
@@ -55,14 +51,9 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_ofud_la_SOURCES = $(component_sources)
 mca_btl_ofud_la_LDFLAGS = -module -avoid-version $(btl_ofud_LDFLAGS) 
-mca_btl_ofud_la_LIBADD = \
-    $(btl_ofud_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
-
+mca_btl_ofud_la_LIBADD = $(btl_ofud_LIBS)
 
 noinst_LTLIBRARIES = $(lib)
 libmca_btl_ofud_la_SOURCES = $(lib_sources)
 libmca_btl_ofud_la_LDFLAGS= -module -avoid-version $(btl_ofud_LDFLAGS) 
-libmca_btl_ofud_la_LIBADD=$(btl_ofud_LIBS)
+libmca_btl_ofud_la_LIBADD = $(btl_ofud_LIBS)
diff --git a/ompi/mca/btl/openib/Makefile.am b/ompi/mca/btl/openib/Makefile.am
@@ -17,8 +17,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
 AM_CPPFLAGS = $(btl_openib_CPPFLAGS) -DPKGDATADIR=\"$(pkgdatadir)\"
 AM_LFLAGS = -Pbtl_openib_ini_yy
 LEX_OUTPUT_ROOT = lex.btl_openib_ini_yy
@@ -83,11 +81,9 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_openib_la_SOURCES = $(component_sources)
 mca_btl_openib_la_LDFLAGS = -module -avoid-version $(btl_openib_LDFLAGS) 
-mca_btl_openib_la_LIBADD = \
-    $(btl_openib_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la
+mca_btl_openib_la_LIBADD = $(btl_openib_LIBS)
 
 noinst_LTLIBRARIES = $(lib)
 libmca_btl_openib_la_SOURCES = $(lib_sources)
 libmca_btl_openib_la_LDFLAGS= -module -avoid-version $(btl_openib_LDFLAGS) 
-libmca_btl_openib_la_LIBADD=$(btl_openib_LIBS)
+libmca_btl_openib_la_LIBADD = $(btl_openib_LIBS)
diff --git a/ompi/mca/btl/portals/Makefile.am b/ompi/mca/btl/portals/Makefile.am
@@ -16,10 +16,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
@@ -53,10 +49,7 @@ mca_btl_portals_la_SOURCES = $(portals_SOURCES)
 nodist_mca_btl_portals_la_SOURCES = $(portals_nodist_SOURCES)
 mca_btl_portals_la_LIBADD = \
     $(btl_portals_LIBS) \
-    $(top_ompi_builddir)/ompi/mca/common/portals/libmca_common_portals.la \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
+    $(top_ompi_builddir)/ompi/mca/common/portals/libmca_common_portals.la
 mca_btl_portals_la_LDFLAGS = -module -avoid-version $(btl_portals_LDFLAGS)
 
 noinst_LTLIBRARIES = $(component_noinst)

diff --git a/ompi/mca/btl/sctp/Makefile.am b/ompi/mca/btl/sctp/Makefile.am
@@ -9,17 +9,14 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
 # 
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 CFLAGS = $(btl_sctp_CFLAGS)
 AM_CPPFLAGS = $(btl_sctp_CPPFLAGS)
 
@@ -62,14 +59,8 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_sctp_la_SOURCES = $(component_sources)
 mca_btl_sctp_la_LDFLAGS = -module -avoid-version $(btl_sctp_LDFLAGS)
-mca_btl_sctp_la_LIBADD = \
-    $(btl_sctp_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
-#mca_btl_sctp_la_CPPFLAGS = $(btl_sctp_CPPFLAGS)
+mca_btl_sctp_la_LIBADD = $(btl_sctp_LIBS)
 
 noinst_LTLIBRARIES = $(lib)
 libmca_btl_sctp_la_SOURCES = $(lib_sources)
 libmca_btl_sctp_la_LDFLAGS = -module -avoid-version $(btl_sctp_LDFLAGS)
-#libmca_btl_sctp_la_CPPFLAGS = $(btl_sctp_CPPFLAGS)
diff --git a/ompi/mca/btl/self/Makefile.am b/ompi/mca/btl/self/Makefile.am
@@ -16,10 +16,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 libmca_btl_self_la_sources = \
     btl_self.c \
     btl_self.h \
@@ -43,12 +39,7 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_self_la_SOURCES = $(libmca_btl_self_la_sources)
 mca_btl_self_la_LDFLAGS = -module -avoid-version
-mca_btl_self_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
-
+
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_btl_self_la_SOURCES = $(libmca_btl_self_la_sources)
 libmca_btl_self_la_LDFLAGS = -module -avoid-version
-libmca_btl_self_la_LIBADD = 
diff --git a/ompi/mca/btl/sm/Makefile.am b/ompi/mca/btl/sm/Makefile.am
@@ -16,10 +16,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 libmca_btl_sm_la_sources = \
     btl_sm.c \
     btl_sm.h \
@@ -49,12 +45,8 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)
 mca_btl_sm_la_LDFLAGS = -module -avoid-version
 mca_btl_sm_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
-
+    $(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la
+
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)
 libmca_btl_sm_la_LDFLAGS = -module -avoid-version
-libmca_btl_sm_la_LIBADD = 
diff --git a/ompi/mca/btl/tcp/Makefile.am b/ompi/mca/btl/tcp/Makefile.am
@@ -16,10 +16,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 sources = \
     btl_tcp.c \
     btl_tcp.h \
@@ -55,10 +51,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_tcp_la_SOURCES = $(component_sources)
 mca_btl_tcp_la_LDFLAGS = -module -avoid-version
-mca_btl_tcp_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 
 noinst_LTLIBRARIES = $(lib)
 libmca_btl_tcp_la_SOURCES = $(lib_sources)

diff --git a/ompi/mca/btl/template/Makefile.am b/ompi/mca/btl/template/Makefile.am
@@ -16,12 +16,9 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
 amca_paramdir = $(AMCA_PARAM_SETS_DIR)
 dist_amca_param_DATA = netpipe-btl-template.txt
 
-
 sources = \
     btl_template.c \
     btl_template.h \
@@ -54,10 +51,6 @@ mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component)
 mca_btl_template_la_SOURCES = $(component_sources)
 mca_btl_template_la_LDFLAGS = -module -avoid-version
-mca_btl_template_la_LIBADD = \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
 
 noinst_LTLIBRARIES = $(lib)
 libmca_btl_template_la_SOURCES = $(lib_sources)

diff --git a/ompi/mca/btl/udapl/Makefile.am b/ompi/mca/btl/udapl/Makefile.am
@@ -18,10 +18,6 @@
 # $HEADER$
 #
 
-# Use the top-level Makefile.options
-
-
-
 CFLAGS = $(btl_udapl_CFLAGS)
 AM_CPPFLAGS = $(btl_udapl_CPPFLAGS) -DPKGDATADIR=\"$(pkgdatadir)\"
 
@@ -57,12 +53,7 @@ endif
 mcacomponentdir = $(pkglibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_btl_udapl_la_SOURCES = $(udapl_sources)
-mca_btl_udapl_la_LIBADD = \
-    $(btl_udapl_LIBS) \
-    $(top_ompi_builddir)/ompi/libmpi.la \
-    $(top_ompi_builddir)/orte/libopen-rte.la \
-    $(top_ompi_builddir)/opal/libopen-pal.la
-
+mca_btl_udapl_la_LIBADD = $(btl_udapl_LIBS)
 mca_btl_udapl_la_LDFLAGS = -module -avoid-version $(btl_udapl_LDFLAGS)
 
 noinst_LTLIBRARIES = $(component_noinst)

diff --git a/ompi/mca/coll/basic/Makefile.am b/ompi/mca/coll/basic/Makefile.am
@@ -53,10 +53,6 @@ mcacomponentdir = $(pkglibdir)
 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/libopen-rte.la \
-        $(top_ompi_builddir)/opal/libopen-pal.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_basic_la_SOURCES =$(sources)