Skip to content

Commit 0cbd52b

Browse files
authored
Merge pull request #3889 from jsquyres/pr/die-sm-btl-die-die-die
btl/sm: effectively delete the SM BTL
2 parents 0929c32 + 5cf64e6 commit 0cbd52b

File tree

10 files changed

+53
-3622
lines changed

10 files changed

+53
-3622
lines changed

opal/mca/btl/sm/Makefile.am

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
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) 2009-2014 Cisco Systems, Inc. All rights reserved.
12+
# Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved
1313
# Copyright (c) 2014 NVIDIA Corporation. All rights reserved.
1414
# $COPYRIGHT$
1515
#
@@ -20,14 +20,7 @@
2020

2121
dist_opaldata_DATA = help-mpi-btl-sm.txt
2222

23-
libmca_btl_sm_la_sources = \
24-
btl_sm.c \
25-
btl_sm.h \
26-
btl_sm_component.c \
27-
btl_sm_endpoint.h \
28-
btl_sm_fifo.h \
29-
btl_sm_frag.c \
30-
btl_sm_frag.h
23+
libmca_btl_sm_la_sources = btl_sm_component.c
3124

3225
# Make the output library in this directory, and name it either
3326
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
@@ -41,19 +34,10 @@ component_noinst = libmca_btl_sm.la
4134
component_install =
4235
endif
4336

44-
# See opal/mca/common/sm/Makefile.am for an explanation of
45-
# libmca_common_sm.la.
46-
4737
mcacomponentdir = $(opallibdir)
4838
mcacomponent_LTLIBRARIES = $(component_install)
4939
mca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)
5040
mca_btl_sm_la_LDFLAGS = -module -avoid-version
51-
mca_btl_sm_la_LIBADD = \
52-
$(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/lib@OPAL_LIB_PREFIX@mca_common_sm.la
53-
if OPAL_cuda_support
54-
mca_btl_sm_la_LIBADD += \
55-
$(OPAL_TOP_BUILDDIR)/opal/mca/common/cuda/lib@OPAL_LIB_PREFIX@mca_common_cuda.la
56-
endif
5741
mca_btl_sm_la_CPPFLAGS = $(btl_sm_CPPFLAGS)
5842

5943
noinst_LTLIBRARIES = $(component_noinst)

0 commit comments

Comments
 (0)