From bc228b4fd9eb6e6175eecdc3a222b92311b85591 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 8 Sep 2022 16:16:48 -0600 Subject: [PATCH] #2238 Added -lvx_util_math --- internal/test_util/basic/vx_util/Makefile.am | 1 + internal/test_util/basic/vx_util/Makefile.in | 1 + .../libcode/vx_data2d_factory/Makefile.am | 1 + .../libcode/vx_data2d_factory/Makefile.in | 1 + .../libcode/vx_data2d_grib/Makefile.am | 1 + .../libcode/vx_data2d_grib/Makefile.in | 1 + .../libcode/vx_data2d_nc_met/Makefile.am | 1 + .../libcode/vx_data2d_nc_met/Makefile.in | 1 + .../libcode/vx_data2d_nccf/Makefile.am | 1 + .../libcode/vx_data2d_nccf/Makefile.in | 1 + .../test_util/libcode/vx_grid/Makefile.am | 1 + .../test_util/libcode/vx_grid/Makefile.in | 1 + .../test_util/libcode/vx_nc_util/Makefile.am | 1 + .../test_util/libcode/vx_nc_util/Makefile.in | 1 + .../test_util/libcode/vx_tc_util/Makefile.am | 3 +++ .../test_util/libcode/vx_tc_util/Makefile.in | 3 +++ .../tools/other/mode_time_domain/Makefile.am | 1 + .../tools/other/mode_time_domain/Makefile.in | 1 + src/basic/vx_util/Makefile.in | 19 ++----------------- 19 files changed, 24 insertions(+), 17 deletions(-) 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/vx_util/Makefile.in b/src/basic/vx_util/Makefile.in index b1f3ef5b30..624a71121a 100644 --- a/src/basic/vx_util/Makefile.in +++ b/src/basic/vx_util/Makefile.in @@ -134,9 +134,8 @@ am__libvx_util_a_SOURCES_DIST = ascii_table.cc ascii_table.h \ CircularTemplate.h CircularTemplate.cc GridTemplate.h \ GridTemplate.cc GridPoint.h GridPoint.cc GridOffset.h \ GridOffset.cc observation.h observation.cc stat_column_defs.h \ - handle_openmp.h handle_openmp.cc main.cc main.h \ - RectangularTemplate.h RectangularTemplate.cc python_line.h \ - python_line.cc + handle_openmp.h handle_openmp.cc RectangularTemplate.h \ + RectangularTemplate.cc python_line.h python_line.cc @ENABLE_PYTHON_TRUE@am__objects_1 = \ @ENABLE_PYTHON_TRUE@ libvx_util_a-python_line.$(OBJEXT) am__objects_2 = $(am__objects_1) @@ -1242,20 +1241,6 @@ libvx_util_a-handle_openmp.obj: handle_openmp.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-handle_openmp.obj `if test -f 'handle_openmp.cc'; then $(CYGPATH_W) 'handle_openmp.cc'; else $(CYGPATH_W) '$(srcdir)/handle_openmp.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-RectangularTemplate.o: RectangularTemplate.cc @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_util_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_util_a-RectangularTemplate.o -MD -MP -MF $(DEPDIR)/libvx_util_a-RectangularTemplate.Tpo -c -o libvx_util_a-RectangularTemplate.o `test -f 'RectangularTemplate.cc' || echo '$(srcdir)/'`RectangularTemplate.cc @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_util_a-RectangularTemplate.Tpo $(DEPDIR)/libvx_util_a-RectangularTemplate.Po