diff --git a/Make-include b/Make-include index 784b2dcdd8..5d47052ab8 100644 --- 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 index 60e874d93b..bb104922ad 100755 --- 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 index 9cf16a2f86..e580dcefd7 100644 --- 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 index 96afff9e82..9d289ddaf2 100644 --- 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 index 92a97c3470..0827617613 100644 --- 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 index 04a31968c0..56c2d8b39c 100644 --- 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 index 0350814177..902879f0e6 100644 --- 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 index 662306b683..98b98e107e 100644 --- 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 index 0afc0481e4..b6eed1a9d1 100644 --- 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 index f93bdb37eb..44fb5a4500 100644 --- 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 index d351e950c8..5593c9c5ee 100644 --- 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 index a4f1713c5e..b39e9ea8ad 100644 --- 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 index 290e0983e1..5d9b74d852 100644 --- 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 index dfce6b1eb2..bb718f02b0 100644 --- 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 index 63e4a37b09..62512d49b7 100644 --- 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 index ff40235a5c..b374eba00f 100644 --- 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 index 12cc0c0ccf..57f091eed3 100644 --- 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 index a1d0fed6c5..5f3c12868d 100644 --- 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 index 1d54d61f1a..1d6a17442c 100644 --- 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 index 693d9de44c..e6146a8d2a 100644 --- 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 index fd4dda4c92..6a57baf133 100644 --- 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 index 53ed55eff4..363f2b42b9 100644 --- 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 index e2f2780d5c..b6f34032a8 100644 --- 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 index 6679fec4a2..9e4ba32cf2 100644 --- 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 index 9c229711b2..64b1b5ccc7 100644 --- 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 index 68c98c23ab..1f47ebac2c 100644 --- 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} diff --git a/src/basic/vx_math/Makefile.in b/src/basic/vx_math/Makefile.in index af41825bee..b99d0c4ebd 100644 --- a/src/basic/vx_math/Makefile.in +++ b/src/basic/vx_math/Makefile.in @@ -113,7 +113,7 @@ am_libvx_math_a_OBJECTS = \ libvx_math_a-nint.$(OBJEXT) libvx_math_a-nti.$(OBJEXT) \ libvx_math_a-ptile.$(OBJEXT) libvx_math_a-pwl.$(OBJEXT) \ libvx_math_a-affine.$(OBJEXT) libvx_math_a-legendre.$(OBJEXT) \ - libvx_math_a-so3.$(OBJEXT) libvx_math_a-vx_vector.$(OBJEXT) + libvx_math_a-vx_vector.$(OBJEXT) libvx_math_a_OBJECTS = $(am_libvx_math_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -138,7 +138,6 @@ am__depfiles_remade = ./$(DEPDIR)/libvx_math_a-affine.Po \ ./$(DEPDIR)/libvx_math_a-nti.Po \ ./$(DEPDIR)/libvx_math_a-ptile.Po \ ./$(DEPDIR)/libvx_math_a-pwl.Po \ - ./$(DEPDIR)/libvx_math_a-so3.Po \ ./$(DEPDIR)/libvx_math_a-viewgravity_to_string.Po \ ./$(DEPDIR)/libvx_math_a-vx_vector.Po am__mv = mv -f @@ -359,7 +358,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 @@ -420,7 +418,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_math_a-nti.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_math_a-ptile.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_math_a-pwl.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_math_a-so3.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_math_a-viewgravity_to_string.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_math_a-vx_vector.Po@am__quote@ # am--include-marker @@ -570,20 +567,6 @@ libvx_math_a-legendre.obj: legendre.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_math_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_math_a-legendre.obj `if test -f 'legendre.cc'; then $(CYGPATH_W) 'legendre.cc'; else $(CYGPATH_W) '$(srcdir)/legendre.cc'; fi` -libvx_math_a-so3.o: so3.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_math_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_math_a-so3.o -MD -MP -MF $(DEPDIR)/libvx_math_a-so3.Tpo -c -o libvx_math_a-so3.o `test -f 'so3.cc' || echo '$(srcdir)/'`so3.cc -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_math_a-so3.Tpo $(DEPDIR)/libvx_math_a-so3.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='so3.cc' object='libvx_math_a-so3.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_math_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_math_a-so3.o `test -f 'so3.cc' || echo '$(srcdir)/'`so3.cc - -libvx_math_a-so3.obj: so3.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_math_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_math_a-so3.obj -MD -MP -MF $(DEPDIR)/libvx_math_a-so3.Tpo -c -o libvx_math_a-so3.obj `if test -f 'so3.cc'; then $(CYGPATH_W) 'so3.cc'; else $(CYGPATH_W) '$(srcdir)/so3.cc'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_math_a-so3.Tpo $(DEPDIR)/libvx_math_a-so3.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='so3.cc' object='libvx_math_a-so3.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_math_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_math_a-so3.obj `if test -f 'so3.cc'; then $(CYGPATH_W) 'so3.cc'; else $(CYGPATH_W) '$(srcdir)/so3.cc'; fi` - libvx_math_a-vx_vector.o: vx_vector.cc @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_math_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_math_a-vx_vector.o -MD -MP -MF $(DEPDIR)/libvx_math_a-vx_vector.Tpo -c -o libvx_math_a-vx_vector.o `test -f 'vx_vector.cc' || echo '$(srcdir)/'`vx_vector.cc @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_math_a-vx_vector.Tpo $(DEPDIR)/libvx_math_a-vx_vector.Po @@ -731,7 +714,6 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libvx_math_a-nti.Po -rm -f ./$(DEPDIR)/libvx_math_a-ptile.Po -rm -f ./$(DEPDIR)/libvx_math_a-pwl.Po - -rm -f ./$(DEPDIR)/libvx_math_a-so3.Po -rm -f ./$(DEPDIR)/libvx_math_a-viewgravity_to_string.Po -rm -f ./$(DEPDIR)/libvx_math_a-vx_vector.Po -rm -f Makefile @@ -787,7 +769,6 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libvx_math_a-nti.Po -rm -f ./$(DEPDIR)/libvx_math_a-ptile.Po -rm -f ./$(DEPDIR)/libvx_math_a-pwl.Po - -rm -f ./$(DEPDIR)/libvx_math_a-so3.Po -rm -f ./$(DEPDIR)/libvx_math_a-viewgravity_to_string.Po -rm -f ./$(DEPDIR)/libvx_math_a-vx_vector.Po -rm -f Makefile diff --git a/src/basic/vx_util/Makefile.am b/src/basic/vx_util/Makefile.am index d0ab31bce7..b0daa451e9 100644 --- a/src/basic/vx_util/Makefile.am +++ b/src/basic/vx_util/Makefile.am @@ -35,6 +35,7 @@ libvx_util_a_SOURCES = ascii_table.cc ascii_table.h \ long_array.cc long_array.h \ num_array.cc num_array.h \ thresh_array.cc thresh_array.h \ + main.cc main.h \ make_path.cc make_path.h \ memory.cc memory.h \ normalize.cc normalize.h \ @@ -71,6 +72,7 @@ libvx_util_a_SOURCES = ascii_table.cc ascii_table.h \ observation.h observation.cc \ stat_column_defs.h \ handle_openmp.h handle_openmp.cc \ + main.cc main.h \ RectangularTemplate.h RectangularTemplate.cc $(OPT_PYTHON_SOURCES) libvx_util_a_CPPFLAGS = ${MET_CPPFLAGS} diff --git a/src/basic/vx_util/Makefile.in b/src/basic/vx_util/Makefile.in index 74de7cf298..624a71121a 100644 --- a/src/basic/vx_util/Makefile.in +++ b/src/basic/vx_util/Makefile.in @@ -117,8 +117,8 @@ am__libvx_util_a_SOURCES_DIST = ascii_table.cc ascii_table.h \ is_number.cc is_number.h crc_array.h crr_array.h ncrr_array.h \ int_array.h two_d_array.h long_array.cc long_array.h \ num_array.cc num_array.h thresh_array.cc thresh_array.h \ - make_path.cc make_path.h memory.cc memory.h normalize.cc \ - normalize.h ordinal.cc ordinal.h roman_numeral.cc \ + main.cc main.h make_path.cc make_path.h memory.cc memory.h \ + normalize.cc normalize.h ordinal.cc ordinal.h roman_numeral.cc \ roman_numeral.h string_fxns.cc string_fxns.h substring.cc \ substring.h fix_float.cc fix_float.h command_line.cc \ command_line.h file_size.cc file_size.h file_exists.cc \ @@ -151,8 +151,8 @@ am_libvx_util_a_OBJECTS = libvx_util_a-ascii_table.$(OBJEXT) \ libvx_util_a-long_array.$(OBJEXT) \ libvx_util_a-num_array.$(OBJEXT) \ libvx_util_a-thresh_array.$(OBJEXT) \ - libvx_util_a-make_path.$(OBJEXT) libvx_util_a-memory.$(OBJEXT) \ - libvx_util_a-normalize.$(OBJEXT) \ + libvx_util_a-main.$(OBJEXT) libvx_util_a-make_path.$(OBJEXT) \ + libvx_util_a-memory.$(OBJEXT) libvx_util_a-normalize.$(OBJEXT) \ libvx_util_a-ordinal.$(OBJEXT) \ libvx_util_a-roman_numeral.$(OBJEXT) \ libvx_util_a-string_fxns.$(OBJEXT) \ @@ -181,6 +181,7 @@ am_libvx_util_a_OBJECTS = libvx_util_a-ascii_table.$(OBJEXT) \ libvx_util_a-GridOffset.$(OBJEXT) \ libvx_util_a-observation.$(OBJEXT) \ libvx_util_a-handle_openmp.$(OBJEXT) \ + libvx_util_a-main.$(OBJEXT) \ libvx_util_a-RectangularTemplate.$(OBJEXT) $(am__objects_2) libvx_util_a_OBJECTS = $(am_libvx_util_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) @@ -226,6 +227,7 @@ am__depfiles_remade = ./$(DEPDIR)/libvx_util_a-CircularTemplate.Po \ ./$(DEPDIR)/libvx_util_a-interp_util.Po \ ./$(DEPDIR)/libvx_util_a-is_number.Po \ ./$(DEPDIR)/libvx_util_a-long_array.Po \ + ./$(DEPDIR)/libvx_util_a-main.Po \ ./$(DEPDIR)/libvx_util_a-make_path.Po \ ./$(DEPDIR)/libvx_util_a-mask_poly.Po \ ./$(DEPDIR)/libvx_util_a-memory.Po \ @@ -467,6 +469,7 @@ libvx_util_a_SOURCES = ascii_table.cc ascii_table.h \ long_array.cc long_array.h \ num_array.cc num_array.h \ thresh_array.cc thresh_array.h \ + main.cc main.h \ make_path.cc make_path.h \ memory.cc memory.h \ normalize.cc normalize.h \ @@ -503,6 +506,7 @@ libvx_util_a_SOURCES = ascii_table.cc ascii_table.h \ observation.h observation.cc \ stat_column_defs.h \ handle_openmp.h handle_openmp.cc \ + main.cc main.h \ RectangularTemplate.h RectangularTemplate.cc $(OPT_PYTHON_SOURCES) libvx_util_a_CPPFLAGS = ${MET_CPPFLAGS} @@ -582,6 +586,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_util_a-interp_util.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_util_a-is_number.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_util_a-long_array.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_util_a-main.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_util_a-make_path.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_util_a-mask_poly.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_util_a-memory.Po@am__quote@ # am--include-marker @@ -788,6 +793,20 @@ libvx_util_a-thresh_array.obj: thresh_array.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_util_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_util_a-thresh_array.obj `if test -f 'thresh_array.cc'; then $(CYGPATH_W) 'thresh_array.cc'; else $(CYGPATH_W) '$(srcdir)/thresh_array.cc'; fi` +libvx_util_a-main.o: main.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_util_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_util_a-main.o -MD -MP -MF $(DEPDIR)/libvx_util_a-main.Tpo -c -o libvx_util_a-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_util_a-main.Tpo $(DEPDIR)/libvx_util_a-main.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cc' object='libvx_util_a-main.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_util_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_util_a-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc + +libvx_util_a-main.obj: main.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_util_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_util_a-main.obj -MD -MP -MF $(DEPDIR)/libvx_util_a-main.Tpo -c -o libvx_util_a-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_util_a-main.Tpo $(DEPDIR)/libvx_util_a-main.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='main.cc' object='libvx_util_a-main.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_util_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_util_a-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi` + libvx_util_a-make_path.o: make_path.cc @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_util_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_util_a-make_path.o -MD -MP -MF $(DEPDIR)/libvx_util_a-make_path.Tpo -c -o libvx_util_a-make_path.o `test -f 'make_path.cc' || echo '$(srcdir)/'`make_path.cc @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_util_a-make_path.Tpo $(DEPDIR)/libvx_util_a-make_path.Po @@ -1406,6 +1425,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libvx_util_a-interp_util.Po -rm -f ./$(DEPDIR)/libvx_util_a-is_number.Po -rm -f ./$(DEPDIR)/libvx_util_a-long_array.Po + -rm -f ./$(DEPDIR)/libvx_util_a-main.Po -rm -f ./$(DEPDIR)/libvx_util_a-make_path.Po -rm -f ./$(DEPDIR)/libvx_util_a-mask_poly.Po -rm -f ./$(DEPDIR)/libvx_util_a-memory.Po @@ -1496,6 +1516,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libvx_util_a-interp_util.Po -rm -f ./$(DEPDIR)/libvx_util_a-is_number.Po -rm -f ./$(DEPDIR)/libvx_util_a-long_array.Po + -rm -f ./$(DEPDIR)/libvx_util_a-main.Po -rm -f ./$(DEPDIR)/libvx_util_a-make_path.Po -rm -f ./$(DEPDIR)/libvx_util_a-mask_poly.Po -rm -f ./$(DEPDIR)/libvx_util_a-memory.Po diff --git a/src/basic/vx_log/main.cc b/src/basic/vx_util/main.cc similarity index 100% rename from src/basic/vx_log/main.cc rename to src/basic/vx_util/main.cc diff --git a/src/basic/vx_log/main.h b/src/basic/vx_util/main.h similarity index 100% rename from src/basic/vx_log/main.h rename to src/basic/vx_util/main.h diff --git a/src/basic/vx_util_math/Makefile.am b/src/basic/vx_util_math/Makefile.am new file mode 100644 index 0000000000..445c312ec3 --- /dev/null +++ b/src/basic/vx_util_math/Makefile.am @@ -0,0 +1,27 @@ +## @start 1 +## Makefile.am -- Process this file with automake to produce Makefile.in +## @end 1 + +MAINTAINERCLEANFILES = Makefile.in + +# Include the project definitions + +include ${top_srcdir}/Make-include + +OPT_PYTHON_SOURCES = + +# The library + +noinst_LIBRARIES = libvx_util_math.a +libvx_util_math_a_SOURCES = so3.cc so3.h + +libvx_util_math_a_CPPFLAGS = ${MET_CPPFLAGS} + +# If we are in development mode, generate the "to_string" files and +# clean them up in a "make clean". We don't want to do either of these +# in a distribution because the enum_to_string utility isn't available. + +# Build the library when making a distribution so that +# we can make chk4copyright to add the copyright notices. + +dist-hook: $(noinst_LIBRARIES) diff --git a/src/basic/vx_util_math/Makefile.in b/src/basic/vx_util_math/Makefile.in new file mode 100644 index 0000000000..66ac10cad7 --- /dev/null +++ b/src/basic/vx_util_math/Makefile.in @@ -0,0 +1,647 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/basic/vx_util_math +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LIBRARIES = $(noinst_LIBRARIES) +AR = ar +ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +libvx_util_math_a_AR = $(AR) $(ARFLAGS) +libvx_util_math_a_LIBADD = +am_libvx_util_math_a_OBJECTS = libvx_util_math_a-so3.$(OBJEXT) +libvx_util_math_a_OBJECTS = $(am_libvx_util_math_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/libvx_util_math_a-so3.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libvx_util_math_a_SOURCES) +DIST_SOURCES = $(libvx_util_math_a_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUFRLIB_NAME = @BUFRLIB_NAME@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FC_LIBS = @FC_LIBS@ +FFLAGS = @FFLAGS@ +FLIBS = @FLIBS@ +GREP = @GREP@ +GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ +GRIB2_LIBS = @GRIB2_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MET_BUFR = @MET_BUFR@ +MET_BUFRLIB = @MET_BUFRLIB@ +MET_CAIRO = @MET_CAIRO@ +MET_CAIROINC = @MET_CAIROINC@ +MET_CAIROLIB = @MET_CAIROLIB@ +MET_FREETYPE = @MET_FREETYPE@ +MET_FREETYPEINC = @MET_FREETYPEINC@ +MET_FREETYPELIB = @MET_FREETYPELIB@ +MET_GRIB2C = @MET_GRIB2C@ +MET_GRIB2CINC = @MET_GRIB2CINC@ +MET_GRIB2CLIB = @MET_GRIB2CLIB@ +MET_GSL = @MET_GSL@ +MET_GSLINC = @MET_GSLINC@ +MET_GSLLIB = @MET_GSLLIB@ +MET_HDF = @MET_HDF@ +MET_HDF5 = @MET_HDF5@ +MET_HDF5INC = @MET_HDF5INC@ +MET_HDF5LIB = @MET_HDF5LIB@ +MET_HDFEOS = @MET_HDFEOS@ +MET_HDFEOSINC = @MET_HDFEOSINC@ +MET_HDFEOSLIB = @MET_HDFEOSLIB@ +MET_HDFINC = @MET_HDFINC@ +MET_HDFLIB = @MET_HDFLIB@ +MET_NETCDF = @MET_NETCDF@ +MET_NETCDFINC = @MET_NETCDFINC@ +MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PYTHON_CC = @MET_PYTHON_CC@ +MET_PYTHON_LD = @MET_PYTHON_LD@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +OPENMP_CFLAGS = @OPENMP_CFLAGS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PYTHON_LIBS = @PYTHON_LIBS@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +MAINTAINERCLEANFILES = Makefile.in +OPT_PYTHON_SOURCES = + +# The library +noinst_LIBRARIES = libvx_util_math.a +libvx_util_math_a_SOURCES = so3.cc so3.h +libvx_util_math_a_CPPFLAGS = ${MET_CPPFLAGS} +all: all-am + +.SUFFIXES: +.SUFFIXES: .cc .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/basic/vx_util_math/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/basic/vx_util_math/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +libvx_util_math.a: $(libvx_util_math_a_OBJECTS) $(libvx_util_math_a_DEPENDENCIES) $(EXTRA_libvx_util_math_a_DEPENDENCIES) + $(AM_V_at)-rm -f libvx_util_math.a + $(AM_V_AR)$(libvx_util_math_a_AR) libvx_util_math.a $(libvx_util_math_a_OBJECTS) $(libvx_util_math_a_LIBADD) + $(AM_V_at)$(RANLIB) libvx_util_math.a + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_util_math_a-so3.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.cc.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +libvx_util_math_a-so3.o: so3.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_util_math_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_util_math_a-so3.o -MD -MP -MF $(DEPDIR)/libvx_util_math_a-so3.Tpo -c -o libvx_util_math_a-so3.o `test -f 'so3.cc' || echo '$(srcdir)/'`so3.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_util_math_a-so3.Tpo $(DEPDIR)/libvx_util_math_a-so3.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='so3.cc' object='libvx_util_math_a-so3.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_util_math_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_util_math_a-so3.o `test -f 'so3.cc' || echo '$(srcdir)/'`so3.cc + +libvx_util_math_a-so3.obj: so3.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_util_math_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_util_math_a-so3.obj -MD -MP -MF $(DEPDIR)/libvx_util_math_a-so3.Tpo -c -o libvx_util_math_a-so3.obj `if test -f 'so3.cc'; then $(CYGPATH_W) 'so3.cc'; else $(CYGPATH_W) '$(srcdir)/so3.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_util_math_a-so3.Tpo $(DEPDIR)/libvx_util_math_a-so3.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='so3.cc' object='libvx_util_math_a-so3.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_util_math_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_util_math_a-so3.obj `if test -f 'so3.cc'; then $(CYGPATH_W) 'so3.cc'; else $(CYGPATH_W) '$(srcdir)/so3.cc'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook +check-am: all-am +check: check-am +all-am: Makefile $(LIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/libvx_util_math_a-so3.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/libvx_util_math_a-so3.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am dist-hook distclean distclean-compile \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am + +.PRECIOUS: Makefile + + +# Include the project definitions + +include ${top_srcdir}/Make-include + +# If we are in development mode, generate the "to_string" files and +# clean them up in a "make clean". We don't want to do either of these +# in a distribution because the enum_to_string utility isn't available. + +# Build the library when making a distribution so that +# we can make chk4copyright to add the copyright notices. + +dist-hook: $(noinst_LIBRARIES) + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/src/basic/vx_math/so3.cc b/src/basic/vx_util_math/so3.cc similarity index 100% rename from src/basic/vx_math/so3.cc rename to src/basic/vx_util_math/so3.cc diff --git a/src/basic/vx_math/so3.h b/src/basic/vx_util_math/so3.h similarity index 100% rename from src/basic/vx_math/so3.h rename to src/basic/vx_util_math/so3.h diff --git a/src/tools/core/ensemble_stat/Makefile.am b/src/tools/core/ensemble_stat/Makefile.am index 5aec02dd98..93e20e695c 100644 --- a/src/tools/core/ensemble_stat/Makefile.am +++ b/src/tools/core/ensemble_stat/Makefile.am @@ -33,6 +33,7 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_grid \ -lvx_config \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/core/ensemble_stat/Makefile.in b/src/tools/core/ensemble_stat/Makefile.in index 754e348cfd..74a0a1ec6d 100644 --- a/src/tools/core/ensemble_stat/Makefile.in +++ b/src/tools/core/ensemble_stat/Makefile.in @@ -340,6 +340,7 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_grid \ -lvx_config \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/core/grid_stat/Makefile.am b/src/tools/core/grid_stat/Makefile.am index e1451258f0..b5f6f4d69f 100644 --- a/src/tools/core/grid_stat/Makefile.am +++ b/src/tools/core/grid_stat/Makefile.am @@ -33,6 +33,7 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_grid \ -lvx_config \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/core/grid_stat/Makefile.in b/src/tools/core/grid_stat/Makefile.in index 1cd6f1986b..b03b73c0ea 100644 --- a/src/tools/core/grid_stat/Makefile.in +++ b/src/tools/core/grid_stat/Makefile.in @@ -339,6 +339,7 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_grid \ -lvx_config \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/core/mode/Makefile.am b/src/tools/core/mode/Makefile.am index 34fe475c05..b27dd4cd75 100644 --- a/src/tools/core/mode/Makefile.am +++ b/src/tools/core/mode/Makefile.am @@ -54,6 +54,7 @@ mode_LDADD = -lvx_pxm \ -lvx_config \ -lvx_bool_calc \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/core/mode/Makefile.in b/src/tools/core/mode/Makefile.in index e13bd3db57..a3518c1137 100644 --- a/src/tools/core/mode/Makefile.in +++ b/src/tools/core/mode/Makefile.in @@ -379,6 +379,7 @@ mode_LDADD = -lvx_pxm \ -lvx_config \ -lvx_bool_calc \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/core/mode_analysis/Makefile.am b/src/tools/core/mode_analysis/Makefile.am index 182faf29d1..ebc4e60577 100644 --- a/src/tools/core/mode_analysis/Makefile.am +++ b/src/tools/core/mode_analysis/Makefile.am @@ -37,6 +37,7 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/core/mode_analysis/Makefile.in b/src/tools/core/mode_analysis/Makefile.in index 9969c32af8..f7f149c327 100644 --- a/src/tools/core/mode_analysis/Makefile.in +++ b/src/tools/core/mode_analysis/Makefile.in @@ -344,6 +344,7 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/core/pcp_combine/Makefile.am b/src/tools/core/pcp_combine/Makefile.am index 0fa6d2ecc4..cb263e11ba 100644 --- a/src/tools/core/pcp_combine/Makefile.am +++ b/src/tools/core/pcp_combine/Makefile.am @@ -27,6 +27,7 @@ pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_grid \ -lvx_config \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_gsl_prob \ -lvx_math \ diff --git a/src/tools/core/pcp_combine/Makefile.in b/src/tools/core/pcp_combine/Makefile.in index 9f6859c5b6..469664b3a3 100644 --- a/src/tools/core/pcp_combine/Makefile.in +++ b/src/tools/core/pcp_combine/Makefile.in @@ -330,6 +330,7 @@ pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_grid \ -lvx_config \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_gsl_prob \ -lvx_math \ diff --git a/src/tools/core/point_stat/Makefile.am b/src/tools/core/point_stat/Makefile.am index 9eaa1f820c..71d7b83188 100644 --- a/src/tools/core/point_stat/Makefile.am +++ b/src/tools/core/point_stat/Makefile.am @@ -33,6 +33,7 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/core/point_stat/Makefile.in b/src/tools/core/point_stat/Makefile.in index 2ae2b0dcfc..27a47751d8 100644 --- a/src/tools/core/point_stat/Makefile.in +++ b/src/tools/core/point_stat/Makefile.in @@ -340,6 +340,7 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/core/series_analysis/Makefile.am b/src/tools/core/series_analysis/Makefile.am index 26352e71eb..8fa606e640 100644 --- a/src/tools/core/series_analysis/Makefile.am +++ b/src/tools/core/series_analysis/Makefile.am @@ -33,6 +33,7 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_grid \ -lvx_config \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/core/series_analysis/Makefile.in b/src/tools/core/series_analysis/Makefile.in index 44383d6f7d..4be65d6267 100644 --- a/src/tools/core/series_analysis/Makefile.in +++ b/src/tools/core/series_analysis/Makefile.in @@ -341,6 +341,7 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_grid \ -lvx_config \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/core/stat_analysis/Makefile.am b/src/tools/core/stat_analysis/Makefile.am index 00e6a2488d..def83f9bd1 100644 --- a/src/tools/core/stat_analysis/Makefile.am +++ b/src/tools/core/stat_analysis/Makefile.am @@ -38,6 +38,7 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_time_series \ -lvx_pb_util \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/core/stat_analysis/Makefile.in b/src/tools/core/stat_analysis/Makefile.in index 085f2d63ab..86c221d0ff 100644 --- a/src/tools/core/stat_analysis/Makefile.in +++ b/src/tools/core/stat_analysis/Makefile.in @@ -351,6 +351,7 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_time_series \ -lvx_pb_util \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/core/wavelet_stat/Makefile.am b/src/tools/core/wavelet_stat/Makefile.am index 25150834a5..d9714100f9 100644 --- a/src/tools/core/wavelet_stat/Makefile.am +++ b/src/tools/core/wavelet_stat/Makefile.am @@ -39,6 +39,7 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_grid \ -lvx_config \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/core/wavelet_stat/Makefile.in b/src/tools/core/wavelet_stat/Makefile.in index c6a0a82fa8..0a4adf646f 100644 --- a/src/tools/core/wavelet_stat/Makefile.in +++ b/src/tools/core/wavelet_stat/Makefile.in @@ -346,6 +346,7 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_grid \ -lvx_config \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/dev_utils/Makefile.am b/src/tools/dev_utils/Makefile.am index d161fe92b6..718a7f1349 100644 --- a/src/tools/dev_utils/Makefile.am +++ b/src/tools/dev_utils/Makefile.am @@ -134,6 +134,7 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_regrid \ -lvx_grid \ -lvx_config \ + -lvx_util_math \ -lvx_util \ -lvx_cal \ -lvx_gsl_prob \ diff --git a/src/tools/dev_utils/Makefile.in b/src/tools/dev_utils/Makefile.in index 73fca6d9f6..902859fd19 100644 --- a/src/tools/dev_utils/Makefile.in +++ b/src/tools/dev_utils/Makefile.in @@ -574,6 +574,7 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_regrid \ -lvx_grid \ -lvx_config \ + -lvx_util_math \ -lvx_util \ -lvx_cal \ -lvx_gsl_prob \ diff --git a/src/tools/other/ascii2nc/Makefile.am b/src/tools/other/ascii2nc/Makefile.am index f548cb9330..23bcb7b178 100644 --- a/src/tools/other/ascii2nc/Makefile.am +++ b/src/tools/other/ascii2nc/Makefile.am @@ -48,6 +48,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_cal \ -lvx_math \ diff --git a/src/tools/other/ascii2nc/Makefile.in b/src/tools/other/ascii2nc/Makefile.in index 855a836b36..17258d4714 100644 --- a/src/tools/other/ascii2nc/Makefile.in +++ b/src/tools/other/ascii2nc/Makefile.in @@ -383,6 +383,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_cal \ -lvx_math \ diff --git a/src/tools/other/gen_ens_prod/Makefile.am b/src/tools/other/gen_ens_prod/Makefile.am index 5c1191f123..0aec8c990b 100644 --- a/src/tools/other/gen_ens_prod/Makefile.am +++ b/src/tools/other/gen_ens_prod/Makefile.am @@ -33,6 +33,7 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_grid \ -lvx_config \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/gen_ens_prod/Makefile.in b/src/tools/other/gen_ens_prod/Makefile.in index dba9718cfb..d7196530d3 100644 --- a/src/tools/other/gen_ens_prod/Makefile.in +++ b/src/tools/other/gen_ens_prod/Makefile.in @@ -340,6 +340,7 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_grid \ -lvx_config \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/gen_vx_mask/Makefile.am b/src/tools/other/gen_vx_mask/Makefile.am index 5eb4938ea7..3b71d70c18 100644 --- a/src/tools/other/gen_vx_mask/Makefile.am +++ b/src/tools/other/gen_vx_mask/Makefile.am @@ -43,6 +43,7 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_grid \ -lvx_config \ -lvx_gsl_prob \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_solar \ diff --git a/src/tools/other/gen_vx_mask/Makefile.in b/src/tools/other/gen_vx_mask/Makefile.in index 11cf29caeb..1b6f49ad05 100644 --- a/src/tools/other/gen_vx_mask/Makefile.in +++ b/src/tools/other/gen_vx_mask/Makefile.in @@ -345,6 +345,7 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_grid \ -lvx_config \ -lvx_gsl_prob \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_solar \ diff --git a/src/tools/other/grid_diag/Makefile.am b/src/tools/other/grid_diag/Makefile.am index 1d30d1bce4..c097c9757e 100644 --- a/src/tools/other/grid_diag/Makefile.am +++ b/src/tools/other/grid_diag/Makefile.am @@ -33,6 +33,7 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_grid \ -lvx_config \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/other/grid_diag/Makefile.in b/src/tools/other/grid_diag/Makefile.in index d474c9d012..e4b4bb8972 100644 --- a/src/tools/other/grid_diag/Makefile.in +++ b/src/tools/other/grid_diag/Makefile.in @@ -339,6 +339,7 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_grid \ -lvx_config \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/other/gsi_tools/Makefile.am b/src/tools/other/gsi_tools/Makefile.am index 1c94d4be2b..19036d082b 100644 --- a/src/tools/other/gsi_tools/Makefile.am +++ b/src/tools/other/gsi_tools/Makefile.am @@ -52,6 +52,7 @@ gsid2mpr_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ @@ -97,6 +98,7 @@ gsidens2orank_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/other/gsi_tools/Makefile.in b/src/tools/other/gsi_tools/Makefile.in index c081fe4df1..8523d96707 100644 --- a/src/tools/other/gsi_tools/Makefile.in +++ b/src/tools/other/gsi_tools/Makefile.in @@ -392,6 +392,7 @@ gsid2mpr_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ @@ -438,6 +439,7 @@ gsidens2orank_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/other/ioda2nc/Makefile.am b/src/tools/other/ioda2nc/Makefile.am index 5942b7460c..e5ed2a95cd 100644 --- a/src/tools/other/ioda2nc/Makefile.am +++ b/src/tools/other/ioda2nc/Makefile.am @@ -35,6 +35,7 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/ioda2nc/Makefile.in b/src/tools/other/ioda2nc/Makefile.in index 610293d256..833d72a4a4 100644 --- a/src/tools/other/ioda2nc/Makefile.in +++ b/src/tools/other/ioda2nc/Makefile.in @@ -354,6 +354,7 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/lidar2nc/Makefile.am b/src/tools/other/lidar2nc/Makefile.am index d4ebc99268..e705508c9b 100644 --- a/src/tools/other/lidar2nc/Makefile.am +++ b/src/tools/other/lidar2nc/Makefile.am @@ -42,6 +42,7 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_stat_out \ -lvx_statistics \ -lvx_grid \ + -lvx_util_math \ -lvx_util \ -lvx_config \ -lvx_gsl_prob \ diff --git a/src/tools/other/lidar2nc/Makefile.in b/src/tools/other/lidar2nc/Makefile.in index c14f6d1138..04ae0045bf 100644 --- a/src/tools/other/lidar2nc/Makefile.in +++ b/src/tools/other/lidar2nc/Makefile.in @@ -362,6 +362,7 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_stat_out \ -lvx_statistics \ -lvx_grid \ + -lvx_util_math \ -lvx_util \ -lvx_config \ -lvx_gsl_prob \ diff --git a/src/tools/other/madis2nc/Makefile.am b/src/tools/other/madis2nc/Makefile.am index ff187ff565..e80d52cf35 100644 --- a/src/tools/other/madis2nc/Makefile.am +++ b/src/tools/other/madis2nc/Makefile.am @@ -34,6 +34,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/madis2nc/Makefile.in b/src/tools/other/madis2nc/Makefile.in index 1a48754c7c..94579deef3 100644 --- a/src/tools/other/madis2nc/Makefile.in +++ b/src/tools/other/madis2nc/Makefile.in @@ -340,6 +340,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/mode_graphics/Makefile.am b/src/tools/other/mode_graphics/Makefile.am index e1861a8de3..afaeca62e9 100644 --- a/src/tools/other/mode_graphics/Makefile.am +++ b/src/tools/other/mode_graphics/Makefile.am @@ -36,6 +36,7 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_render \ -lvx_color \ -lvx_log \ + -lvx_util_math \ -lvx_util \ -lvx_config \ -lvx_cal \ diff --git a/src/tools/other/mode_graphics/Makefile.in b/src/tools/other/mode_graphics/Makefile.in index 4effb87ed7..3b18cedc1e 100644 --- a/src/tools/other/mode_graphics/Makefile.in +++ b/src/tools/other/mode_graphics/Makefile.in @@ -362,6 +362,7 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_render \ -lvx_color \ -lvx_log \ + -lvx_util_math \ -lvx_util \ -lvx_config \ -lvx_cal \ diff --git a/src/tools/other/mode_time_domain/Makefile.am b/src/tools/other/mode_time_domain/Makefile.am index fde9fbe977..4bd79bb065 100644 --- a/src/tools/other/mode_time_domain/Makefile.am +++ b/src/tools/other/mode_time_domain/Makefile.am @@ -63,6 +63,7 @@ mtd_LDADD = -lvx_pxm \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/other/mode_time_domain/Makefile.in b/src/tools/other/mode_time_domain/Makefile.in index 31303f9e28..9a321b9805 100644 --- a/src/tools/other/mode_time_domain/Makefile.in +++ b/src/tools/other/mode_time_domain/Makefile.in @@ -409,6 +409,7 @@ mtd_LDADD = -lvx_pxm \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/other/modis_regrid/Makefile.am b/src/tools/other/modis_regrid/Makefile.am index e63afad3f0..1a3d11f10d 100644 --- a/src/tools/other/modis_regrid/Makefile.am +++ b/src/tools/other/modis_regrid/Makefile.am @@ -44,6 +44,7 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/other/modis_regrid/Makefile.in b/src/tools/other/modis_regrid/Makefile.in index 4bd97d62de..a71b4cd8d4 100644 --- a/src/tools/other/modis_regrid/Makefile.in +++ b/src/tools/other/modis_regrid/Makefile.in @@ -359,6 +359,7 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/other/pb2nc/Makefile.am b/src/tools/other/pb2nc/Makefile.am index ce99c025a1..0aea80b067 100644 --- a/src/tools/other/pb2nc/Makefile.am +++ b/src/tools/other/pb2nc/Makefile.am @@ -52,6 +52,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/pb2nc/Makefile.in b/src/tools/other/pb2nc/Makefile.in index 19c3242e3d..a8f71ec6b4 100644 --- a/src/tools/other/pb2nc/Makefile.in +++ b/src/tools/other/pb2nc/Makefile.in @@ -382,6 +382,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/plot_data_plane/Makefile.am b/src/tools/other/plot_data_plane/Makefile.am index 3997aaf742..1aaf606d3a 100644 --- a/src/tools/other/plot_data_plane/Makefile.am +++ b/src/tools/other/plot_data_plane/Makefile.am @@ -35,6 +35,7 @@ plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_grid \ -lvx_config \ -lvx_gsl_prob \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/plot_data_plane/Makefile.in b/src/tools/other/plot_data_plane/Makefile.in index b3fe461597..69e64aa697 100644 --- a/src/tools/other/plot_data_plane/Makefile.in +++ b/src/tools/other/plot_data_plane/Makefile.in @@ -340,6 +340,7 @@ plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_grid \ -lvx_config \ -lvx_gsl_prob \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/plot_point_obs/Makefile.am b/src/tools/other/plot_point_obs/Makefile.am index 690bb9ab63..edcbb884ce 100644 --- a/src/tools/other/plot_point_obs/Makefile.am +++ b/src/tools/other/plot_point_obs/Makefile.am @@ -39,6 +39,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/plot_point_obs/Makefile.in b/src/tools/other/plot_point_obs/Makefile.in index b049926898..bb6cef27ae 100644 --- a/src/tools/other/plot_point_obs/Makefile.in +++ b/src/tools/other/plot_point_obs/Makefile.in @@ -346,6 +346,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/point2grid/Makefile.am b/src/tools/other/point2grid/Makefile.am index 28ec81099a..d0f2997a4e 100644 --- a/src/tools/other/point2grid/Makefile.am +++ b/src/tools/other/point2grid/Makefile.am @@ -31,6 +31,7 @@ point2grid_LDADD = -lvx_statistics \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/point2grid/Makefile.in b/src/tools/other/point2grid/Makefile.in index 6b3bbd4937..a78b4bd269 100644 --- a/src/tools/other/point2grid/Makefile.in +++ b/src/tools/other/point2grid/Makefile.in @@ -350,6 +350,7 @@ point2grid_LDADD = -lvx_statistics \ -lvx_config \ -lvx_gsl_prob \ -lvx_color \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_cal \ diff --git a/src/tools/other/regrid_data_plane/Makefile.am b/src/tools/other/regrid_data_plane/Makefile.am index 32bbc91cea..d63de8b32c 100644 --- a/src/tools/other/regrid_data_plane/Makefile.am +++ b/src/tools/other/regrid_data_plane/Makefile.am @@ -30,6 +30,7 @@ regrid_data_plane_LDADD = -lvx_statistics \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/other/regrid_data_plane/Makefile.in b/src/tools/other/regrid_data_plane/Makefile.in index 5f938951e1..c0cfece3f4 100644 --- a/src/tools/other/regrid_data_plane/Makefile.in +++ b/src/tools/other/regrid_data_plane/Makefile.in @@ -336,6 +336,7 @@ regrid_data_plane_LDADD = -lvx_statistics \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/other/shift_data_plane/Makefile.am b/src/tools/other/shift_data_plane/Makefile.am index af2d6875b8..0982049cd4 100644 --- a/src/tools/other/shift_data_plane/Makefile.am +++ b/src/tools/other/shift_data_plane/Makefile.am @@ -30,6 +30,7 @@ shift_data_plane_LDADD = -lvx_statistics \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/other/shift_data_plane/Makefile.in b/src/tools/other/shift_data_plane/Makefile.in index 46c3b4a89c..a151336841 100644 --- a/src/tools/other/shift_data_plane/Makefile.in +++ b/src/tools/other/shift_data_plane/Makefile.in @@ -336,6 +336,7 @@ shift_data_plane_LDADD = -lvx_statistics \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/other/wwmca_tool/Makefile.am b/src/tools/other/wwmca_tool/Makefile.am index ba4e6d5e69..8f4fbf9a7c 100644 --- a/src/tools/other/wwmca_tool/Makefile.am +++ b/src/tools/other/wwmca_tool/Makefile.am @@ -52,6 +52,7 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ @@ -95,6 +96,7 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/other/wwmca_tool/Makefile.in b/src/tools/other/wwmca_tool/Makefile.in index d2ff39b70b..8790efcea3 100644 --- a/src/tools/other/wwmca_tool/Makefile.in +++ b/src/tools/other/wwmca_tool/Makefile.in @@ -415,6 +415,7 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ @@ -459,6 +460,7 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.am b/src/tools/tc_utils/rmw_analysis/Makefile.am index 61223d7f69..a912434654 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.am +++ b/src/tools/tc_utils/rmw_analysis/Makefile.am @@ -34,9 +34,10 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ - -lvx_color \ + -lvx_color \ -lvx_log \ -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.in b/src/tools/tc_utils/rmw_analysis/Makefile.in index f466f69a91..e87a7303e3 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.in +++ b/src/tools/tc_utils/rmw_analysis/Makefile.in @@ -341,9 +341,10 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ - -lvx_color \ + -lvx_color \ -lvx_log \ -lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/tc_dland/Makefile.am b/src/tools/tc_utils/tc_dland/Makefile.am index d304029ddf..f8e08df837 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.am +++ b/src/tools/tc_utils/tc_dland/Makefile.am @@ -21,6 +21,7 @@ tc_dland_LDADD = -lvx_tc_util \ -lvx_gnomon \ -lvx_nav \ -lvx_log \ + -lvx_util_math \ -lvx_util \ -lvx_config \ -lvx_gsl_prob \ diff --git a/src/tools/tc_utils/tc_dland/Makefile.in b/src/tools/tc_utils/tc_dland/Makefile.in index 8efdd55cc8..8cb08b78fe 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.in +++ b/src/tools/tc_utils/tc_dland/Makefile.in @@ -339,6 +339,7 @@ tc_dland_LDADD = -lvx_tc_util \ -lvx_gnomon \ -lvx_nav \ -lvx_log \ + -lvx_util_math \ -lvx_util \ -lvx_config \ -lvx_gsl_prob \ diff --git a/src/tools/tc_utils/tc_gen/Makefile.am b/src/tools/tc_utils/tc_gen/Makefile.am index 98cdec5d5c..42351a2c66 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.am +++ b/src/tools/tc_utils/tc_gen/Makefile.am @@ -37,6 +37,7 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_pb_util \ -lvx_cal \ -lvx_nav \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/tc_utils/tc_gen/Makefile.in b/src/tools/tc_utils/tc_gen/Makefile.in index a2135110f9..9d1544ffa0 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.in +++ b/src/tools/tc_utils/tc_gen/Makefile.in @@ -344,6 +344,7 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_pb_util \ -lvx_cal \ -lvx_nav \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/tc_utils/tc_pairs/Makefile.am b/src/tools/tc_utils/tc_pairs/Makefile.am index 1dd9e1275f..03cbce0348 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.am +++ b/src/tools/tc_utils/tc_pairs/Makefile.am @@ -39,6 +39,7 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_pb_util \ -lvx_cal \ -lvx_nav \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/tc_utils/tc_pairs/Makefile.in b/src/tools/tc_utils/tc_pairs/Makefile.in index ed2c7b3925..3b34b63f9b 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.in +++ b/src/tools/tc_utils/tc_pairs/Makefile.in @@ -370,6 +370,7 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_pb_util \ -lvx_cal \ -lvx_nav \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/tc_utils/tc_rmw/Makefile.am b/src/tools/tc_utils/tc_rmw/Makefile.am index 549c547212..b2f3262661 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.am +++ b/src/tools/tc_utils/tc_rmw/Makefile.am @@ -35,6 +35,7 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/tc_utils/tc_rmw/Makefile.in b/src/tools/tc_utils/tc_rmw/Makefile.in index 7f3d33fcc9..1ab4002cec 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.in +++ b/src/tools/tc_utils/tc_rmw/Makefile.in @@ -344,6 +344,7 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_config \ -lvx_gsl_prob \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.am b/src/tools/tc_utils/tc_stat/Makefile.am index 06b56431ce..955d2ed6a3 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.am +++ b/src/tools/tc_utils/tc_stat/Makefile.am @@ -38,6 +38,7 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_gsl_prob \ -lvx_pb_util \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.in b/src/tools/tc_utils/tc_stat/Makefile.in index 9d02cc18f4..64d44c7c7d 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.in +++ b/src/tools/tc_utils/tc_stat/Makefile.in @@ -347,6 +347,7 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_gsl_prob \ -lvx_pb_util \ -lvx_cal \ + -lvx_util_math \ -lvx_util \ -lvx_math \ -lvx_color \