Skip to content

Commit 16fa266

Browse files
committed
btl/sm: Remove unused build infrastructure
With the smsc framework, the SM BTL never relies on external libraries, so we can remove all of the btl_sm_{CPPFLAGS,LDFLAGS, LIBS}. Signed-off-by: Brian Barrett <[email protected]>
1 parent d521852 commit 16fa266

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

opal/mca/btl/sm/Makefile.am

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
# reserved.
1515
# Copyright (c) 2017 IBM Corporation. All rights reserved.
1616
# Copyright (c) 2020-2021 Google, LLC. All rights reserved.
17+
# Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.
1718
# $COPYRIGHT$
1819
#
1920
# Additional copyrights may follow
2021
#
2122
# $HEADER$
2223
#
2324

24-
AM_CPPFLAGS = $(btl_sm_CPPFLAGS)
25-
2625
libmca_btl_sm_la_sources = \
2726
btl_sm_module.c \
2827
btl_sm.h \
@@ -54,11 +53,10 @@ endif
5453
mcacomponentdir = $(opallibdir)
5554
mcacomponent_LTLIBRARIES = $(component_install)
5655
mca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)
57-
mca_btl_sm_la_LDFLAGS = -module -avoid-version $(btl_sm_LDFLAGS)
58-
mca_btl_sm_la_LIBADD = $(top_builddir)/opal/lib@[email protected] \
59-
$(btl_sm_LIBS)
56+
mca_btl_sm_la_LDFLAGS = -module -avoid-version
57+
mca_btl_sm_la_LIBADD = $(top_builddir)/opal/lib@[email protected]
6058

6159
noinst_LTLIBRARIES = $(component_noinst)
6260
libmca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)
63-
libmca_btl_sm_la_LIBADD = $(btl_sm_LIBS)
64-
libmca_btl_sm_la_LDFLAGS = -module -avoid-version $(btl_sm_LDFLAGS)
61+
libmca_btl_sm_la_LIBADD =
62+
libmca_btl_sm_la_LDFLAGS = -module -avoid-version

opal/mca/btl/sm/configure.m4

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,7 @@ AC_DEFUN([MCA_opal_btl_sm_CONFIG],[
2323
AC_CONFIG_FILES([opal/mca/btl/sm/Makefile])
2424

2525
# always happy
26-
[$1]
26+
$1
2727

28-
OPAL_SUMMARY_ADD([Transports], [Shared memory/copy in+copy out], [], [yes])
29-
30-
# substitute in the things needed to build with XPMEM support
31-
AC_SUBST([btl_sm_CFLAGS])
32-
AC_SUBST([btl_sm_CPPFLAGS])
33-
AC_SUBST([btl_sm_LDFLAGS])
34-
AC_SUBST([btl_sm_LIBS])
28+
OPAL_SUMMARY_ADD([[Transports]],[[Shared memory/copy in+copy out]],[$1],[yes])
3529
])dnl

0 commit comments

Comments
 (0)