dtcenter · JohnHalleyGotway · Sep 14, 2022 · Aug 26, 2022 · Aug 26, 2022 · Sep 8, 2022
diff --git a/Make-include b/Make-include
@@ -3,6 +3,7 @@ MET_CPPFLAGS = -I${top_builddir}/src/basic/vx_cal \
 	     -I${top_builddir}/src/basic/vx_log \
 	     -I${top_builddir}/src/basic/vx_math \
 	     -I${top_builddir}/src/basic/vx_util \
+	     -I${top_builddir}/src/basic/vx_util_math \
 	     -I${top_builddir}/src/libcode/vx_afm \
 	     -I${top_builddir}/src/libcode/vx_analysis_util \
 	     -I${top_builddir}/src/libcode/vx_color \
@@ -47,6 +48,7 @@ MET_LDFLAGS = -L${top_builddir}/src/basic/vx_cal \
 	     -L${top_builddir}/src/basic/vx_log \
 	     -L${top_builddir}/src/basic/vx_math \
 	     -L${top_builddir}/src/basic/vx_util \
+	     -L${top_builddir}/src/basic/vx_util_math \
 	     -L${top_builddir}/src/libcode/vx_afm \
 	     -L${top_builddir}/src/libcode/vx_analysis_util \
 	     -L${top_builddir}/src/libcode/vx_color \

diff --git a/configure b/configure
@@ -8848,7 +8848,7 @@ done
 
 # Create configured files
 
-ac_config_files="$ac_config_files Makefile scripts/Rscripts/Makefile scripts/Rscripts/include/Makefile scripts/python/Makefile data/Makefile data/colortables/Makefile data/colortables/NCL_colortables/Makefile data/config/Makefile data/map/Makefile data/map/admin_by_country/Makefile data/poly/Makefile data/poly/HMT_masks/Makefile data/poly/NCEP_masks/Makefile data/wrappers/Makefile data/ps/Makefile data/table_files/Makefile data/tc_data/Makefile src/Makefile src/basic/Makefile src/basic/enum_to_string/Makefile src/basic/vx_cal/Makefile src/basic/vx_config/Makefile src/basic/vx_log/Makefile src/basic/vx_math/Makefile src/basic/vx_util/Makefile src/libcode/Makefile src/libcode/vx_afm/Makefile src/libcode/vx_analysis_util/Makefile src/libcode/vx_color/Makefile src/libcode/vx_data2d/Makefile src/libcode/vx_data2d_factory/Makefile src/libcode/vx_data2d_grib/Makefile src/libcode/vx_data2d_grib2/Makefile src/libcode/vx_data2d_nc_met/Makefile src/libcode/vx_data2d_nc_pinterp/Makefile src/libcode/vx_data2d_nccf/Makefile src/libcode/vx_geodesy/Makefile src/libcode/vx_gis/Makefile src/libcode/vx_gnomon/Makefile src/libcode/vx_grid/Makefile src/libcode/vx_gsl_prob/Makefile src/libcode/vx_nav/Makefile src/libcode/vx_solar/Makefile src/libcode/vx_nc_obs/Makefile src/libcode/vx_nc_util/Makefile src/libcode/vx_pb_util/Makefile src/libcode/vx_plot_util/Makefile src/libcode/vx_ps/Makefile src/libcode/vx_pxm/Makefile src/libcode/vx_render/Makefile src/libcode/vx_shapedata/Makefile src/libcode/vx_stat_out/Makefile src/libcode/vx_statistics/Makefile src/libcode/vx_time_series/Makefile src/libcode/vx_physics/Makefile src/libcode/vx_series_data/Makefile src/libcode/vx_regrid/Makefile src/libcode/vx_tc_util/Makefile src/libcode/vx_summary/Makefile src/libcode/vx_python3_utils/Makefile src/libcode/vx_data2d_python/Makefile src/libcode/vx_bool_calc/Makefile src/libcode/vx_pointdata_python/Makefile src/tools/Makefile src/tools/core/Makefile src/tools/core/ensemble_stat/Makefile src/tools/core/grid_stat/Makefile src/tools/core/mode/Makefile src/tools/core/mode_analysis/Makefile src/tools/core/pcp_combine/Makefile src/tools/core/point_stat/Makefile src/tools/core/series_analysis/Makefile src/tools/core/stat_analysis/Makefile src/tools/core/wavelet_stat/Makefile src/tools/other/Makefile src/tools/other/ascii2nc/Makefile src/tools/other/lidar2nc/Makefile src/tools/other/gen_ens_prod/Makefile src/tools/other/gen_vx_mask/Makefile src/tools/other/gis_utils/Makefile src/tools/other/ioda2nc/Makefile src/tools/other/madis2nc/Makefile src/tools/other/mode_graphics/Makefile src/tools/other/modis_regrid/Makefile src/tools/other/pb2nc/Makefile src/tools/other/plot_data_plane/Makefile src/tools/other/plot_point_obs/Makefile src/tools/other/wwmca_tool/Makefile src/tools/other/gsi_tools/Makefile src/tools/other/regrid_data_plane/Makefile src/tools/other/point2grid/Makefile src/tools/other/shift_data_plane/Makefile src/tools/other/mode_time_domain/Makefile src/tools/other/grid_diag/Makefile src/tools/tc_utils/Makefile src/tools/tc_utils/tc_dland/Makefile src/tools/tc_utils/tc_pairs/Makefile src/tools/tc_utils/tc_stat/Makefile src/tools/tc_utils/tc_gen/Makefile src/tools/tc_utils/rmw_analysis/Makefile src/tools/tc_utils/tc_rmw/Makefile"
+ac_config_files="$ac_config_files Makefile scripts/Rscripts/Makefile scripts/Rscripts/include/Makefile scripts/python/Makefile data/Makefile data/colortables/Makefile data/colortables/NCL_colortables/Makefile data/config/Makefile data/map/Makefile data/map/admin_by_country/Makefile data/poly/Makefile data/poly/HMT_masks/Makefile data/poly/NCEP_masks/Makefile data/wrappers/Makefile data/ps/Makefile data/table_files/Makefile data/tc_data/Makefile src/Makefile src/basic/Makefile src/basic/enum_to_string/Makefile src/basic/vx_cal/Makefile src/basic/vx_config/Makefile src/basic/vx_log/Makefile src/basic/vx_math/Makefile src/basic/vx_util/Makefile src/basic/vx_util_math/Makefile src/libcode/Makefile src/libcode/vx_afm/Makefile src/libcode/vx_analysis_util/Makefile src/libcode/vx_color/Makefile src/libcode/vx_data2d/Makefile src/libcode/vx_data2d_factory/Makefile src/libcode/vx_data2d_grib/Makefile src/libcode/vx_data2d_grib2/Makefile src/libcode/vx_data2d_nc_met/Makefile src/libcode/vx_data2d_nc_pinterp/Makefile src/libcode/vx_data2d_nccf/Makefile src/libcode/vx_geodesy/Makefile src/libcode/vx_gis/Makefile src/libcode/vx_gnomon/Makefile src/libcode/vx_grid/Makefile src/libcode/vx_gsl_prob/Makefile src/libcode/vx_nav/Makefile src/libcode/vx_solar/Makefile src/libcode/vx_nc_obs/Makefile src/libcode/vx_nc_util/Makefile src/libcode/vx_pb_util/Makefile src/libcode/vx_plot_util/Makefile src/libcode/vx_ps/Makefile src/libcode/vx_pxm/Makefile src/libcode/vx_render/Makefile src/libcode/vx_shapedata/Makefile src/libcode/vx_stat_out/Makefile src/libcode/vx_statistics/Makefile src/libcode/vx_time_series/Makefile src/libcode/vx_physics/Makefile src/libcode/vx_series_data/Makefile src/libcode/vx_regrid/Makefile src/libcode/vx_tc_util/Makefile src/libcode/vx_summary/Makefile src/libcode/vx_python3_utils/Makefile src/libcode/vx_data2d_python/Makefile src/libcode/vx_bool_calc/Makefile src/libcode/vx_pointdata_python/Makefile src/tools/Makefile src/tools/core/Makefile src/tools/core/ensemble_stat/Makefile src/tools/core/grid_stat/Makefile src/tools/core/mode/Makefile src/tools/core/mode_analysis/Makefile src/tools/core/pcp_combine/Makefile src/tools/core/point_stat/Makefile src/tools/core/series_analysis/Makefile src/tools/core/stat_analysis/Makefile src/tools/core/wavelet_stat/Makefile src/tools/other/Makefile src/tools/other/ascii2nc/Makefile src/tools/other/lidar2nc/Makefile src/tools/other/gen_ens_prod/Makefile src/tools/other/gen_vx_mask/Makefile src/tools/other/gis_utils/Makefile src/tools/other/ioda2nc/Makefile src/tools/other/madis2nc/Makefile src/tools/other/mode_graphics/Makefile src/tools/other/modis_regrid/Makefile src/tools/other/pb2nc/Makefile src/tools/other/plot_data_plane/Makefile src/tools/other/plot_point_obs/Makefile src/tools/other/wwmca_tool/Makefile src/tools/other/gsi_tools/Makefile src/tools/other/regrid_data_plane/Makefile src/tools/other/point2grid/Makefile src/tools/other/shift_data_plane/Makefile src/tools/other/mode_time_domain/Makefile src/tools/other/grid_diag/Makefile src/tools/tc_utils/Makefile src/tools/tc_utils/tc_dland/Makefile src/tools/tc_utils/tc_pairs/Makefile src/tools/tc_utils/tc_stat/Makefile src/tools/tc_utils/tc_gen/Makefile src/tools/tc_utils/rmw_analysis/Makefile src/tools/tc_utils/tc_rmw/Makefile"
 
 
 if test -n "$MET_DEVELOPMENT"; then
@@ -9757,6 +9757,7 @@ do
     "src/basic/vx_log/Makefile") CONFIG_FILES="$CONFIG_FILES src/basic/vx_log/Makefile" ;;
     "src/basic/vx_math/Makefile") CONFIG_FILES="$CONFIG_FILES src/basic/vx_math/Makefile" ;;
     "src/basic/vx_util/Makefile") CONFIG_FILES="$CONFIG_FILES src/basic/vx_util/Makefile" ;;
+    "src/basic/vx_util_math/Makefile") CONFIG_FILES="$CONFIG_FILES src/basic/vx_util_math/Makefile" ;;
     "src/libcode/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/Makefile" ;;
     "src/libcode/vx_afm/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_afm/Makefile" ;;
     "src/libcode/vx_analysis_util/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_analysis_util/Makefile" ;;

diff --git a/configure.ac b/configure.ac
@@ -1204,6 +1204,7 @@ AC_CONFIG_FILES([Makefile
                  src/basic/vx_log/Makefile
                  src/basic/vx_math/Makefile
                  src/basic/vx_util/Makefile
+                 src/basic/vx_util_math/Makefile
                  src/libcode/Makefile
                  src/libcode/vx_afm/Makefile
                  src/libcode/vx_analysis_util/Makefile

diff --git a/internal/test_util/basic/vx_util/Makefile.am b/internal/test_util/basic/vx_util/Makefile.am
@@ -104,6 +104,7 @@ test_ascii_header_LDADD = -lvx_stat_out \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/basic/vx_util/Makefile.in b/internal/test_util/basic/vx_util/Makefile.in
@@ -398,6 +398,7 @@ test_ascii_header_LDADD = -lvx_stat_out \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.am b/internal/test_util/libcode/vx_data2d_factory/Makefile.am
@@ -44,6 +44,7 @@ test_factory_LDADD = -lvx_stat_out \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.in b/internal/test_util/libcode/vx_data2d_factory/Makefile.in
@@ -351,6 +351,7 @@ test_factory_LDADD = -lvx_stat_out \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.am b/internal/test_util/libcode/vx_data2d_grib/Makefile.am
@@ -20,6 +20,7 @@ test_read_grib1_LDADD = -lvx_data2d_grib \
 	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.in b/internal/test_util/libcode/vx_data2d_grib/Makefile.in
@@ -321,6 +321,7 @@ test_read_grib1_LDADD = -lvx_data2d_grib \
 	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am
@@ -21,6 +21,7 @@ test_read_nc_met_LDADD = -lvx_data2d_nc_met \
 	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in
@@ -323,6 +323,7 @@ test_read_nc_met_LDADD = -lvx_data2d_nc_met \
 	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.am b/internal/test_util/libcode/vx_data2d_nccf/Makefile.am
@@ -21,6 +21,7 @@ test_read_nccf_LDADD = -lvx_data2d_nccf \
 	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in
@@ -321,6 +321,7 @@ test_read_nccf_LDADD = -lvx_data2d_nccf \
 	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/libcode/vx_grid/Makefile.am b/internal/test_util/libcode/vx_grid/Makefile.am
@@ -17,6 +17,7 @@ test_grid_area_CPPFLAGS = ${MET_CPPFLAGS}
 test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS}
 test_grid_area_LDADD = -lvx_grid \
 	-lvx_nav \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_log \

diff --git a/internal/test_util/libcode/vx_grid/Makefile.in b/internal/test_util/libcode/vx_grid/Makefile.in
@@ -317,6 +317,7 @@ test_grid_area_CPPFLAGS = ${MET_CPPFLAGS}
 test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS}
 test_grid_area_LDADD = -lvx_grid \
 	-lvx_nav \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_log \

diff --git a/internal/test_util/libcode/vx_nc_util/Makefile.am b/internal/test_util/libcode/vx_nc_util/Makefile.am
@@ -42,6 +42,7 @@ test_pressure_levels_LDADD = -lvx_stat_out \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/libcode/vx_nc_util/Makefile.in b/internal/test_util/libcode/vx_nc_util/Makefile.in
@@ -343,6 +343,7 @@ test_pressure_levels_LDADD = -lvx_stat_out \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/libcode/vx_tc_util/Makefile.am b/internal/test_util/libcode/vx_tc_util/Makefile.am
@@ -44,6 +44,7 @@ test_read_LDADD = -lvx_stat_out \
 	-lvx_gsl_prob \
 	-lvx_cal \
 	-lvx_nav \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \
@@ -60,6 +61,7 @@ test_read_prob_LDADD = -lvx_stat_out \
 	-lvx_analysis_util \
 	-lvx_tc_util \
 	-lvx_shapedata \
+	-lvx_util_math \
 	-lvx_util \
 	$(PYTHON_LIBS) \
 	-lvx_statistics \
@@ -77,6 +79,7 @@ test_read_prob_LDADD = -lvx_stat_out \
 	-lvx_gsl_prob \
 	-lvx_cal \
 	-lvx_nav \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/libcode/vx_tc_util/Makefile.in b/internal/test_util/libcode/vx_tc_util/Makefile.in
@@ -349,6 +349,7 @@ test_read_LDADD = -lvx_stat_out \
 	-lvx_gsl_prob \
 	-lvx_cal \
 	-lvx_nav \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \
@@ -365,6 +366,7 @@ test_read_prob_LDADD = -lvx_stat_out \
 	-lvx_analysis_util \
 	-lvx_tc_util \
 	-lvx_shapedata \
+	-lvx_util_math \
 	-lvx_util \
 	$(PYTHON_LIBS) \
 	-lvx_statistics \
@@ -382,6 +384,7 @@ test_read_prob_LDADD = -lvx_stat_out \
 	-lvx_gsl_prob \
 	-lvx_cal \
 	-lvx_nav \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.am b/internal/test_util/tools/other/mode_time_domain/Makefile.am
@@ -65,6 +65,7 @@ test_velocity_LDADD = \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.in b/internal/test_util/tools/other/mode_time_domain/Makefile.in
@@ -390,6 +390,7 @@ test_velocity_LDADD = \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
+	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \

diff --git a/src/basic/Makefile.am b/src/basic/Makefile.am
@@ -25,6 +25,7 @@ endif
 
 SUBDIRS += vx_math \
 	vx_util \
+	vx_util_math \
 	vx_config
 
 MAINTAINERCLEANFILES 	= Makefile.in
diff --git a/src/basic/Makefile.in b/src/basic/Makefile.in
@@ -152,7 +152,8 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = vx_log vx_cal enum_to_string vx_math vx_util vx_config
+DIST_SUBDIRS = vx_log vx_cal enum_to_string vx_math vx_util \
+	vx_util_math vx_config
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
@@ -324,7 +325,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = vx_log vx_cal $(am__append_1) vx_math vx_util vx_config
+SUBDIRS = vx_log vx_cal $(am__append_1) vx_math vx_util vx_util_math \
+	vx_config
 MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
 

diff --git a/src/basic/vx_log/Makefile.am b/src/basic/vx_log/Makefile.am
@@ -15,7 +15,6 @@ libvx_log_a_SOURCES = concat_string.cc concat_string.h \
                file_fxns.cc file_fxns.h \
                indent.cc indent.h \
                logger.cc logger.h \
-               main.cc main.h \
                string_array.cc string_array.h \
                str_wrappers.cc str_wrappers.h \
                vx_log.h

diff --git a/src/basic/vx_log/Makefile.in b/src/basic/vx_log/Makefile.in
@@ -108,8 +108,8 @@ am__v_AR_1 =
 libvx_log_a_AR = $(AR) $(ARFLAGS)
 libvx_log_a_LIBADD =
 am_libvx_log_a_OBJECTS = concat_string.$(OBJEXT) file_fxns.$(OBJEXT) \
-	indent.$(OBJEXT) logger.$(OBJEXT) main.$(OBJEXT) \
-	string_array.$(OBJEXT) str_wrappers.$(OBJEXT)
+	indent.$(OBJEXT) logger.$(OBJEXT) string_array.$(OBJEXT) \
+	str_wrappers.$(OBJEXT)
 libvx_log_a_OBJECTS = $(am_libvx_log_a_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -128,8 +128,8 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/concat_string.Po \
 	./$(DEPDIR)/file_fxns.Po ./$(DEPDIR)/indent.Po \
-	./$(DEPDIR)/logger.Po ./$(DEPDIR)/main.Po \
-	./$(DEPDIR)/str_wrappers.Po ./$(DEPDIR)/string_array.Po
+	./$(DEPDIR)/logger.Po ./$(DEPDIR)/str_wrappers.Po \
+	./$(DEPDIR)/string_array.Po
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -336,7 +336,6 @@ libvx_log_a_SOURCES = concat_string.cc concat_string.h \
                file_fxns.cc file_fxns.h \
                indent.cc indent.h \
                logger.cc logger.h \
-               main.cc main.h \
                string_array.cc string_array.h \
                str_wrappers.cc str_wrappers.h \
                vx_log.h
@@ -393,7 +392,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_fxns.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indent.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str_wrappers.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_array.Po@am__quote@ # am--include-marker
 
@@ -549,7 +547,6 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/file_fxns.Po
 	-rm -f ./$(DEPDIR)/indent.Po
 	-rm -f ./$(DEPDIR)/logger.Po
-	-rm -f ./$(DEPDIR)/main.Po
 	-rm -f ./$(DEPDIR)/str_wrappers.Po
 	-rm -f ./$(DEPDIR)/string_array.Po
 	-rm -f Makefile
@@ -601,7 +598,6 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/file_fxns.Po
 	-rm -f ./$(DEPDIR)/indent.Po
 	-rm -f ./$(DEPDIR)/logger.Po
-	-rm -f ./$(DEPDIR)/main.Po
 	-rm -f ./$(DEPDIR)/str_wrappers.Po
 	-rm -f ./$(DEPDIR)/string_array.Po
 	-rm -f Makefile

diff --git a/src/basic/vx_math/Makefile.am b/src/basic/vx_math/Makefile.am
@@ -23,7 +23,6 @@ libvx_math_a_SOURCES = viewgravity_to_string.cc viewgravity_to_string.h \
                is_bad_data.h \
                trig.h \
                legendre.cc legendre.h \
-               so3.h so3.cc \
                vx_vector.h vx_vector.cc \
                vx_math.h
 libvx_math_a_CPPFLAGS = ${MET_CPPFLAGS}