From 5f190e84e8ae7f10469376904bf359cb5f964447 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 18 Aug 2020 08:48:54 -0600 Subject: [PATCH] more fortran flag cleanup --- tests/fncint/Makefile.am | 4 ++-- tests/performance/Makefile.am | 4 ++-- tests/performance/pioperformance.F90 | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/fncint/Makefile.am b/tests/fncint/Makefile.am index f45c1ca5810..086b11ebaf7 100644 --- a/tests/fncint/Makefile.am +++ b/tests/fncint/Makefile.am @@ -3,8 +3,8 @@ # Ed Hartnett 7/3/19 -# Put together AM_CPPFLAGS and AM_LDFLAGS. -include $(top_srcdir)/set_flags.am +# Find the pio.mod file. +AM_CPPFLAGS = -I$(top_srcdir)/src/flib # Link to the PIO Fortran and C libraries. LDADD = ${top_builddir}/src/flib/libpiof.la ${top_builddir}/src/clib/libpioc.la diff --git a/tests/performance/Makefile.am b/tests/performance/Makefile.am index 751b970be92..d63c58c4b9d 100644 --- a/tests/performance/Makefile.am +++ b/tests/performance/Makefile.am @@ -6,8 +6,8 @@ # Parallel builds don't currently work in this directory. .NOTPARALLEL: -# Put together AM_CPPFLAGS and AM_LDFLAGS. -include $(top_srcdir)/set_flags.am +# Find the pio.mod file. +AM_CPPFLAGS = -I$(top_srcdir)/src/flib # Link to test util library and PIO Fortran and C libs. LDADD = $(top_builddir)/src/gptl/libperf_mod.la \ diff --git a/tests/performance/pioperformance.F90 b/tests/performance/pioperformance.F90 index cb293158740..8a5e2e732b0 100644 --- a/tests/performance/pioperformance.F90 +++ b/tests/performance/pioperformance.F90 @@ -1,3 +1,4 @@ +#include "config.h" #define VARINT 1 !#define VARREAL 1 !#define VARDOUBLE 1