Skip to content

v2.0.x: add missing dependencies to embedded components #2372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 9, 2016
Merged

v2.0.x: add missing dependencies to embedded components #2372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
709d7a0
event/libevent2022: add missing dependencies to the embedded libevent…
ggouaillardet Nov 4, 2016
af45426
event/libevent2022: cleanup dependencies to the embedded libevent lib
ggouaillardet Nov 7, 2016
a66da81
pmix/pmix112: add missing dependencies to the embedded pmix library
ggouaillardet Nov 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions opal/mca/event/libevent2022/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# Copyright (c) 2012-2013 Los Alamos National Security, LLC.
# All rights reserved.
# Copyright (c) 2015 Intel, Inc. All rights reserved
# Copyright (c) 2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand Down Expand Up @@ -68,22 +70,18 @@ nobase_opal_HEADERS = $(headers)
nobase_nodist_opal_HEADERS = libevent/include/event2/event-config.h
endif

# Make the output library in this directory, and name it either
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# (for static builds).
# Make the output library in this directory, and name it
# libmca_<type>_<name>.la because build is forced to be static-only

if MCA_BUILD_opal_event_libevent2022_DSO
component_noinst =
component_install = mca_event_libevent2022.la
else
component_noinst = libmca_event_libevent2022.la
component_install =
endif


# We only ever build this component statically

noinst_LTLIBRARIES = $(component_noinst)
libmca_event_libevent2022_la_SOURCES =$(sources)
libmca_event_libevent2022_la_LDFLAGS = -module -avoid-version
libmca_event_libevent2022_la_LIBADD = $(builddir)/libevent/libevent.la
libmca_event_libevent2022_la_DEPENDENCIES = $(builddir)/libevent/libevent.la

4 changes: 3 additions & 1 deletion opal/mca/pmix/pmix112/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2015 Research Organization for Information Science
# Copyright (c) 2015-2016 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
Expand Down Expand Up @@ -42,10 +42,12 @@ mca_pmix_pmix112_la_CPPFLAGS = \
-I$(srcdir)/pmix/include $(opal_pmix_pmix112_CPPFLAGS)
mca_pmix_pmix112_la_LDFLAGS = -module -avoid-version $(opal_pmix_pmix112_LDFLAGS)
mca_pmix_pmix112_la_LIBADD = $(opal_pmix_pmix112_LIBS)
mca_pmix_pmix112_la_DEPENDENCIES = $(opal_pmix_pmix112_LIBS)

noinst_LTLIBRARIES = $(component_noinst)
libmca_pmix_pmix112_la_SOURCES =$(sources)
libmca_pmix_pmix112_la_CFLAGS = $(opal_pmix_pmix112_CFLAGS)
libmca_pmix_pmix112_la_CPPFLAGS = -I$(srcdir)/pmix/include $(opal_pmix_pmix112_CPPFLAGS)
libmca_pmix_pmix112_la_LDFLAGS = -module -avoid-version $(opal_pmix_pmix112_LDFLAGS)
libmca_pmix_pmix112_la_LIBADD = $(opal_pmix_pmix112_LIBS)
libmca_pmix_pmix112_la_DEPENDENCIES = $(opal_pmix_pmix112_LIBS)