From 40cc00cdffd538b94ff790094618fec0466fac06 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 25 Apr 2018 10:24:01 -0700 Subject: [PATCH] fortran/tkr: Fix Makefile.am warnings Set mpi.lo dependencies outside of AM conditionals. Per https://github.com/open-mpi/ompi/issues/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 (cherry picked from commit open-mpi/ompi@5bd02f6649ac40b43094846799799e32f0a88b4a) --- ompi/mpi/fortran/use-mpi-tkr/Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ompi/mpi/fortran/use-mpi-tkr/Makefile.am b/ompi/mpi/fortran/use-mpi-tkr/Makefile.am index 5c15b61336a..ac95e8381a8 100644 --- a/ompi/mpi/fortran/use-mpi-tkr/Makefile.am +++ b/ompi/mpi/fortran/use-mpi-tkr/Makefile.am @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2006-2018 Cisco Systems, Inc. All rights reserved # Copyright (c) 2007 Los Alamos National Security, LLC. All rights # reserved. # Copyright (c) 2014-2015 Research Organization for Information Science @@ -85,9 +85,8 @@ if BUILD_FORTRAN_SIZEOF nodist_lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES += \ mpi-tkr-sizeof.h \ mpi-tkr-sizeof.f90 - -mpi.lo: mpi-tkr-sizeof.h endif +mpi.lo: $(nodist_lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES) # Note that we invoke some OPAL functions directly in # libmpi_usempi.la, so we need to link in the OPAL library directly