diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index e3c77abd53..569cbcbcb0 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -279,6 +279,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/core/Makefile.in b/src/tools/core/Makefile.in index cf6a4aeacc..f95c75793d 100644 --- a/src/tools/core/Makefile.in +++ b/src/tools/core/Makefile.in @@ -287,6 +287,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/core/ensemble_stat/Makefile.am b/src/tools/core/ensemble_stat/Makefile.am index d2edff9a27..e3bbed953c 100644 --- a/src/tools/core/ensemble_stat/Makefile.am +++ b/src/tools/core/ensemble_stat/Makefile.am @@ -25,7 +25,7 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/core/ensemble_stat/Makefile.in b/src/tools/core/ensemble_stat/Makefile.in index e4c4e70fec..ed7f377cbb 100644 --- a/src/tools/core/ensemble_stat/Makefile.in +++ b/src/tools/core/ensemble_stat/Makefile.in @@ -106,7 +106,8 @@ am_ensemble_stat_OBJECTS = ensemble_stat-ensemble_stat.$(OBJEXT) \ ensemble_stat_OBJECTS = $(am_ensemble_stat_OBJECTS) am__DEPENDENCIES_1 = ensemble_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) ensemble_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(ensemble_stat_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +271,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -342,7 +344,7 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/core/grid_stat/Makefile.am b/src/tools/core/grid_stat/Makefile.am index d6bcf022d9..fd5fc5ab9b 100644 --- a/src/tools/core/grid_stat/Makefile.am +++ b/src/tools/core/grid_stat/Makefile.am @@ -26,7 +26,7 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/grid_stat/Makefile.in b/src/tools/core/grid_stat/Makefile.in index ca963b5493..c5b8b42427 100644 --- a/src/tools/core/grid_stat/Makefile.in +++ b/src/tools/core/grid_stat/Makefile.in @@ -105,7 +105,8 @@ am_grid_stat_OBJECTS = grid_stat-grid_stat.$(OBJEXT) \ grid_stat-grid_stat_conf_info.$(OBJEXT) grid_stat_OBJECTS = $(am_grid_stat_OBJECTS) am__DEPENDENCIES_1 = -grid_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +grid_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) grid_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(grid_stat_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -269,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -342,7 +344,7 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/mode/Makefile.am b/src/tools/core/mode/Makefile.am index 70bbaf552d..a80f2fc12e 100644 --- a/src/tools/core/mode/Makefile.am +++ b/src/tools/core/mode/Makefile.am @@ -45,7 +45,7 @@ mode_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/mode/Makefile.in b/src/tools/core/mode/Makefile.in index 02ae7f6991..2a9b828999 100644 --- a/src/tools/core/mode/Makefile.in +++ b/src/tools/core/mode/Makefile.in @@ -112,7 +112,8 @@ am_mode_OBJECTS = mode-mode_usage.$(OBJEXT) \ mode-overlap_page.$(OBJEXT) mode-mode_exec.$(OBJEXT) mode_OBJECTS = $(am_mode_OBJECTS) am__DEPENDENCIES_1 = -mode_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +mode_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) mode_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(mode_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -287,6 +288,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -379,7 +381,7 @@ mode_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/mode_analysis/Makefile.am b/src/tools/core/mode_analysis/Makefile.am index 0611f87b30..e3a27adeed 100644 --- a/src/tools/core/mode_analysis/Makefile.am +++ b/src/tools/core/mode_analysis/Makefile.am @@ -29,7 +29,7 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/mode_analysis/Makefile.in b/src/tools/core/mode_analysis/Makefile.in index 4510213632..7ac8f113a0 100644 --- a/src/tools/core/mode_analysis/Makefile.in +++ b/src/tools/core/mode_analysis/Makefile.in @@ -106,7 +106,8 @@ am_mode_analysis_OBJECTS = mode_analysis-mode_analysis.$(OBJEXT) \ mode_analysis_OBJECTS = $(am_mode_analysis_OBJECTS) am__DEPENDENCIES_1 = mode_analysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) mode_analysis_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(mode_analysis_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +271,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -346,7 +348,7 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/pcp_combine/Makefile.am b/src/tools/core/pcp_combine/Makefile.am index d9205bfcf9..1059c3d4ad 100644 --- a/src/tools/core/pcp_combine/Makefile.am +++ b/src/tools/core/pcp_combine/Makefile.am @@ -20,7 +20,7 @@ pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/pcp_combine/Makefile.in b/src/tools/core/pcp_combine/Makefile.in index c5590eec67..b6bd2ada9a 100644 --- a/src/tools/core/pcp_combine/Makefile.in +++ b/src/tools/core/pcp_combine/Makefile.in @@ -104,7 +104,8 @@ PROGRAMS = $(bin_PROGRAMS) am_pcp_combine_OBJECTS = pcp_combine-pcp_combine.$(OBJEXT) pcp_combine_OBJECTS = $(am_pcp_combine_OBJECTS) am__DEPENDENCIES_1 = -pcp_combine_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +pcp_combine_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) pcp_combine_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(pcp_combine_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -267,6 +268,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -333,7 +335,7 @@ pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/point_stat/Makefile.am b/src/tools/core/point_stat/Makefile.am index c9f3a47f7e..9c0bbbfe50 100644 --- a/src/tools/core/point_stat/Makefile.am +++ b/src/tools/core/point_stat/Makefile.am @@ -24,7 +24,7 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/core/point_stat/Makefile.in b/src/tools/core/point_stat/Makefile.in index 610f61f98d..9822e7b04c 100644 --- a/src/tools/core/point_stat/Makefile.in +++ b/src/tools/core/point_stat/Makefile.in @@ -106,7 +106,7 @@ am_point_stat_OBJECTS = point_stat-point_stat.$(OBJEXT) \ point_stat_OBJECTS = $(am_point_stat_OBJECTS) am__DEPENDENCIES_1 = point_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) point_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(point_stat_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -341,7 +342,7 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/core/series_analysis/Makefile.am b/src/tools/core/series_analysis/Makefile.am index 82b0532e88..1137a3e76c 100644 --- a/src/tools/core/series_analysis/Makefile.am +++ b/src/tools/core/series_analysis/Makefile.am @@ -26,7 +26,7 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/series_analysis/Makefile.in b/src/tools/core/series_analysis/Makefile.in index c73af62d40..dc41156a30 100644 --- a/src/tools/core/series_analysis/Makefile.in +++ b/src/tools/core/series_analysis/Makefile.in @@ -107,7 +107,7 @@ am_series_analysis_OBJECTS = \ series_analysis_OBJECTS = $(am_series_analysis_OBJECTS) am__DEPENDENCIES_1 = series_analysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) series_analysis_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(series_analysis_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -271,6 +271,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -344,7 +345,7 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/stat_analysis/Makefile.am b/src/tools/core/stat_analysis/Makefile.am index f5ad4be10a..126538a295 100644 --- a/src/tools/core/stat_analysis/Makefile.am +++ b/src/tools/core/stat_analysis/Makefile.am @@ -29,7 +29,7 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/stat_analysis/Makefile.in b/src/tools/core/stat_analysis/Makefile.in index 4ebcf62d97..aede96c476 100644 --- a/src/tools/core/stat_analysis/Makefile.in +++ b/src/tools/core/stat_analysis/Makefile.in @@ -109,7 +109,7 @@ am_stat_analysis_OBJECTS = stat_analysis-stat_analysis.$(OBJEXT) \ stat_analysis_OBJECTS = $(am_stat_analysis_OBJECTS) am__DEPENDENCIES_1 = stat_analysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) stat_analysis_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(stat_analysis_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -276,6 +276,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -352,7 +353,7 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/wavelet_stat/Makefile.am b/src/tools/core/wavelet_stat/Makefile.am index f827007742..6d9e6f2cf7 100644 --- a/src/tools/core/wavelet_stat/Makefile.am +++ b/src/tools/core/wavelet_stat/Makefile.am @@ -32,7 +32,7 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/wavelet_stat/Makefile.in b/src/tools/core/wavelet_stat/Makefile.in index ce2ace46d7..42a70d6820 100644 --- a/src/tools/core/wavelet_stat/Makefile.in +++ b/src/tools/core/wavelet_stat/Makefile.in @@ -106,7 +106,7 @@ am_wavelet_stat_OBJECTS = wavelet_stat-wavelet_stat.$(OBJEXT) \ wavelet_stat_OBJECTS = $(am_wavelet_stat_OBJECTS) am__DEPENDENCIES_1 = wavelet_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) wavelet_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(wavelet_stat_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -349,7 +350,7 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/dev_utils/Makefile.am b/src/tools/dev_utils/Makefile.am index 4dd98cadf6..dbba4d21ee 100644 --- a/src/tools/dev_utils/Makefile.am +++ b/src/tools/dev_utils/Makefile.am @@ -128,7 +128,7 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/dev_utils/Makefile.in b/src/tools/dev_utils/Makefile.in index 113a0bcbac..7fb6c01b19 100644 --- a/src/tools/dev_utils/Makefile.in +++ b/src/tools/dev_utils/Makefile.in @@ -114,7 +114,7 @@ am_gen_climo_bin_OBJECTS = gen_climo_bin-gen_climo_bin.$(OBJEXT) gen_climo_bin_OBJECTS = $(am_gen_climo_bin_OBJECTS) am__DEPENDENCIES_1 = gen_climo_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) gen_climo_bin_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(gen_climo_bin_LDFLAGS) $(LDFLAGS) -o $@ am__dirstamp = $(am__leading_dot)dirstamp @@ -413,6 +413,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -578,7 +579,7 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/dev_utils/shapefiles/Makefile.in b/src/tools/dev_utils/shapefiles/Makefile.in index aa75ce2c42..1b46cfee11 100644 --- a/src/tools/dev_utils/shapefiles/Makefile.in +++ b/src/tools/dev_utils/shapefiles/Makefile.in @@ -266,6 +266,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/other/Makefile.in b/src/tools/other/Makefile.in index 1142dca82c..10c4136178 100644 --- a/src/tools/other/Makefile.in +++ b/src/tools/other/Makefile.in @@ -299,6 +299,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/other/ascii2nc/Makefile.am b/src/tools/other/ascii2nc/Makefile.am index 3c4beb9904..777a60c576 100644 --- a/src/tools/other/ascii2nc/Makefile.am +++ b/src/tools/other/ascii2nc/Makefile.am @@ -41,7 +41,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/ascii2nc/Makefile.in b/src/tools/other/ascii2nc/Makefile.in index a1c6ddbaff..49b049017b 100644 --- a/src/tools/other/ascii2nc/Makefile.in +++ b/src/tools/other/ascii2nc/Makefile.in @@ -128,7 +128,7 @@ am_ascii2nc_OBJECTS = ascii2nc-ascii2nc.$(OBJEXT) \ ascii2nc_OBJECTS = $(am_ascii2nc_OBJECTS) am__DEPENDENCIES_1 = ascii2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ascii2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(ascii2nc_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -315,6 +315,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -397,7 +398,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/gen_ens_prod/Makefile.am b/src/tools/other/gen_ens_prod/Makefile.am index 740a258b7e..e1d6c399d5 100644 --- a/src/tools/other/gen_ens_prod/Makefile.am +++ b/src/tools/other/gen_ens_prod/Makefile.am @@ -25,7 +25,7 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/gen_ens_prod/Makefile.in b/src/tools/other/gen_ens_prod/Makefile.in index 970cb07870..e61445a98d 100644 --- a/src/tools/other/gen_ens_prod/Makefile.in +++ b/src/tools/other/gen_ens_prod/Makefile.in @@ -106,7 +106,8 @@ am_gen_ens_prod_OBJECTS = gen_ens_prod-gen_ens_prod.$(OBJEXT) \ gen_ens_prod_OBJECTS = $(am_gen_ens_prod_OBJECTS) am__DEPENDENCIES_1 = gen_ens_prod_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) gen_ens_prod_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(gen_ens_prod_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +271,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -342,7 +344,7 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/gen_vx_mask/Makefile.am b/src/tools/other/gen_vx_mask/Makefile.am index c3206a3264..5daca1fbf9 100644 --- a/src/tools/other/gen_vx_mask/Makefile.am +++ b/src/tools/other/gen_vx_mask/Makefile.am @@ -22,7 +22,7 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_gis \ diff --git a/src/tools/other/gen_vx_mask/Makefile.in b/src/tools/other/gen_vx_mask/Makefile.in index fd9d0ba39a..4003ad1c17 100644 --- a/src/tools/other/gen_vx_mask/Makefile.in +++ b/src/tools/other/gen_vx_mask/Makefile.in @@ -104,7 +104,8 @@ PROGRAMS = $(bin_PROGRAMS) am_gen_vx_mask_OBJECTS = gen_vx_mask-gen_vx_mask.$(OBJEXT) gen_vx_mask_OBJECTS = $(am_gen_vx_mask_OBJECTS) am__DEPENDENCIES_1 = -gen_vx_mask_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +gen_vx_mask_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) gen_vx_mask_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(gen_vx_mask_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -267,6 +268,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -334,7 +336,7 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_gis \ diff --git a/src/tools/other/gis_utils/Makefile.in b/src/tools/other/gis_utils/Makefile.in index c43a62c46a..ef269df9c6 100644 --- a/src/tools/other/gis_utils/Makefile.in +++ b/src/tools/other/gis_utils/Makefile.in @@ -281,6 +281,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/other/grid_diag/Makefile.am b/src/tools/other/grid_diag/Makefile.am index ad48185c29..b1b2a04e49 100644 --- a/src/tools/other/grid_diag/Makefile.am +++ b/src/tools/other/grid_diag/Makefile.am @@ -26,7 +26,7 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/grid_diag/Makefile.in b/src/tools/other/grid_diag/Makefile.in index b640eab070..e350a6a9f9 100644 --- a/src/tools/other/grid_diag/Makefile.in +++ b/src/tools/other/grid_diag/Makefile.in @@ -105,7 +105,8 @@ am_grid_diag_OBJECTS = grid_diag-grid_diag.$(OBJEXT) \ grid_diag-grid_diag_conf_info.$(OBJEXT) grid_diag_OBJECTS = $(am_grid_diag_OBJECTS) am__DEPENDENCIES_1 = -grid_diag_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +grid_diag_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) grid_diag_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(grid_diag_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -269,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -342,7 +344,7 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/gsi_tools/Makefile.am b/src/tools/other/gsi_tools/Makefile.am index d7fec0a689..a0a76cb940 100644 --- a/src/tools/other/gsi_tools/Makefile.am +++ b/src/tools/other/gsi_tools/Makefile.am @@ -45,7 +45,7 @@ gsid2mpr_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ @@ -95,7 +95,7 @@ gsidens2orank_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ diff --git a/src/tools/other/gsi_tools/Makefile.in b/src/tools/other/gsi_tools/Makefile.in index 6f9f8c2fe9..835ea4146c 100644 --- a/src/tools/other/gsi_tools/Makefile.in +++ b/src/tools/other/gsi_tools/Makefile.in @@ -108,7 +108,7 @@ am_gsid2mpr_OBJECTS = gsid2mpr-gsi_record.$(OBJEXT) \ gsid2mpr_OBJECTS = $(am_gsid2mpr_OBJECTS) am__DEPENDENCIES_1 = gsid2mpr_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) gsid2mpr_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(gsid2mpr_LDFLAGS) $(LDFLAGS) -o $@ am_gsidens2orank_OBJECTS = gsidens2orank-gsi_record.$(OBJEXT) \ @@ -119,7 +119,8 @@ am_gsidens2orank_OBJECTS = gsidens2orank-gsi_record.$(OBJEXT) \ gsidens2orank-rad_config.$(OBJEXT) gsidens2orank_OBJECTS = $(am_gsidens2orank_OBJECTS) gsidens2orank_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) gsidens2orank_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(gsidens2orank_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -305,6 +306,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -395,7 +397,7 @@ gsid2mpr_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ @@ -446,7 +448,7 @@ gsidens2orank_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ diff --git a/src/tools/other/ioda2nc/Makefile.am b/src/tools/other/ioda2nc/Makefile.am index b5cf633a54..d34bd36eb5 100644 --- a/src/tools/other/ioda2nc/Makefile.am +++ b/src/tools/other/ioda2nc/Makefile.am @@ -24,7 +24,7 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/ioda2nc/Makefile.in b/src/tools/other/ioda2nc/Makefile.in index 3e5d657e88..9572c8b526 100644 --- a/src/tools/other/ioda2nc/Makefile.in +++ b/src/tools/other/ioda2nc/Makefile.in @@ -106,7 +106,8 @@ am_ioda2nc_OBJECTS = ioda2nc-ioda2nc.$(OBJEXT) \ ioda2nc_OBJECTS = $(am_ioda2nc_OBJECTS) am__DEPENDENCIES_1 = ioda2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) ioda2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ioda2nc_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -282,6 +283,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -353,7 +355,7 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/lidar2nc/Makefile.am b/src/tools/other/lidar2nc/Makefile.am index f13e1dac80..0bbe09fb4f 100644 --- a/src/tools/other/lidar2nc/Makefile.am +++ b/src/tools/other/lidar2nc/Makefile.am @@ -26,7 +26,7 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_data2d_nc_met \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_obs \ -lvx_nc_util \ diff --git a/src/tools/other/lidar2nc/Makefile.in b/src/tools/other/lidar2nc/Makefile.in index 9b1f62318e..001f3bb6bd 100644 --- a/src/tools/other/lidar2nc/Makefile.in +++ b/src/tools/other/lidar2nc/Makefile.in @@ -105,7 +105,8 @@ am_lidar2nc_OBJECTS = lidar2nc-lidar2nc.$(OBJEXT) \ lidar2nc-hdf_utils.$(OBJEXT) lidar2nc-calipso_5km.$(OBJEXT) lidar2nc_OBJECTS = $(am_lidar2nc_OBJECTS) am__DEPENDENCIES_1 = -lidar2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +lidar2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) lidar2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(lidar2nc_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -282,6 +283,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -356,7 +358,7 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_data2d_nc_met \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_obs \ -lvx_nc_util \ diff --git a/src/tools/other/madis2nc/Makefile.am b/src/tools/other/madis2nc/Makefile.am index feb1cc0c4d..9176924ec0 100644 --- a/src/tools/other/madis2nc/Makefile.am +++ b/src/tools/other/madis2nc/Makefile.am @@ -23,7 +23,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/madis2nc/Makefile.in b/src/tools/other/madis2nc/Makefile.in index 0d35e5978a..26730279bd 100644 --- a/src/tools/other/madis2nc/Makefile.in +++ b/src/tools/other/madis2nc/Makefile.in @@ -106,7 +106,7 @@ am_madis2nc_OBJECTS = madis2nc-madis2nc.$(OBJEXT) \ madis2nc_OBJECTS = $(am_madis2nc_OBJECTS) am__DEPENDENCIES_1 = madis2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) madis2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(madis2nc_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -339,7 +340,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/mode_graphics/Makefile.am b/src/tools/other/mode_graphics/Makefile.am index 6773629974..7b6625f885 100644 --- a/src/tools/other/mode_graphics/Makefile.am +++ b/src/tools/other/mode_graphics/Makefile.am @@ -26,7 +26,7 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_plot_util \ -lvx_data2d_nc_met \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_grid \ diff --git a/src/tools/other/mode_graphics/Makefile.in b/src/tools/other/mode_graphics/Makefile.in index f0c50cee76..393377df71 100644 --- a/src/tools/other/mode_graphics/Makefile.in +++ b/src/tools/other/mode_graphics/Makefile.in @@ -110,7 +110,8 @@ am_plot_mode_field_OBJECTS = \ plot_mode_field-mode_nc_output_file.$(OBJEXT) plot_mode_field_OBJECTS = $(am_plot_mode_field_OBJECTS) am__DEPENDENCIES_1 = -plot_mode_field_DEPENDENCIES = $(am__DEPENDENCIES_1) +plot_mode_field_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) plot_mode_field_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(plot_mode_field_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -290,6 +291,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -362,7 +364,7 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_plot_util \ -lvx_data2d_nc_met \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_grid \ diff --git a/src/tools/other/mode_time_domain/Makefile.am b/src/tools/other/mode_time_domain/Makefile.am index 7c6bb4392d..2ec931dccc 100644 --- a/src/tools/other/mode_time_domain/Makefile.am +++ b/src/tools/other/mode_time_domain/Makefile.am @@ -55,7 +55,7 @@ mtd_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/mode_time_domain/Makefile.in b/src/tools/other/mode_time_domain/Makefile.in index 05e2c0692a..0976829a62 100644 --- a/src/tools/other/mode_time_domain/Makefile.in +++ b/src/tools/other/mode_time_domain/Makefile.in @@ -116,7 +116,8 @@ am_mtd_OBJECTS = mtd-mtd.$(OBJEXT) mtd-mtdfiletype_to_string.$(OBJEXT) \ mtd-mm_engine.$(OBJEXT) mtd_OBJECTS = $(am_mtd_OBJECTS) am__DEPENDENCIES_1 = -mtd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +mtd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) mtd_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(mtd_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -308,6 +309,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -411,7 +413,7 @@ mtd_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/modis_regrid/Makefile.am b/src/tools/other/modis_regrid/Makefile.am index 8b16557c9c..3015d3df30 100644 --- a/src/tools/other/modis_regrid/Makefile.am +++ b/src/tools/other/modis_regrid/Makefile.am @@ -35,7 +35,7 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_data2d \ diff --git a/src/tools/other/modis_regrid/Makefile.in b/src/tools/other/modis_regrid/Makefile.in index a7382a2588..95adbafe15 100644 --- a/src/tools/other/modis_regrid/Makefile.in +++ b/src/tools/other/modis_regrid/Makefile.in @@ -110,7 +110,7 @@ am_modis_regrid_OBJECTS = modis_regrid-modis_regrid.$(OBJEXT) \ modis_regrid_OBJECTS = $(am_modis_regrid_OBJECTS) am__DEPENDENCIES_1 = modis_regrid_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) modis_regrid_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(modis_regrid_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -278,6 +278,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -360,7 +361,7 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_data2d \ diff --git a/src/tools/other/pb2nc/Makefile.am b/src/tools/other/pb2nc/Makefile.am index 9888a2e63b..aa48399345 100644 --- a/src/tools/other/pb2nc/Makefile.am +++ b/src/tools/other/pb2nc/Makefile.am @@ -41,7 +41,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/pb2nc/Makefile.in b/src/tools/other/pb2nc/Makefile.in index 39b7e034af..eeb0f7a65f 100644 --- a/src/tools/other/pb2nc/Makefile.in +++ b/src/tools/other/pb2nc/Makefile.in @@ -109,8 +109,8 @@ pb2nc_OBJECTS = $(am_pb2nc_OBJECTS) am__DEPENDENCIES_1 = @BUFRLIB_NAME_SET_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) pb2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) pb2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(pb2nc_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -298,6 +298,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -381,7 +382,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/plot_data_plane/Makefile.am b/src/tools/other/plot_data_plane/Makefile.am index 8c84625e32..14316dc1a5 100644 --- a/src/tools/other/plot_data_plane/Makefile.am +++ b/src/tools/other/plot_data_plane/Makefile.am @@ -20,7 +20,7 @@ plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/plot_data_plane/Makefile.in b/src/tools/other/plot_data_plane/Makefile.in index 0b2e1cf75a..d0833ea6b8 100644 --- a/src/tools/other/plot_data_plane/Makefile.in +++ b/src/tools/other/plot_data_plane/Makefile.in @@ -106,7 +106,7 @@ am_plot_data_plane_OBJECTS = \ plot_data_plane_OBJECTS = $(am_plot_data_plane_OBJECTS) am__DEPENDENCIES_1 = plot_data_plane_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) plot_data_plane_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(plot_data_plane_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -269,6 +269,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -335,7 +336,7 @@ plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/plot_point_obs/Makefile.am b/src/tools/other/plot_point_obs/Makefile.am index 9a537321e2..e533198b86 100644 --- a/src/tools/other/plot_point_obs/Makefile.am +++ b/src/tools/other/plot_point_obs/Makefile.am @@ -21,7 +21,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/plot_point_obs/Makefile.in b/src/tools/other/plot_point_obs/Makefile.in index 53788d19c1..f3d8b15d5c 100644 --- a/src/tools/other/plot_point_obs/Makefile.in +++ b/src/tools/other/plot_point_obs/Makefile.in @@ -106,7 +106,8 @@ am_plot_point_obs_OBJECTS = plot_point_obs-plot_point_obs.$(OBJEXT) \ plot_point_obs_OBJECTS = $(am_plot_point_obs_OBJECTS) am__DEPENDENCIES_1 = plot_point_obs_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) plot_point_obs_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(plot_point_obs_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +271,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -338,7 +340,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/point2grid/Makefile.am b/src/tools/other/point2grid/Makefile.am index 805c8b2fd2..e9ed70c742 100644 --- a/src/tools/other/point2grid/Makefile.am +++ b/src/tools/other/point2grid/Makefile.am @@ -21,7 +21,7 @@ point2grid_LDADD = -lvx_statistics \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/point2grid/Makefile.in b/src/tools/other/point2grid/Makefile.in index 5c2cc881d9..d1cfd2740d 100644 --- a/src/tools/other/point2grid/Makefile.in +++ b/src/tools/other/point2grid/Makefile.in @@ -106,7 +106,7 @@ am_point2grid_OBJECTS = point2grid-point2grid.$(OBJEXT) \ point2grid_OBJECTS = $(am_point2grid_OBJECTS) am__DEPENDENCIES_1 = point2grid_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) point2grid_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(point2grid_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -282,6 +282,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -350,7 +351,7 @@ point2grid_LDADD = -lvx_statistics \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/regrid_data_plane/Makefile.am b/src/tools/other/regrid_data_plane/Makefile.am index 2efd122c4f..8c7a4692dd 100644 --- a/src/tools/other/regrid_data_plane/Makefile.am +++ b/src/tools/other/regrid_data_plane/Makefile.am @@ -21,7 +21,7 @@ regrid_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/regrid_data_plane/Makefile.in b/src/tools/other/regrid_data_plane/Makefile.in index d565c60b98..c34f203b8c 100644 --- a/src/tools/other/regrid_data_plane/Makefile.in +++ b/src/tools/other/regrid_data_plane/Makefile.in @@ -106,7 +106,7 @@ am_regrid_data_plane_OBJECTS = \ regrid_data_plane_OBJECTS = $(am_regrid_data_plane_OBJECTS) am__DEPENDENCIES_1 = regrid_data_plane_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) regrid_data_plane_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(regrid_data_plane_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -337,7 +338,7 @@ regrid_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/shift_data_plane/Makefile.am b/src/tools/other/shift_data_plane/Makefile.am index fa78dbd5f9..498c5365bc 100644 --- a/src/tools/other/shift_data_plane/Makefile.am +++ b/src/tools/other/shift_data_plane/Makefile.am @@ -21,7 +21,7 @@ shift_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/shift_data_plane/Makefile.in b/src/tools/other/shift_data_plane/Makefile.in index 1887ceb5b7..eab017a124 100644 --- a/src/tools/other/shift_data_plane/Makefile.in +++ b/src/tools/other/shift_data_plane/Makefile.in @@ -106,7 +106,7 @@ am_shift_data_plane_OBJECTS = \ shift_data_plane_OBJECTS = $(am_shift_data_plane_OBJECTS) am__DEPENDENCIES_1 = shift_data_plane_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) shift_data_plane_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(shift_data_plane_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -337,7 +338,7 @@ shift_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/wwmca_tool/Makefile.am b/src/tools/other/wwmca_tool/Makefile.am index bc3fcbce06..53f2b0a508 100644 --- a/src/tools/other/wwmca_tool/Makefile.am +++ b/src/tools/other/wwmca_tool/Makefile.am @@ -44,7 +44,7 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -91,7 +91,7 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/src/tools/other/wwmca_tool/Makefile.in b/src/tools/other/wwmca_tool/Makefile.in index 3496883d48..f8aa3f9f44 100644 --- a/src/tools/other/wwmca_tool/Makefile.in +++ b/src/tools/other/wwmca_tool/Makefile.in @@ -113,7 +113,8 @@ am_wwmca_plot_OBJECTS = wwmca_plot-gridhemisphere_to_string.$(OBJEXT) \ wwmca_plot-wwmca_ref.$(OBJEXT) wwmca_plot_OBJECTS = $(am_wwmca_plot_OBJECTS) am__DEPENDENCIES_1 = -wwmca_plot_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +wwmca_plot_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) wwmca_plot_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(wwmca_plot_LDFLAGS) $(LDFLAGS) -o $@ am_wwmca_regrid_OBJECTS = \ @@ -131,7 +132,7 @@ am_wwmca_regrid_OBJECTS = \ wwmca_regrid-nc_output.$(OBJEXT) wwmca_regrid_OBJECTS = $(am_wwmca_regrid_OBJECTS) wwmca_regrid_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) wwmca_regrid_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(wwmca_regrid_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -328,6 +329,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -417,7 +419,7 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -465,7 +467,7 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/src/tools/tc_utils/Makefile.in b/src/tools/tc_utils/Makefile.in index 6bc15376af..6ca0db4522 100644 --- a/src/tools/tc_utils/Makefile.in +++ b/src/tools/tc_utils/Makefile.in @@ -279,6 +279,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.am b/src/tools/tc_utils/rmw_analysis/Makefile.am index 63e6c7a28e..fba765027a 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.am +++ b/src/tools/tc_utils/rmw_analysis/Makefile.am @@ -26,7 +26,7 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.in b/src/tools/tc_utils/rmw_analysis/Makefile.in index e0f6abe947..d8d42ef7c0 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.in +++ b/src/tools/tc_utils/rmw_analysis/Makefile.in @@ -106,7 +106,8 @@ am_rmw_analysis_OBJECTS = rmw_analysis-rmw_analysis.$(OBJEXT) \ rmw_analysis_OBJECTS = $(am_rmw_analysis_OBJECTS) am__DEPENDENCIES_1 = rmw_analysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) rmw_analysis_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(rmw_analysis_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +271,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -343,7 +345,7 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_diag/Makefile.am b/src/tools/tc_utils/tc_diag/Makefile.am index 20b10b2711..51132dd579 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.am +++ b/src/tools/tc_utils/tc_diag/Makefile.am @@ -27,7 +27,7 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_diag/Makefile.in b/src/tools/tc_utils/tc_diag/Makefile.in index ab237104e5..2b58eb112d 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.in +++ b/src/tools/tc_utils/tc_diag/Makefile.in @@ -107,7 +107,7 @@ am_tc_diag_OBJECTS = tc_diag-tc_diag.$(OBJEXT) \ tc_diag_OBJECTS = $(am_tc_diag_OBJECTS) am__DEPENDENCIES_1 = tc_diag_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) tc_diag_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(tc_diag_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -272,6 +272,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -346,7 +347,7 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_dland/Makefile.am b/src/tools/tc_utils/tc_dland/Makefile.am index 47af10b1c0..675c0c1952 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.am +++ b/src/tools/tc_utils/tc_dland/Makefile.am @@ -16,7 +16,7 @@ tc_dland_SOURCES = tc_dland.cc \ tc_dland_CPPFLAGS = ${MET_CPPFLAGS} tc_dland_LDFLAGS = ${MET_LDFLAGS} tc_dland_LDADD = -lvx_tc_util \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_nc_util \ -lvx_grid \ -lvx_geodesy \ diff --git a/src/tools/tc_utils/tc_dland/Makefile.in b/src/tools/tc_utils/tc_dland/Makefile.in index 1fff6ed87c..945f5be25f 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.in +++ b/src/tools/tc_utils/tc_dland/Makefile.in @@ -105,7 +105,7 @@ am_tc_dland_OBJECTS = tc_dland-tc_dland.$(OBJEXT) \ tc_dland-tc_poly.$(OBJEXT) tc_dland_OBJECTS = $(am_tc_dland_OBJECTS) am__DEPENDENCIES_1 = -tc_dland_DEPENDENCIES = $(am__DEPENDENCIES_1) +tc_dland_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) tc_dland_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(tc_dland_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -281,6 +281,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -344,7 +345,7 @@ tc_dland_SOURCES = tc_dland.cc \ tc_dland_CPPFLAGS = ${MET_CPPFLAGS} tc_dland_LDFLAGS = ${MET_LDFLAGS} tc_dland_LDADD = -lvx_tc_util \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_nc_util \ -lvx_grid \ -lvx_geodesy \ diff --git a/src/tools/tc_utils/tc_gen/Makefile.am b/src/tools/tc_utils/tc_gen/Makefile.am index 5ca6353aee..92e0f521d2 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.am +++ b/src/tools/tc_utils/tc_gen/Makefile.am @@ -27,7 +27,7 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_gis \ -lvx_data2d \ diff --git a/src/tools/tc_utils/tc_gen/Makefile.in b/src/tools/tc_utils/tc_gen/Makefile.in index 69e77e4aeb..53bc5e92e9 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.in +++ b/src/tools/tc_utils/tc_gen/Makefile.in @@ -106,7 +106,7 @@ am_tc_gen_OBJECTS = tc_gen-tc_gen.$(OBJEXT) \ tc_gen_OBJECTS = $(am_tc_gen_OBJECTS) am__DEPENDENCIES_1 = tc_gen_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) tc_gen_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(tc_gen_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -344,7 +345,7 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_gis \ -lvx_data2d \ diff --git a/src/tools/tc_utils/tc_pairs/Makefile.am b/src/tools/tc_utils/tc_pairs/Makefile.am index 6626964a6c..37ff3b7616 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.am +++ b/src/tools/tc_utils/tc_pairs/Makefile.am @@ -29,7 +29,7 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_pairs/Makefile.in b/src/tools/tc_utils/tc_pairs/Makefile.in index faf8501eb9..8f11ac0233 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.in +++ b/src/tools/tc_utils/tc_pairs/Makefile.in @@ -106,7 +106,7 @@ am_tc_pairs_OBJECTS = tc_pairs-tc_pairs.$(OBJEXT) acerr.$(OBJEXT) \ tc_pairs_OBJECTS = $(am_tc_pairs_OBJECTS) am__DEPENDENCIES_1 = tc_pairs_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) tc_pairs_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(tc_pairs_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -294,6 +294,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -370,7 +371,7 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_rmw/Makefile.am b/src/tools/tc_utils/tc_rmw/Makefile.am index 12676b3430..b9b562f747 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.am +++ b/src/tools/tc_utils/tc_rmw/Makefile.am @@ -27,7 +27,7 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_rmw/Makefile.in b/src/tools/tc_utils/tc_rmw/Makefile.in index 43bf8353df..4602c2cde2 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.in +++ b/src/tools/tc_utils/tc_rmw/Makefile.in @@ -107,7 +107,7 @@ am_tc_rmw_OBJECTS = tc_rmw-tc_rmw.$(OBJEXT) \ tc_rmw_OBJECTS = $(am_tc_rmw_OBJECTS) am__DEPENDENCIES_1 = tc_rmw_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) tc_rmw_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(tc_rmw_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -272,6 +272,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -346,7 +347,7 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.am b/src/tools/tc_utils/tc_stat/Makefile.am index e668d0feb7..8823604e0f 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.am +++ b/src/tools/tc_utils/tc_stat/Makefile.am @@ -29,7 +29,7 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.in b/src/tools/tc_utils/tc_stat/Makefile.in index ae8ecd44b2..e9f4fedbee 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.in +++ b/src/tools/tc_utils/tc_stat/Makefile.in @@ -106,7 +106,8 @@ am_tc_stat_OBJECTS = tc_stat-tc_stat.$(OBJEXT) \ tc_stat-tc_stat_files.$(OBJEXT) tc_stat-tc_stat_job.$(OBJEXT) tc_stat_OBJECTS = $(am_tc_stat_OBJECTS) am__DEPENDENCIES_1 = -tc_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +tc_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) tc_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(tc_stat_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -272,6 +273,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -348,7 +350,7 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \