Mixed mode updates for beta1

CMakeLists.txt

@@ -321,9 +321,11 @@ foreach(kind ${kinds})
                                                  field_manager/include
                                                  time_interp/include
                                                  tracer_manager/include
+                                                 tridiagonal/include
                                                  interpolator/include
                                                  coupler/include
-                                                 data_override/include)
+                                                 data_override/include
+                                                 amip_interp/include)
 
   target_compile_definitions(${libTgt}_f PRIVATE "${fms_defs}")
   target_compile_definitions(${libTgt}_f PRIVATE "${${kind}_defs}")
@@ -378,7 +380,9 @@ foreach(kind ${kinds})
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/interpolator/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/coupler/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mosaic2/include>
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/data_override/include>)
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/data_override/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tridiagonal/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/amip_interp/include>)
 
   target_include_directories(${libTgt} INTERFACE
     $<BUILD_INTERFACE:${moduleDir}>

Makefile.am

@@ -35,8 +35,8 @@ endif
 # Make targets will be run in each subdirectory. Order is significant.
 SUBDIRS = \
   platform \
-  tridiagonal \
   mpp \
+  tridiagonal \
   constants \
   constants4 \
   memutils \

amip_interp/Makefile.am

@@ -23,14 +23,18 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/amip_interp/include
 AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libamip_interp.la
 
 # The convenience library depends on its source.
-libamip_interp_la_SOURCES = amip_interp.F90
+libamip_interp_la_SOURCES = \
+  amip_interp.F90 \
+  include/amip_interp.inc \
+  include/amip_interp_r4.fh \
+  include/amip_interp_r8.fh
 
 BUILT_SOURCES = amip_interp_mod.$(FC_MODEXT)
 nodist_include_HEADERS = amip_interp_mod.$(FC_MODEXT)