fec519a793
Per a prior commit, the presence of "hwloc.h" can cause ambiguity when using --with-hwloc=external (i.e., whether to include opal/mca/hwloc/hwloc.h or whether to include the system-installed hwloc.h). This commit: 1. Renames opal/mca/hwloc/hwloc.h to hwloc-internal.h. 2. Adds opal/mca/hwloc/autogen.options to tell autogen.pl to expect to find hwloc-internal.h (instead of hwloc.h) in opal/mca/hwloc. 3. s@opal/mca/hwloc/hwloc.h@opal/mca/hwloc/hwloc-internal.h@g in the rest of the code base. Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
30 строки
661 B
Makefile
30 строки
661 B
Makefile
#
|
|
# Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved
|
|
# Copyright (c) 2016 Research Organization for Information Science
|
|
# and Technology (RIST). All rights reserved.
|
|
# $COPYRIGHT$
|
|
#
|
|
# Additional copyrights may follow
|
|
#
|
|
# $HEADER$
|
|
#
|
|
|
|
# main library setup
|
|
noinst_LTLIBRARIES = libmca_hwloc.la
|
|
libmca_hwloc_la_SOURCES =
|
|
|
|
# local files
|
|
headers = hwloc-internal.h
|
|
libmca_hwloc_la_SOURCES += $(headers)
|
|
|
|
# Conditionally install the header files
|
|
if WANT_INSTALL_HEADERS
|
|
opaldir = $(opalincludedir)/$(subdir)
|
|
nobase_opal_HEADERS = $(headers)
|
|
endif
|
|
|
|
include base/Makefile.am
|
|
|
|
distclean-local:
|
|
rm -f base/static-components.h
|