Skip to content

Commit 4406c2c

Browse files
committed
configury: add missing dependencies
add dependencies to fix parallel build when configure'd with --disable-mca-dso Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent c8ec6ad commit 4406c2c

File tree

3 files changed

+17
-36
lines changed

3 files changed

+17
-36
lines changed

ompi/mca/common/monitoring/Makefile.am

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# of Tennessee Research Foundation. All rights
44
# reserved.
55
# Copyright (c) 2016 Inria. All rights reserved.
6-
# Copyright (c) 2017 Research Organization for Information Science
7-
# and Technology (RIST). All rights reserved.
6+
# Copyright (c) 2017-2018 Research Organization for Information Science
7+
# and Technology (RIST). All rights reserved.
88
# Copyright (c) 2018 Cisco Systems, Inc. All rights reserved
99
# $COPYRIGHT$
1010
#
@@ -13,11 +13,15 @@
1313
# $HEADER$
1414
#
1515

16+
include $(top_srcdir)/Makefile.ompi-rules
17+
1618
EXTRA_DIST = profile2mat.pl aggregate_profile.pl
1719

1820
sources = common_monitoring.c common_monitoring_coll.c
1921
headers = common_monitoring.h common_monitoring_coll.h
2022

23+
# See the comments in opal/mca/common/sm/Makefile.am for the explanations
24+
2125
lib_LTLIBRARIES =
2226
noinst_LTLIBRARIES =
2327
component_install = libmca_common_monitoring.la
@@ -50,15 +54,7 @@ libmca_common_monitoring_la_LDFLAGS = \
5054
libmca_common_monitoring_la_LIBADD = $(common_monitoring_LIBS)
5155
libmca_common_monitoring_noinst_la_SOURCES = $(headers) $(sources)
5256

53-
# These two rules will sym link the "noinst" libtool library filename
54-
# to the installable libtool library filename in the case where we are
55-
# compiling this component statically (case 2), described above).
56-
V=0
57-
OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V)
58-
ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY)
59-
ompi__v_LN_SCOMP_0 = @echo " LN_S " `basename $(component_install)`;
60-
61-
all-local:
57+
all-local: $(component_noinst)
6258
$(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \
6359
rm -f "$(component_install)"; \
6460
$(LN_S) "$(component_noinst)" "$(component_install)"; \

ompi/mca/common/ompio/Makefile.am

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# Copyright (c) 2008-2018 University of Houston. All rights reserved.
1313
# Copyright (c) 2016 IBM Corporation. All rights reserved.
1414
# Copyright (c) 2017-2018 Research Organization for Information Science
15-
# and Technology (RIST). All rights reserved.
15+
# and Technology (RIST). All rights reserved.
1616
#
1717
# $COPYRIGHT$
1818
#
@@ -21,6 +21,8 @@
2121
# $HEADER$
2222
#
2323

24+
include $(top_srcdir)/Makefile.ompi-rules
25+
2426
headers = \
2527
common_ompio_aggregators.h \
2628
common_ompio_print_queue.h \
@@ -37,14 +39,7 @@ sources = \
3739
common_ompio_file_write.c
3840

3941

40-
# To simplify components that link to this library, we will *always*
41-
# have an output libtool library named libmca_<type>_<name>.la -- even
42-
# for case 2) described above (i.e., so there's no conditional logic
43-
# necessary in component Makefile.am's that link to this library).
44-
# Hence, if we're creating a noinst version of this library (i.e.,
45-
# case 2), we sym link it to the libmca_<type>_<name>.la name
46-
# (libtool will do the Right Things under the covers). See the
47-
# all-local and clean-local rules, below, for how this is effected.
42+
# See the comments in opal/mca/common/sm/Makefile.am for the explanations
4843

4944
lib_LTLIBRARIES =
5045
noinst_LTLIBRARIES =
@@ -79,15 +74,7 @@ headers += common_ompio_cuda.h
7974
sources += common_ompio_cuda.c
8075
endif
8176

82-
# These two rules will sym link the "noinst" libtool library filename
83-
# to the installable libtool library filename in the case where we are
84-
# compiling this component statically (case 2), described above).
85-
V=0
86-
OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V)
87-
ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY)
88-
ompi__v_LN_SCOMP_0 = @echo " LN_S " `basename $(comp_inst)`;
89-
90-
all-local:
77+
all-local: $(comp_noinst)
9178
$(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \
9279
rm -f "$(comp_inst)"; \
9380
$(LN_S) "$(comp_noinst)" "$(comp_inst)"; \

opal/mca/common/sm/Makefile.am

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2010-2015 Los Alamos National Security, LLC.
1414
# All rights reserved.
15+
# Copyright (c) 2018 Research Organization for Information Science
16+
# and Technology (RIST). All rights reserved.
1517
# $COPYRIGHT$
1618
#
1719
# Additional copyrights may follow
@@ -41,6 +43,8 @@
4143
# Note that building this common component statically and linking
4244
# against other dynamic components is *not* supported!
4345

46+
include $(top_srcdir)/Makefile.ompi-rules
47+
4448
# Header files
4549

4650
headers = \
@@ -101,13 +105,7 @@ endif
101105
# to the installable libtool library filename in the case where we are
102106
# compiling this component statically (case 2), described above).
103107

104-
# See Makefile.ompi-rules for an explanation of the "V" macros, below
105-
V=0
106-
OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V)
107-
ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY)
108-
ompi__v_LN_SCOMP_0 = @echo " LN_S " `basename $(comp_inst)`;
109-
110-
all-local:
108+
all-local: $(comp_noinst)
111109
$(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \
112110
rm -f "$(comp_inst)"; \
113111
$(LN_S) "$(comp_noinst)" "$(comp_inst)"; \

0 commit comments

Comments
 (0)