#2574 Replaced libraries with UGRID_LIBS

dtcenter · Oct 10, 2023 · 4298f54 · 4298f54
1 parent c72837a
commit 4298f54
Show file tree

Hide file tree

Showing 76 changed files with 170 additions and 112 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 \