Skip to content

Commit 213b5d5

Browse files
jsquyresjsquyres
committed
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.
1 parent 540d483 commit 213b5d5

File tree

127 files changed

+48
-702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+48
-702
lines changed

‎ompi/debuggers/Makefile.am

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
# $HEADER$
1717
#
1818

19-
include $(top_srcdir)/config/Makefile.options
20-
2119
noinst_LTLIBRARIES = libdebuggers.la
2220
inst_LTLIBRARIES = libompitv.la
2321

‎ompi/mca/allocator/basic/Makefile.am

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
# $HEADER$
1717
#
1818

19-
# Use the top-level Makefile.options
20-
21-
22-
2319
sources = \
2420
allocator_basic.c \
2521
allocator_basic.h
@@ -40,10 +36,6 @@ mcacomponentdir = $(pkglibdir)
4036
mcacomponent_LTLIBRARIES = $(component_install)
4137
mca_allocator_basic_la_SOURCES = $(sources)
4238
mca_allocator_basic_la_LDFLAGS = -module -avoid-version
43-
mca_allocator_basic_la_LIBADD = \
44-
$(top_ompi_builddir)/ompi/libmpi.la \
45-
$(top_ompi_builddir)/orte/libopen-rte.la \
46-
$(top_ompi_builddir)/opal/libopen-pal.la
4739

4840
noinst_LTLIBRARIES = $(component_noinst)
4941
libmca_allocator_basic_la_SOURCES = $(sources)

‎ompi/mca/allocator/bucket/Makefile.am

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
# $HEADER$
1717
#
1818

19-
# Use the top-level Makefile.options
20-
21-
22-
2319
sources = \
2420
allocator_bucket.c \
2521
allocator_bucket_alloc.c \
@@ -41,10 +37,6 @@ mcacomponentdir = $(pkglibdir)
4137
mcacomponent_LTLIBRARIES = $(component_install)
4238
mca_allocator_bucket_la_SOURCES = $(sources)
4339
mca_allocator_bucket_la_LDFLAGS = -module -avoid-version
44-
mca_allocator_bucket_la_LIBADD = \
45-
$(top_ompi_builddir)/ompi/libmpi.la \
46-
$(top_ompi_builddir)/orte/libopen-rte.la \
47-
$(top_ompi_builddir)/opal/libopen-pal.la
4840

4941
noinst_LTLIBRARIES = $(component_noinst)
5042
libmca_allocator_bucket_la_SOURCES = $(sources)

‎ompi/mca/bml/r2/Makefile.am

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
# $HEADER$
1515
#
1616

17-
18-
1917
r2_sources = \
2018
bml_r2.c \
2119
bml_r2.h \
@@ -39,13 +37,8 @@ endif
3937
mcacomponentdir = $(pkglibdir)
4038
mcacomponent_LTLIBRARIES = $(component_install)
4139
mca_bml_r2_la_SOURCES = $(r2_sources)
42-
mca_bml_r2_la_LIBADD = \
43-
$(top_ompi_builddir)/ompi/libmpi.la \
44-
$(top_ompi_builddir)/orte/libopen-rte.la \
45-
$(top_ompi_builddir)/opal/libopen-pal.la
4640
mca_bml_r2_la_LDFLAGS = -module -avoid-version
4741

4842
noinst_LTLIBRARIES = $(component_noinst)
4943
libmca_bml_r2_la_SOURCES = $(r2_sources)
50-
libmca_bml_r2_la_LIBADD =
5144
libmca_bml_r2_la_LDFLAGS = -module -avoid-version

‎ompi/mca/btl/elan/Makefile.am

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
# $HEADER$
1010
#
1111

12-
# Use the top-level Makefile.options
13-
14-
15-
1612
AM_CPPFLAGS = $(btl_elan_CPPFLAGS)
1713

1814
btl_elan_sources = btl_elan.c btl_elan.h btl_elan_component.c btl_elan_endpoint.c \
@@ -33,11 +29,7 @@ endif
3329
mcacomponentdir = $(libdir)/openmpi
3430
mcacomponent_LTLIBRARIES = $(component_install)
3531
mca_btl_elan_la_SOURCES = $(btl_elan_sources)
36-
mca_btl_elan_la_LIBADD = \
37-
$(btl_elan_LIBS) \
38-
$(top_ompi_builddir)/ompi/libmpi.la \
39-
$(top_ompi_builddir)/orte/libopen-rte.la \
40-
$(top_ompi_builddir)/opal/libopen-pal.la
32+
mca_btl_elan_la_LIBADD = $(btl_elan_LIBS)
4133
mca_btl_elan_la_LDFLAGS = -module -avoid-version $(btl_elan_LDFLAGS)
4234

4335
noinst_LTLIBRARIES = $(component_noinst)

‎ompi/mca/btl/gm/Makefile.am

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
# $HEADER$
1717
#
1818

19-
# Use the top-level Makefile.options
20-
21-
22-
2319
AM_CPPFLAGS = $(btl_gm_CPPFLAGS)
2420

2521
gm_sources = \
@@ -48,12 +44,7 @@ endif
4844
mcacomponentdir = $(pkglibdir)
4945
mcacomponent_LTLIBRARIES = $(component_install)
5046
mca_btl_gm_la_SOURCES = $(gm_sources)
51-
mca_btl_gm_la_LIBADD = \
52-
$(btl_gm_LIBS) \
53-
$(top_ompi_builddir)/ompi/libmpi.la \
54-
$(top_ompi_builddir)/orte/libopen-rte.la \
55-
$(top_ompi_builddir)/opal/libopen-pal.la
56-
47+
mca_btl_gm_la_LIBADD = $(btl_gm_LIBS)
5748
mca_btl_gm_la_LDFLAGS = -module -avoid-version $(btl_gm_LDFLAGS)
5849

5950
noinst_LTLIBRARIES = $(component_noinst)

‎ompi/mca/btl/mx/Makefile.am

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,11 @@
1616
# $HEADER$
1717
#
1818

19-
# Use the top-level Makefile.options
20-
21-
22-
2319
AM_CPPFLAGS = $(btl_mx_CPPFLAGS)
2420

2521
btl_mx_sources = btl_mx.c btl_mx.h btl_mx_component.c btl_mx_endpoint.c \
2622
btl_mx_endpoint.h btl_mx_frag.c btl_mx_frag.h btl_mx_proc.c btl_mx_proc.h
27-
23+
2824
# Make the output library in this directory, and name it either
2925
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
3026
# (for static builds).
@@ -42,10 +38,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
4238
mca_btl_mx_la_SOURCES = $(btl_mx_sources)
4339
mca_btl_mx_la_LIBADD = \
4440
$(btl_mx_LIBS) \
45-
$(top_ompi_builddir)/ompi/mca/common/mx/libmca_common_mx.la \
46-
$(top_ompi_builddir)/ompi/libmpi.la \
47-
$(top_ompi_builddir)/orte/libopen-rte.la \
48-
$(top_ompi_builddir)/opal/libopen-pal.la
41+
$(top_ompi_builddir)/ompi/mca/common/mx/libmca_common_mx.la
4942
mca_btl_mx_la_LDFLAGS = -module -avoid-version $(btl_mx_LDFLAGS)
5043

5144
noinst_LTLIBRARIES = $(component_noinst)

‎ompi/mca/btl/ofud/Makefile.am

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
# $HEADER$
1919
#
2020

21-
# Use the top-level Makefile.options
22-
23-
24-
2521
AM_CPPFLAGS=$(btl_ofud_CPPFLAGS)
2622

2723
sources = \
@@ -55,14 +51,9 @@ mcacomponentdir = $(pkglibdir)
5551
mcacomponent_LTLIBRARIES = $(component)
5652
mca_btl_ofud_la_SOURCES = $(component_sources)
5753
mca_btl_ofud_la_LDFLAGS = -module -avoid-version $(btl_ofud_LDFLAGS)
58-
mca_btl_ofud_la_LIBADD = \
59-
$(btl_ofud_LIBS) \
60-
$(top_ompi_builddir)/ompi/libmpi.la \
61-
$(top_ompi_builddir)/orte/libopen-rte.la \
62-
$(top_ompi_builddir)/opal/libopen-pal.la
63-
54+
mca_btl_ofud_la_LIBADD = $(btl_ofud_LIBS)
6455

6556
noinst_LTLIBRARIES = $(lib)
6657
libmca_btl_ofud_la_SOURCES = $(lib_sources)
6758
libmca_btl_ofud_la_LDFLAGS= -module -avoid-version $(btl_ofud_LDFLAGS)
68-
libmca_btl_ofud_la_LIBADD=$(btl_ofud_LIBS)
59+
libmca_btl_ofud_la_LIBADD = $(btl_ofud_LIBS)

‎ompi/mca/btl/openib/Makefile.am

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
# $HEADER$
1818
#
1919

20-
# Use the top-level Makefile.options
21-
2220
AM_CPPFLAGS = $(btl_openib_CPPFLAGS) -DPKGDATADIR=\"$(pkgdatadir)\"
2321
AM_LFLAGS = -Pbtl_openib_ini_yy
2422
LEX_OUTPUT_ROOT = lex.btl_openib_ini_yy
@@ -83,11 +81,9 @@ mcacomponentdir = $(pkglibdir)
8381
mcacomponent_LTLIBRARIES = $(component)
8482
mca_btl_openib_la_SOURCES = $(component_sources)
8583
mca_btl_openib_la_LDFLAGS = -module -avoid-version $(btl_openib_LDFLAGS)
86-
mca_btl_openib_la_LIBADD = \
87-
$(btl_openib_LIBS) \
88-
$(top_ompi_builddir)/ompi/libmpi.la
84+
mca_btl_openib_la_LIBADD = $(btl_openib_LIBS)
8985

9086
noinst_LTLIBRARIES = $(lib)
9187
libmca_btl_openib_la_SOURCES = $(lib_sources)
9288
libmca_btl_openib_la_LDFLAGS= -module -avoid-version $(btl_openib_LDFLAGS)
93-
libmca_btl_openib_la_LIBADD=$(btl_openib_LIBS)
89+
libmca_btl_openib_la_LIBADD = $(btl_openib_LIBS)

‎ompi/mca/btl/portals/Makefile.am

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
# $HEADER$
1717
#
1818

19-
# Use the top-level Makefile.options
20-
21-
22-
2319
# Make the output library in this directory, and name it either
2420
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
2521
# (for static builds).
@@ -53,10 +49,7 @@ mca_btl_portals_la_SOURCES = $(portals_SOURCES)
5349
nodist_mca_btl_portals_la_SOURCES = $(portals_nodist_SOURCES)
5450
mca_btl_portals_la_LIBADD = \
5551
$(btl_portals_LIBS) \
56-
$(top_ompi_builddir)/ompi/mca/common/portals/libmca_common_portals.la \
57-
$(top_ompi_builddir)/ompi/libmpi.la \
58-
$(top_ompi_builddir)/orte/libopen-rte.la \
59-
$(top_ompi_builddir)/opal/libopen-pal.la
52+
$(top_ompi_builddir)/ompi/mca/common/portals/libmca_common_portals.la
6053
mca_btl_portals_la_LDFLAGS = -module -avoid-version $(btl_portals_LDFLAGS)
6154

6255
noinst_LTLIBRARIES = $(component_noinst)

‎ompi/mca/btl/sctp/Makefile.am

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,14 @@
99
# University of Stuttgart. All rights reserved.
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
12+
# Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
1213
# $COPYRIGHT$
1314
#
1415
# Additional copyrights may follow
1516
#
1617
# $HEADER$
1718
#
1819

19-
# Use the top-level Makefile.options
20-
21-
22-
2320
CFLAGS = $(btl_sctp_CFLAGS)
2421
AM_CPPFLAGS = $(btl_sctp_CPPFLAGS)
2522

@@ -62,14 +59,8 @@ mcacomponentdir = $(pkglibdir)
6259
mcacomponent_LTLIBRARIES = $(component)
6360
mca_btl_sctp_la_SOURCES = $(component_sources)
6461
mca_btl_sctp_la_LDFLAGS = -module -avoid-version $(btl_sctp_LDFLAGS)
65-
mca_btl_sctp_la_LIBADD = \
66-
$(btl_sctp_LIBS) \
67-
$(top_ompi_builddir)/ompi/libmpi.la \
68-
$(top_ompi_builddir)/orte/libopen-rte.la \
69-
$(top_ompi_builddir)/opal/libopen-pal.la
70-
#mca_btl_sctp_la_CPPFLAGS = $(btl_sctp_CPPFLAGS)
62+
mca_btl_sctp_la_LIBADD = $(btl_sctp_LIBS)
7163

7264
noinst_LTLIBRARIES = $(lib)
7365
libmca_btl_sctp_la_SOURCES = $(lib_sources)
7466
libmca_btl_sctp_la_LDFLAGS = -module -avoid-version $(btl_sctp_LDFLAGS)
75-
#libmca_btl_sctp_la_CPPFLAGS = $(btl_sctp_CPPFLAGS)

‎ompi/mca/btl/self/Makefile.am

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
# $HEADER$
1717
#
1818

19-
# Use the top-level Makefile.options
20-
21-
22-
2319
libmca_btl_self_la_sources = \
2420
btl_self.c \
2521
btl_self.h \
@@ -43,12 +39,7 @@ mcacomponentdir = $(pkglibdir)
4339
mcacomponent_LTLIBRARIES = $(component_install)
4440
mca_btl_self_la_SOURCES = $(libmca_btl_self_la_sources)
4541
mca_btl_self_la_LDFLAGS = -module -avoid-version
46-
mca_btl_self_la_LIBADD = \
47-
$(top_ompi_builddir)/ompi/libmpi.la \
48-
$(top_ompi_builddir)/orte/libopen-rte.la \
49-
$(top_ompi_builddir)/opal/libopen-pal.la
50-
42+
5143
noinst_LTLIBRARIES = $(component_noinst)
5244
libmca_btl_self_la_SOURCES = $(libmca_btl_self_la_sources)
5345
libmca_btl_self_la_LDFLAGS = -module -avoid-version
54-
libmca_btl_self_la_LIBADD =

‎ompi/mca/btl/sm/Makefile.am

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
# $HEADER$
1717
#
1818

19-
# Use the top-level Makefile.options
20-
21-
22-
2319
libmca_btl_sm_la_sources = \
2420
btl_sm.c \
2521
btl_sm.h \
@@ -49,12 +45,8 @@ mcacomponent_LTLIBRARIES = $(component_install)
4945
mca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)
5046
mca_btl_sm_la_LDFLAGS = -module -avoid-version
5147
mca_btl_sm_la_LIBADD = \
52-
$(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la \
53-
$(top_ompi_builddir)/ompi/libmpi.la \
54-
$(top_ompi_builddir)/orte/libopen-rte.la \
55-
$(top_ompi_builddir)/opal/libopen-pal.la
56-
48+
$(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la
49+
5750
noinst_LTLIBRARIES = $(component_noinst)
5851
libmca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)
5952
libmca_btl_sm_la_LDFLAGS = -module -avoid-version
60-
libmca_btl_sm_la_LIBADD =

‎ompi/mca/btl/tcp/Makefile.am

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
# $HEADER$
1717
#
1818

19-
# Use the top-level Makefile.options
20-
21-
22-
2319
sources = \
2420
btl_tcp.c \
2521
btl_tcp.h \
@@ -55,10 +51,6 @@ mcacomponentdir = $(pkglibdir)
5551
mcacomponent_LTLIBRARIES = $(component)
5652
mca_btl_tcp_la_SOURCES = $(component_sources)
5753
mca_btl_tcp_la_LDFLAGS = -module -avoid-version
58-
mca_btl_tcp_la_LIBADD = \
59-
$(top_ompi_builddir)/ompi/libmpi.la \
60-
$(top_ompi_builddir)/orte/libopen-rte.la \
61-
$(top_ompi_builddir)/opal/libopen-pal.la
6254

6355
noinst_LTLIBRARIES = $(lib)
6456
libmca_btl_tcp_la_SOURCES = $(lib_sources)

‎ompi/mca/btl/template/Makefile.am

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616
# $HEADER$
1717
#
1818

19-
# Use the top-level Makefile.options
20-
2119
amca_paramdir = $(AMCA_PARAM_SETS_DIR)
2220
dist_amca_param_DATA = netpipe-btl-template.txt
2321

24-
2522
sources = \
2623
btl_template.c \
2724
btl_template.h \
@@ -54,10 +51,6 @@ mcacomponentdir = $(pkglibdir)
5451
mcacomponent_LTLIBRARIES = $(component)
5552
mca_btl_template_la_SOURCES = $(component_sources)
5653
mca_btl_template_la_LDFLAGS = -module -avoid-version
57-
mca_btl_template_la_LIBADD = \
58-
$(top_ompi_builddir)/ompi/libmpi.la \
59-
$(top_ompi_builddir)/orte/libopen-rte.la \
60-
$(top_ompi_builddir)/opal/libopen-pal.la
6154

6255
noinst_LTLIBRARIES = $(lib)
6356
libmca_btl_template_la_SOURCES = $(lib_sources)

‎ompi/mca/btl/udapl/Makefile.am

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
# $HEADER$
1919
#
2020

21-
# Use the top-level Makefile.options
22-
23-
24-
2521
CFLAGS = $(btl_udapl_CFLAGS)
2622
AM_CPPFLAGS = $(btl_udapl_CPPFLAGS) -DPKGDATADIR=\"$(pkgdatadir)\"
2723

@@ -57,12 +53,7 @@ endif
5753
mcacomponentdir = $(pkglibdir)
5854
mcacomponent_LTLIBRARIES = $(component_install)
5955
mca_btl_udapl_la_SOURCES = $(udapl_sources)
60-
mca_btl_udapl_la_LIBADD = \
61-
$(btl_udapl_LIBS) \
62-
$(top_ompi_builddir)/ompi/libmpi.la \
63-
$(top_ompi_builddir)/orte/libopen-rte.la \
64-
$(top_ompi_builddir)/opal/libopen-pal.la
65-
56+
mca_btl_udapl_la_LIBADD = $(btl_udapl_LIBS)
6657
mca_btl_udapl_la_LDFLAGS = -module -avoid-version $(btl_udapl_LDFLAGS)
6758

6859
noinst_LTLIBRARIES = $(component_noinst)

‎ompi/mca/coll/basic/Makefile.am

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ mcacomponentdir = $(pkglibdir)
5353
mcacomponent_LTLIBRARIES = $(component_install)
5454
mca_coll_basic_la_SOURCES = $(sources)
5555
mca_coll_basic_la_LDFLAGS = -module -avoid-version
56-
mca_coll_basic_la_LIBADD = \
57-
$(top_ompi_builddir)/ompi/libmpi.la \
58-
$(top_ompi_builddir)/orte/libopen-rte.la \
59-
$(top_ompi_builddir)/opal/libopen-pal.la
6056

6157
noinst_LTLIBRARIES = $(component_noinst)
6258
libmca_coll_basic_la_SOURCES =$(sources)

0 commit comments

Comments
 (0)