diff --git a/src/libcode/Makefile.am b/src/libcode/Makefile.am
index e53020ed8a..e20f67551a 100644
--- a/src/libcode/Makefile.am
+++ b/src/libcode/Makefile.am
@@ -22,7 +22,6 @@ SUBDIRS	= vx_grid \
 	vx_data2d_grib \
 	vx_data2d_nc_met \
 	vx_data2d_nccf \
-	vx_data2d_ugrid \
 	vx_data2d_nc_pinterp
 
 if ENABLE_PYTHON
@@ -31,11 +30,14 @@ if ENABLE_PYTHON
   SUBDIRS += vx_pointdata_python
 endif
 
-
 if ENABLE_GRIB2
   SUBDIRS += vx_data2d_grib2
 endif
 
+if ENABLE_UGRID
+  SUBDIRS += vx_data2d_ugrid
+endif
+
 SUBDIRS += vx_data2d_factory \
 	vx_gsl_prob \
 	vx_gnomon \
diff --git a/src/libcode/Makefile.in b/src/libcode/Makefile.in
index abfb5fd571..e5ad4aaac4 100644
--- a/src/libcode/Makefile.in
+++ b/src/libcode/Makefile.in
@@ -90,6 +90,7 @@ host_triplet = @host@
 @ENABLE_PYTHON_TRUE@am__append_1 = vx_python3_utils vx_data2d_python \
 @ENABLE_PYTHON_TRUE@	vx_pointdata_python
 @ENABLE_GRIB2_TRUE@am__append_2 = vx_data2d_grib2
+@ENABLE_UGRID_TRUE@am__append_3 = vx_data2d_ugrid
 subdir = src/libcode
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -155,14 +156,14 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = vx_grid vx_data2d vx_nc_util vx_data2d_grib \
-	vx_data2d_nc_met vx_data2d_nccf vx_data2d_ugrid \
-	vx_data2d_nc_pinterp vx_python3_utils vx_data2d_python \
-	vx_pointdata_python vx_data2d_grib2 vx_data2d_factory \
-	vx_gsl_prob vx_gnomon vx_geodesy vx_gis vx_nav vx_pb_util \
-	vx_afm vx_color vx_pxm vx_render vx_ps vx_plot_util \
-	vx_shapedata vx_statistics vx_stat_out vx_analysis_util \
-	vx_tc_util vx_summary vx_time_series vx_physics vx_series_data \
-	vx_regrid vx_nc_obs vx_solar vx_bool_calc vx_seeps
+	vx_data2d_nc_met vx_data2d_nccf vx_data2d_nc_pinterp \
+	vx_python3_utils vx_data2d_python vx_pointdata_python \
+	vx_data2d_grib2 vx_data2d_ugrid vx_data2d_factory vx_gsl_prob \
+	vx_gnomon vx_geodesy vx_gis vx_nav vx_pb_util vx_afm vx_color \
+	vx_pxm vx_render vx_ps vx_plot_util vx_shapedata vx_statistics \
+	vx_stat_out vx_analysis_util vx_tc_util vx_summary \
+	vx_time_series vx_physics vx_series_data vx_regrid vx_nc_obs \
+	vx_solar vx_bool_calc vx_seeps
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
@@ -288,6 +289,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+UGRID_LIBS = @UGRID_LIBS@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -345,8 +347,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = vx_grid vx_data2d vx_nc_util vx_data2d_grib vx_data2d_nc_met \
-	vx_data2d_nccf vx_data2d_ugrid vx_data2d_nc_pinterp \
-	$(am__append_1) $(am__append_2) vx_data2d_factory vx_gsl_prob \
+	vx_data2d_nccf vx_data2d_nc_pinterp $(am__append_1) \
+	$(am__append_2) $(am__append_3) vx_data2d_factory vx_gsl_prob \
 	vx_gnomon vx_geodesy vx_gis vx_nav vx_pb_util vx_afm vx_color \
 	vx_pxm vx_render vx_ps vx_plot_util vx_shapedata vx_statistics \
 	vx_stat_out vx_analysis_util vx_tc_util vx_summary \