Merge pull request #2372 from ggouaillardet/topic/v2.0.x/embedded_missing_dependencies

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

Author: jsquyres

opal/mca/event/libevent2022/Makefile.am

@@ -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
@@ -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
 

opal/mca/pmix/pmix112/Makefile.am

@@ -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$
 #
@@ -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)