1
1

mpiext/shortfloat: do not build an empty library

the shortfloat extension is only made of header files,
and hence do not require a library to be built.

Refs. open-mpi/ompi#6205

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
Signed-off-by: KAWASHIMA Takahiro <t-kawashima@jp.fujitsu.com>
Этот коммит содержится в:
Gilles Gouaillardet 2019-02-25 16:43:19 +09:00 коммит произвёл Jeff Squyres
родитель e70780b762
Коммит e1098dae4b
4 изменённых файлов: 10 добавлений и 38 удалений

Просмотреть файл

@ -1,5 +1,7 @@
#
# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
# Copyright (c) 2019 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -7,16 +9,9 @@
# $HEADER$
#
# Convenience libtool library that will be slurped up into libmpi.la.
noinst_LTLIBRARIES = libmpiext_shortfloat_c.la
# This is where the top-level header file (that is included in
# <mpi-ext.h>) must be installed.
ompidir = $(ompiincludedir)/mpiext
# This is the header file that is installed.
ompi_HEADERS = mpiext_shortfloat_c.h
# Sources for the convenience libtool library.
libmpiext_shortfloat_c_la_SOURCES = $(ompi_HEADERS)
libmpiext_shortfloat_c_la_LDFLAGS = -module -avoid-version

Просмотреть файл

@ -1,6 +1,8 @@
# -*- shell-script -*-
#
# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
# Copyright (c) 2018-2019 FUJITSU LIMITED. All rights reserved.
# Copyright (c) 2019 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -41,3 +43,6 @@ AC_DEFUN([OMPI_MPIEXT_shortfloat_CONFIG],[
# and the mpi_f08_ext module. The former is integer and the latter is
# type(mpi_datatype).
AC_DEFUN([OMPI_MPIEXT_shortfloat_INCLUDE_MPIFH_IN_USEMPIF08], [0])
# This extension provides only header files for datatype handles.
AC_DEFUN([OMPI_MPIEXT_shortfloat_HAVE_OBJECT], [0])

Просмотреть файл

@ -7,17 +7,10 @@
# $HEADER$
#
# Convenience libtool library that will be slurped up into libmpi_mpifh.la.
noinst_LTLIBRARIES =
# Directory where the header file to be included in mpif-ext.h must be
# installed.
ompidir = $(ompiincludedir)/mpiext
# If we are, build the convenience libtool library that will be
# slurped up into libmpi_mpifh.la.
noinst_LTLIBRARIES += libmpiext_shortfloat_mpifh.la
# Just like noinst_LTLIBRARIES, set this macro to empty and
# conditionally add to it later.
ompi_HEADERS =
@ -29,8 +22,4 @@ if OMPI_BUILD_FORTRAN_MPIFH_BINDINGS
# This is the header file that is installed.
ompi_HEADERS += mpiext_shortfloat_mpifh.h
# Sources for the convenience libtool library.
libmpiext_shortfloat_mpifh_la_SOURCES = $(ompi_HEADERS)
libmpiext_shortfloat_mpifh_la_LDFLAGS = -module -avoid-version
endif

Просмотреть файл

@ -1,5 +1,7 @@
#
# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
# Copyright (c) 2019 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -10,33 +12,14 @@
# This file builds the use_mpi_f08-based bindings for MPI extensions. It
# is optional in MPI extensions.
# We must set these #defines and include paths so that the inner OMPI
# MPI prototype header files do the Right Thing.
AM_FCFLAGS = $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-f08/mod \
-I$(top_srcdir) $(FCFLAGS_f90)
# Note that the mpi_f08-based bindings are optional -- they can only
# be built if OMPI is also building the Fortran-based bindings. So we
# initially set some Makefile macros to empty, and then conditionally
# add to them later.
noinst_LTLIBRARIES =
# Use the Automake conditional to know if we're building the "use mpi_f08"
# bindings.
if OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS
# If we are, build the convenience libtool library that will be
# slurped up into libmpi_usempif08.la.
noinst_LTLIBRARIES += libmpiext_shortfloat_usempif08.la
# Note that no header files are installed; instead,
# mpiext_shortfloat_usempif08.h is automatically slurped up into the
# mpi_f08_ext module. It must be listed so that it is included in
# dist tarballs.
noinst_HEADERS = mpiext_shortfloat_usempif08.h
# Sources for the convenience libtool library.
libmpiext_shortfloat_usempif08_la_SOURCES = $(ompi_HEADERS)
libmpiext_shortfloat_usempif08_la_LDFLAGS = -module -avoid-version
endif