From 5b7f801042774f4c2ec42c397acf29da707cd00d Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 18 Aug 2020 08:56:31 -0600 Subject: [PATCH] more fortran flag cleanup --- Makefile.am | 2 +- examples/f03/Makefile.am | 4 ++-- examples/f03/examplePio.f90 | 1 + set_flags.am | 18 ------------------ 4 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 set_flags.am diff --git a/Makefile.am b/Makefile.am index faa7feb3f4e..8d6fc16db28 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,5 +14,5 @@ endif SUBDIRS = src tests examples ${DOC} scripts cmake # Add these files to the distribution. -EXTRA_DIST = CMakeLists.txt set_flags.am COPYRIGHT cmake_config.h.in \ +EXTRA_DIST = CMakeLists.txt COPYRIGHT cmake_config.h.in \ libpio.settings.in diff --git a/examples/f03/Makefile.am b/examples/f03/Makefile.am index 9a8781d20ad..fc885d0878d 100644 --- a/examples/f03/Makefile.am +++ b/examples/f03/Makefile.am @@ -3,8 +3,8 @@ # Ed Hartnett 7/17/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 AM_FCFLAGS = -I$(top_srcdir)/src/flib diff --git a/examples/f03/examplePio.f90 b/examples/f03/examplePio.f90 index d2baddf2096..88804b7acab 100644 --- a/examples/f03/examplePio.f90 +++ b/examples/f03/examplePio.f90 @@ -1,3 +1,4 @@ +#include "config.h" !> @file !! A simple Fortran example for the ParallelIO Library. module pioExample diff --git a/set_flags.am b/set_flags.am deleted file mode 100644 index 08efa30db22..00000000000 --- a/set_flags.am +++ /dev/null @@ -1,18 +0,0 @@ -# This is part of the PIO package. -# -# Assemble the CPPFLAGS and for PIO Fortran tests. -# -# Ed Hartnett 3/26/19 - -# Set the CPPFLAGS. -AM_CPPFLAGS = -I$(top_srcdir)/src/flib -D_NETCDF - -# Is the user building with pnetcdf? -if BUILD_PNETCDF -AM_CPPFLAGS += -D_PNETCDF -endif - -# Is the user building with netCDF-4 parallel I/O? -if BUILD_NETCDF4 -AM_CPPFLAGS += -D_NETCDF4 -endif