diff --git a/Makefile.am b/Makefile.am
index 118b188d2a..5f414d5746 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,6 +65,7 @@ SUBDIRS = \
   tracer_manager \
   sat_vapor_pres \
   random_numbers \
+  . \
   libFMS \
   test_fms \
   ${DOCS}
diff --git a/configure.ac b/configure.ac
index 1b3ed822f3..4fdb120617 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ LT_INIT()
 # is, then disable building shared libraries.  Note, the user can still override
 # this by using --enable-shared when running the configure script.
 AS_IF([test x${CRAYPE_VERSION:+yes} = "xyes"],[
-  AS_IF([test x${CRAYPE_LINK_TYP} = "xstatic"],
+  AS_IF([test x${CRAYPE_LINK_TYPE} = "xstatic"],
         [AC_DISABLE_SHARED])])
 
 
diff --git a/libFMS/Makefile.am b/libFMS/Makefile.am
index 8e358424da..f89a6d5e0b 100644
--- a/libFMS/Makefile.am
+++ b/libFMS/Makefile.am
@@ -60,6 +60,9 @@ libFMS_la_LIBADD += $(top_builddir)/exchange/libexchange.la
 libFMS_la_LIBADD += $(top_builddir)/topography/libtopography.la
 libFMS_la_LIBADD += $(top_builddir)/tracer_manager/libtracer_manager.la
 libFMS_la_LIBADD += $(top_builddir)/random_numbers/librandom_numbers.la
+libFMS_la_LIBADD += $(top_builddir)/diag_integral/libdiag_integral.la
+libFMS_la_LIBADD += $(top_builddir)/sat_vapor_pres/libsat_vapor_pres.la
+libFMS_la_LIBADD += $(top_builddir)/libFMS_mod.la
 
 # At least one source file must be included to please Automake.
 libFMS_la_SOURCES = $(top_builddir)/include/file_version.h