Skip to content

Commit 0289040

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 61d9657 commit 0289040

File tree

3 files changed

+35
-43
lines changed

3 files changed

+35
-43
lines changed

ompi/mca/common/monitoring/Makefile.am

Lines changed: 9 additions & 12 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
#
@@ -40,6 +40,13 @@ endif # OPAL_INSTALL_BINARIES
4040

4141
else # MCA_BUILD_ompi_common_monitoring_DSO
4242
noinst_LTLIBRARIES += $(component_noinst)
43+
44+
all-local: $(component_install)
45+
$(OMPI_V_LN_SCOMP) rm -f "$(component_install)"; \
46+
$(LN_S) "$(component_noinst)" "$(component_install)"
47+
48+
clean-local:
49+
rm -f "$(component_install)"
4350
endif # MCA_BUILD_ompi_common_monitoring_DSO
4451

4552
libmca_common_monitoring_la_SOURCES = $(headers) $(sources)
@@ -58,13 +65,3 @@ OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V)
5865
ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY)
5966
ompi__v_LN_SCOMP_0 = @echo " LN_S " `basename $(component_install)`;
6067

61-
all-local:
62-
$(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \
63-
rm -f "$(component_install)"; \
64-
$(LN_S) "$(component_noinst)" "$(component_install)"; \
65-
fi
66-
67-
clean-local:
68-
if test -z "$(lib_LTLIBRARIES)"; then \
69-
rm -f "$(component_install)"; \
70-
fi

ompi/mca/common/ompio/Makefile.am

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@ if MCA_BUILD_ompi_common_ompio_DSO
5555
lib_LTLIBRARIES += $(comp_inst)
5656
else
5757
noinst_LTLIBRARIES += $(comp_noinst)
58+
59+
all-local: $(comp_inst)
60+
$(OMPI_V_LN_SCOMP) rm -f "$(comp_inst)"; \
61+
$(LN_S) "$(comp_noinst)" "$(comp_inst)"
62+
63+
clean-local:
64+
rm -f "$(comp_inst)"
5865
endif
5966

6067
libmca_common_ompio_la_SOURCES = $(headers) $(sources)
@@ -87,13 +94,3 @@ OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V)
8794
ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY)
8895
ompi__v_LN_SCOMP_0 = @echo " LN_S " `basename $(comp_inst)`;
8996

90-
all-local:
91-
$(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \
92-
rm -f "$(comp_inst)"; \
93-
$(LN_S) "$(comp_noinst)" "$(comp_inst)"; \
94-
fi
95-
96-
clean-local:
97-
if test -z "$(lib_LTLIBRARIES)"; then \
98-
rm -f "$(comp_inst)"; \
99-
fi

opal/mca/common/sm/Makefile.am

Lines changed: 19 additions & 21 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
@@ -81,6 +83,23 @@ if MCA_BUILD_opal_common_sm_DSO
8183
lib_LTLIBRARIES += $(comp_inst)
8284
else
8385
noinst_LTLIBRARIES += $(comp_noinst)
86+
87+
# These two rules will sym link the "noinst" libtool library filename
88+
# to the installable libtool library filename in the case where we are
89+
# compiling this component statically (case 2), described above).
90+
91+
# See Makefile.ompi-rules for an explanation of the "V" macros, below
92+
V=0
93+
OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V)
94+
ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY)
95+
ompi__v_LN_SCOMP_0 = @echo " LN_S " `basename $(comp_inst)`;
96+
97+
all-local: $(comp_inst)
98+
$(OMPI_V_LN_SCOMP) rm -f "$(comp_inst)"; \
99+
$(LN_S) "$(comp_noinst)" "$(comp_inst)"
100+
101+
clean-local:
102+
rm -f "$(comp_inst)"
84103
endif
85104

86105
lib@OPAL_LIB_PREFIX@mca_common_sm_la_SOURCES = \
@@ -96,24 +115,3 @@ if WANT_INSTALL_HEADERS
96115
opaldir = $(opalincludedir)/$(subdir)
97116
opal_HEADERS = $(headers)
98117
endif
99-
100-
# These two rules will sym link the "noinst" libtool library filename
101-
# to the installable libtool library filename in the case where we are
102-
# compiling this component statically (case 2), described above).
103-
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:
111-
$(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \
112-
rm -f "$(comp_inst)"; \
113-
$(LN_S) "$(comp_noinst)" "$(comp_inst)"; \
114-
fi
115-
116-
clean-local:
117-
if test -z "$(lib_LTLIBRARIES)"; then \
118-
rm -f "$(comp_inst)"; \
119-
fi

0 commit comments

Comments
 (0)