cleanup of flag use in src/flib

jedwards4b · Aug 18, 2020 · 6213867 · 6213867
1 parent 4f80a53
commit 6213867
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 2 deletions.
diff --git a/src/flib/Makefile.am b/src/flib/Makefile.am
@@ -7,8 +7,6 @@
 # The library we are building.
 lib_LTLIBRARIES = libpiof.la
 
-AM_CPPFLAGS = -D_NETCDF4 -D_PNETCDF
-
 # These linker flags specify libtool version info.
 # See http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
 # for information regarding incrementing `-version-info`.

diff --git a/src/flib/pio_kinds.F90 b/src/flib/pio_kinds.F90
@@ -4,6 +4,7 @@
 !! types like integer, character, logical, real4 and real8.
 !!
 !<
+#include "config.h"
  module pio_kinds
 
 !  uses mpi if available

diff --git a/src/flib/pio_nf.F90 b/src/flib/pio_nf.F90
@@ -1,3 +1,4 @@
+#include "config.h"
 !>
 !! @file
 !! Code to implement the classic netCDF Fortran API in PIO.

diff --git a/src/flib/pio_support.F90 b/src/flib/pio_support.F90
@@ -1,3 +1,4 @@
+#include "config.h"
 !>
 !! @file
 !! Internal code for compiler workarounds, aborts and debug functions.

diff --git a/src/flib/pio_types.F90 b/src/flib/pio_types.F90
@@ -1,3 +1,4 @@
+#include "config.h"
 !>
 !! @file
 !! Derived datatypes and constants for PIO Fortran API.

diff --git a/src/flib/piodarray.F90.in b/src/flib/piodarray.F90.in
@@ -1,4 +1,5 @@
 #define __PIO_FILE__ 'piodarray'
+#include "config.h"
 !>
 !! @file
 !! Read and write routines for decomposed data.

diff --git a/src/flib/pionfatt_mod.F90.in b/src/flib/pionfatt_mod.F90.in
@@ -1,4 +1,5 @@
 #define __PIO_FILE__ "pionfatt_mod.F90"
+#include "config.h"
 !>
 !! @file
 !! @brief NetCDF attribute interface to PIO

diff --git a/src/flib/pionfget_mod.F90.in b/src/flib/pionfget_mod.F90.in
@@ -1,4 +1,5 @@
 #define __PIO_FILE__ "pionfget_mod.F90"
+#include "config.h"
 !>
 !! @file
 !! @brief Read Routines for non-decomposed NetCDF data.

diff --git a/src/flib/pionfput_mod.F90.in b/src/flib/pionfput_mod.F90.in
@@ -1,4 +1,5 @@
 #define __PIO_FILE__ "pionfput_mod.F90"
+#include "config.h"
 !>
 !! @file
 !! @brief Write routines for non-decomposed NetCDF data.