Per #1471, because of the change in dependencies, I had to modify man…

…y, many Makefile.am files to link to the -lvx_statistics after -lvx_data2d_python. This is not great, but I didn't find a better solution.
dtcenter · Mar 9, 2021 · a8f4b65 · a8f4b65
1 parent 697f362
commit a8f4b65
Show file tree

Hide file tree

Showing 36 changed files with 123 additions and 49 deletions.
diff --git a/met/internal_tests/basic/vx_util/Makefile.am b/met/internal_tests/basic/vx_util/Makefile.am
@@ -82,18 +82,26 @@ endif
 test_ascii_header_SOURCES = test_ascii_header.cc
 test_ascii_header_CPPFLAGS = ${MET_CPPFLAGS}
 test_ascii_header_LDFLAGS = -L. ${MET_LDFLAGS}
-test_ascii_header_LDADD = -lvx_util \
-	-lvx_config \
+test_ascii_header_LDADD = -lvx_stat_out \
+	-lvx_statistics \
+	-lvx_shapedata \
 	-lvx_gsl_prob \
+	-lvx_analysis_util \
+	-lvx_data2d_factory \
+	-lvx_data2d_nc_met \
+	-lvx_data2d_grib $(GRIB2_LIBS) \
+	-lvx_data2d_nc_pinterp \
+	$(PYTHON_LIBS) \
+	-lvx_data2d_nccf \
+	-lvx_statistics \
+	-lvx_data2d \
+	-lvx_nc_util \
+	-lvx_regrid \
+	-lvx_grid \
+	-lvx_config \
 	-lvx_cal \
 	-lvx_util \
 	-lvx_math \
+	-lvx_color \
 	-lvx_log \
-	-lgsl -lgslcblas
-
-if ENABLE_PYTHON
-test_ascii_header_LDADD += $(MET_PYTHON_LD) -lvx_data2d_python -lvx_python3_utils -lvx_data2d_python -lvx_python3_utils -lvx_math 
-test_ascii_header_LDADD += -lvx_data2d_python -lvx_python3_utils -lvx_data2d_python -lvx_python3_utils
-test_ascii_header_LDADD += -lvx_math -lvx_grid -lvx_util -lvx_data2d -lvx_config -lvx_gsl_prob -lvx_cal -lvx_math -lvx_util
-endif
-
+	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
diff --git a/met/internal_tests/libcode/vx_data2d_factory/Makefile.am b/met/internal_tests/libcode/vx_data2d_factory/Makefile.am
@@ -25,20 +25,26 @@ test_is_grib_LDADD = -lvx_data2d_factory \
 test_factory_SOURCES = test_factory.cc
 test_factory_CPPFLAGS = ${MET_CPPFLAGS}
 test_factory_LDFLAGS = -L. ${MET_LDFLAGS}
-test_factory_LDADD = -lvx_data2d_factory \
+test_factory_LDADD = -lvx_stat_out \
+	-lvx_statistics \
+	-lvx_shapedata \
+	-lvx_gsl_prob \
+	-lvx_analysis_util \
+	-lvx_data2d_factory \
 	-lvx_data2d_nc_met \
 	-lvx_data2d_grib $(GRIB2_LIBS) \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
+	-lvx_regrid \
 	-lvx_grid \
 	-lvx_config \
-	-lvx_gsl_prob \
+	-lvx_cal \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \
-	-lvx_cal \
 	-lvx_log \
 	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
diff --git a/met/internal_tests/libcode/vx_nc_util/Makefile.am b/met/internal_tests/libcode/vx_nc_util/Makefile.am
@@ -20,20 +20,26 @@ test_pressure_levels_SOURCES = test_pressure_levels.cc
 test_pressure_levels_CPPFLAGS = ${MET_CPPFLAGS}
 test_pressure_levels_LDFLAGS = -L. ${MET_LDFLAGS}
 test_pressure_levels_LDADD = -lvx_tc_util \
+	-lvx_stat_out \
+	-lvx_statistics \
+	-lvx_shapedata \
+	-lvx_gsl_prob \
+	-lvx_analysis_util \
+	-lvx_data2d_factory \
+	-lvx_data2d_nc_met \
+	-lvx_data2d_grib $(GRIB2_LIBS) \
+	-lvx_data2d_nc_pinterp \
+	$(PYTHON_LIBS) \
+	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
+	-lvx_regrid \
+	-lvx_grid \
 	-lvx_config \
-	-lvx_gsl_prob \
 	-lvx_cal \
 	-lvx_util \
 	-lvx_math \
+	-lvx_color \
 	-lvx_log \
-	-lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
-
-if ENABLE_PYTHON
-test_pressure_levels_LDADD += $(MET_PYTHON_LD)
-test_pressure_levels_LDADD += -lvx_data2d_python -lvx_python3_utils
-test_pressure_levels_LDADD += -lvx_data2d_python -lvx_python3_utils
-test_pressure_levels_LDADD += -lvx_grid -lvx_util -lvx_config
-test_pressure_levels_LDADD += -lvx_data2d -lvx_gsl_prob -lvx_util -lvx_math -lvx_cal -lvx_config
-endif
+	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
diff --git a/met/internal_tests/libcode/vx_tc_util/Makefile.am b/met/internal_tests/libcode/vx_tc_util/Makefile.am
@@ -20,39 +20,59 @@ noinst_PROGRAMS = test_read \
 test_read_SOURCES = test_read.cc
 test_read_CPPFLAGS = ${MET_CPPFLAGS}
 test_read_LDFLAGS = -L. ${MET_LDFLAGS}
-test_read_LDADD = -lvx_tc_util \
-	-lvx_config \
+test_read_LDADD = -lvx_stat_out \
+	-lvx_statistics \
+	-lvx_shapedata \
 	-lvx_gsl_prob \
+	-lvx_analysis_util \
+	-lvx_tc_util \
+	-lvx_data2d_factory \
+	-lvx_data2d_nc_met \
+	-lvx_data2d_grib $(GRIB2_LIBS) \
+	-lvx_data2d_nc_pinterp \
+	$(PYTHON_LIBS) \
+	-lvx_data2d_nccf \
+	-lvx_statistics \
+	-lvx_data2d \
+	-lvx_nc_util \
+	-lvx_regrid \
+	-lvx_grid \
+	-lvx_config \
+	-lvx_pb_util \
 	-lvx_cal \
+	-lvx_nav \
 	-lvx_util \
 	-lvx_math \
+	-lvx_color \
 	-lvx_log \
-	-lgsl -lgslcblas
-
-if ENABLE_PYTHON
-test_read_LDADD += $(MET_PYTHON_LD)
-test_read_LDADD += -lvx_data2d_python -lvx_python3_utils
-test_read_LDADD += -lvx_data2d_python -lvx_python3_utils
-test_read_LDADD += -lvx_grid -lvx_util -lvx_config
-test_read_LDADD += -lvx_data2d -lvx_gsl_prob -lvx_util -lvx_math -lvx_cal -lvx_config
-endif
+	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
 
 test_read_prob_SOURCES = test_read_prob.cc
 test_read_prob_CPPFLAGS = ${MET_CPPFLAGS}
 test_read_prob_LDFLAGS = -L. ${MET_LDFLAGS}
-test_read_prob_LDADD = -lvx_tc_util \
-	-lvx_config \
+test_read_prob_LDADD = -lvx_stat_out \
+	-lvx_statistics \
+	-lvx_shapedata \
 	-lvx_gsl_prob \
+	-lvx_analysis_util \
+	-lvx_tc_util \
+	-lvx_data2d_factory \
+	-lvx_data2d_nc_met \
+	-lvx_data2d_grib $(GRIB2_LIBS) \
+	-lvx_data2d_nc_pinterp \
+	$(PYTHON_LIBS) \
+	-lvx_data2d_nccf \
+	-lvx_statistics \
+	-lvx_data2d \
+	-lvx_nc_util \
+	-lvx_regrid \
+	-lvx_grid \
+	-lvx_config \
+	-lvx_pb_util \
 	-lvx_cal \
+	-lvx_nav \
 	-lvx_util \
 	-lvx_math \
+	-lvx_color \
 	-lvx_log \
-	-lgsl -lgslcblas
-
-if ENABLE_PYTHON
-test_read_prob_LDADD += $(MET_PYTHON_LD)
-test_read_prob_LDADD += -lvx_data2d_python -lvx_python3_utils
-test_read_prob_LDADD += -lvx_data2d_python -lvx_python3_utils
-test_read_prob_LDADD += -lvx_grid -lvx_util -lvx_config
-test_read_prob_LDADD += -lvx_data2d -lvx_gsl_prob -lvx_util -lvx_math -lvx_cal -lvx_config
-endif
+	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas
diff --git a/met/src/tools/core/ensemble_stat/Makefile.am b/met/src/tools/core/ensemble_stat/Makefile.am
@@ -26,6 +26,7 @@ ensemble_stat_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+        -lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_obs \
 	-lvx_nc_util \

diff --git a/met/src/tools/core/grid_stat/Makefile.am b/met/src/tools/core/grid_stat/Makefile.am
@@ -26,6 +26,7 @@ grid_stat_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
 	-lvx_regrid \

diff --git a/met/src/tools/core/mode/Makefile.am b/met/src/tools/core/mode/Makefile.am
@@ -39,6 +39,7 @@ mode_LDADD = -lvx_pxm \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
 	-lvx_regrid \

diff --git a/met/src/tools/core/mode_analysis/Makefile.am b/met/src/tools/core/mode_analysis/Makefile.am
@@ -24,24 +24,24 @@ mode_analysis_LDADD = -lvx_stat_out \
 	-lvx_shapedata \
 	-lvx_gsl_prob \
 	-lvx_analysis_util \
-	-lvx_shapedata \
 	-lvx_data2d_factory \
 	-lvx_data2d_nc_met \
+	-lvx_data2d_grib $(GRIB2_LIBS) \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
-	-lvx_data2d_grib $(GRIB2_LIBS) \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
+	-lvx_regrid \
 	-lvx_grid \
 	-lvx_config \
-	-lvx_gsl_prob \
 	-lvx_cal \
 	-lvx_util \
 	-lvx_math \
 	-lvx_color \
 	-lvx_log \
-	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util
+	-lm -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz
 
 if ENABLE_PYTHON
 mode_analysis_LDADD += $(MET_PYTHON_LD) -lvx_data2d_python -lvx_python3_utils -lvx_data2d_python -lvx_python3_utils -lvx_util

diff --git a/met/src/tools/core/pcp_combine/Makefile.am b/met/src/tools/core/pcp_combine/Makefile.am
@@ -20,8 +20,10 @@ pcp_combine_LDADD = -lvx_data2d_factory \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
+	-lvx_regrid \
 	-lvx_grid \
 	-lvx_config \
 	-lvx_cal \

diff --git a/met/src/tools/core/point_stat/Makefile.am b/met/src/tools/core/point_stat/Makefile.am
@@ -26,6 +26,7 @@ point_stat_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_obs \
 	-lvx_nc_util \

diff --git a/met/src/tools/core/series_analysis/Makefile.am b/met/src/tools/core/series_analysis/Makefile.am
@@ -26,6 +26,7 @@ series_analysis_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
 	-lvx_regrid \

diff --git a/met/src/tools/core/stat_analysis/Makefile.am b/met/src/tools/core/stat_analysis/Makefile.am
@@ -34,6 +34,7 @@ stat_analysis_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
 	-lvx_regrid \

diff --git a/met/src/tools/core/wavelet_stat/Makefile.am b/met/src/tools/core/wavelet_stat/Makefile.am
@@ -32,6 +32,7 @@ wavelet_stat_LDADD = -lvx_pxm \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
 	-lvx_regrid \

diff --git a/met/src/tools/dev_utils/Makefile.am b/met/src/tools/dev_utils/Makefile.am
@@ -127,6 +127,7 @@ gen_climo_bin_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
 	-lvx_regrid \

diff --git a/met/src/tools/other/ascii2nc/Makefile.am b/met/src/tools/other/ascii2nc/Makefile.am
@@ -39,6 +39,7 @@ ascii2nc_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_pinterp \
 	-lvx_data2d_nccf \
 	$(PYTHON_LIBS) \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_obs \
 	-lvx_nc_util \

diff --git a/met/src/tools/other/gen_vx_mask/Makefile.am b/met/src/tools/other/gen_vx_mask/Makefile.am
@@ -24,6 +24,7 @@ gen_vx_mask_LDADD = -lvx_shapedata \
 	-lvx_data2d_nc_met \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
+	-lvx_statistics \
 	-lvx_gis  \
 	-lvx_nc_util \
 	-lvx_data2d \
@@ -39,6 +40,7 @@ gen_vx_mask_LDADD = -lvx_shapedata \
 	-lvx_stat_out \
 	-lvx_statistics \
 	-lvx_gsl_prob \
+	-lvx_regrid \
 	-lvx_grid \
 	-lvx_config \
 	-lvx_gsl_prob \

diff --git a/met/src/tools/other/grid_diag/Makefile.am b/met/src/tools/other/grid_diag/Makefile.am
@@ -26,6 +26,7 @@ grid_diag_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
 	-lvx_regrid \

diff --git a/met/src/tools/other/gsi_tools/Makefile.am b/met/src/tools/other/gsi_tools/Makefile.am
@@ -43,6 +43,7 @@ gsid2mpr_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
 	-lvx_regrid \

diff --git a/met/src/tools/other/ioda2nc/Makefile.am b/met/src/tools/other/ioda2nc/Makefile.am
@@ -26,6 +26,7 @@ ioda2nc_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_pinterp \
 	-lvx_data2d_nccf \
 	$(PYTHON_LIBS) \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_obs \
 	-lvx_nc_util \

diff --git a/met/src/tools/other/lidar2nc/Makefile.am b/met/src/tools/other/lidar2nc/Makefile.am
@@ -26,6 +26,7 @@ lidar2nc_LDADD = -lvx_shapedata \
 	-lvx_data2d_nc_met \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_nc_obs \
 	-lvx_nc_util \
 	-lvx_data2d \

diff --git a/met/src/tools/other/madis2nc/Makefile.am b/met/src/tools/other/madis2nc/Makefile.am
@@ -25,6 +25,7 @@ madis2nc_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_pinterp \
 	-lvx_data2d_nccf \
 	$(PYTHON_LIBS) \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_obs \
 	-lvx_nc_util \

diff --git a/met/src/tools/other/mode_graphics/Makefile.am b/met/src/tools/other/mode_graphics/Makefile.am
@@ -27,6 +27,7 @@ plot_mode_field_LDADD = -lvx_config \
 	-lvx_plot_util \
 	-lvx_data2d_nc_met \
 	$(PYTHON_LIBS) \
+	-lvx_statistics \
 	-lvx_grid \
 	-lvx_nc_util \
 	-lvx_ps \

diff --git a/met/src/tools/other/mode_time_domain/Makefile.am b/met/src/tools/other/mode_time_domain/Makefile.am
@@ -55,6 +55,7 @@ mtd_LDADD = -lvx_pxm \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
 	-lvx_data2d_nccf \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
 	-lvx_regrid \

diff --git a/met/src/tools/other/modis_regrid/Makefile.am b/met/src/tools/other/modis_regrid/Makefile.am
@@ -36,6 +36,7 @@ modis_regrid_LDADD = -lvx_pxm \
 	-lvx_data2d_grib $(GRIB2_LIBS) \
 	-lvx_data2d_nc_pinterp \
 	$(PYTHON_LIBS) \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_util \
 	-lvx_grid \

diff --git a/met/src/tools/other/pb2nc/Makefile.am b/met/src/tools/other/pb2nc/Makefile.am
@@ -42,6 +42,7 @@ pb2nc_LDADD = -lvx_stat_out \
 	-lvx_data2d_nc_pinterp \
 	-lvx_data2d_nccf \
 	$(PYTHON_LIBS) \
+	-lvx_statistics \
 	-lvx_data2d \
 	-lvx_nc_obs \
 	-lvx_nc_util \