Skip to content

Commit 613bab5

Browse files
jsquyresggouaillardet
authored andcommitted
fortran/tkr: Fix Makefile.am warnings
Set mpi.lo dependencies outside of AM conditionals. Per open-mpi#5085, make mpi.lo depend on whatever we decide the sizeof source files are (which may be empty, if this compiler does not support the Right Stuff for MPI_SIZEOF, or it may be mpi-tkr-sizeof.[h|f90]). Signed-off-by: Jeff Squyres <[email protected]> (cherry picked from commit open-mpi/ompi@5bd02f6)
1 parent 47c596b commit 613bab5

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

ompi/mpi/fortran/use-mpi-tkr/Makefile.am

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# University of Stuttgart. All rights reserved.
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
13-
# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
13+
# Copyright (c) 2006-2018 Cisco Systems, Inc. All rights reserved
1414
# Copyright (c) 2007 Los Alamos National Security, LLC. All rights
1515
# reserved.
1616
# Copyright (c) 2014-2016 Research Organization for Information Science
@@ -89,9 +89,8 @@ if BUILD_FORTRAN_SIZEOF
8989
nodist_lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES += \
9090
mpi-tkr-sizeof.h \
9191
mpi-tkr-sizeof.f90
92-
93-
mpi.lo: mpi-tkr-sizeof.h
9492
endif
93+
mpi.lo: $(nodist_lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES)
9594

9695
# Note that we invoke some OPAL functions directly in
9796
# libmpi_usempi.la, so we need to link in the OPAL library directly

0 commit comments

Comments
 (0)