#2574 Replaced libraries with UGRID_LIBS

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

Hide file tree

Showing 16 changed files with 69 additions and 51 deletions.
diff --git a/internal/test_util/libcode/vx_data2d/Makefile.am b/internal/test_util/libcode/vx_data2d/Makefile.am
@@ -34,7 +34,7 @@ dump_default_table_LDFLAGS = -L. ${MET_LDFLAGS}
 dump_default_table_LDADD = -lvx_config \
 	-lvx_gsl_prob \
 	-lvx_log \
-	-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \
+	$(UGRID_LIBS) \
 	-lvx_data2d \
 	-lvx_grid \
 	-lvx_geodesy \

diff --git a/internal/test_util/libcode/vx_data2d/Makefile.in b/internal/test_util/libcode/vx_data2d/Makefile.in
@@ -103,7 +103,8 @@ PROGRAMS = $(noinst_PROGRAMS)
 am_dump_default_table_OBJECTS =  \
 	dump_default_table-dump_default_table.$(OBJEXT)
 dump_default_table_OBJECTS = $(am_dump_default_table_OBJECTS)
-dump_default_table_DEPENDENCIES =
+am__DEPENDENCIES_1 =
+dump_default_table_DEPENDENCIES = $(am__DEPENDENCIES_1)
 dump_default_table_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(dump_default_table_LDFLAGS) $(LDFLAGS) -o $@
 am_test_table_read_OBJECTS =  \
@@ -275,6 +276,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 @@ dump_default_table_LDFLAGS = -L. ${MET_LDFLAGS}
 dump_default_table_LDADD = -lvx_config \
 	-lvx_gsl_prob \
 	-lvx_log \
-	-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \
+	$(UGRID_LIBS) \
 	-lvx_data2d \
 	-lvx_grid \
 	-lvx_geodesy \

diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.am b/internal/test_util/libcode/vx_data2d_factory/Makefile.am
@@ -36,7 +36,7 @@ test_factory_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/internal/test_util/libcode/vx_data2d_factory/Makefile.in b/internal/test_util/libcode/vx_data2d_factory/Makefile.in
@@ -104,7 +104,7 @@ am_test_factory_OBJECTS = test_factory-test_factory.$(OBJEXT)
 test_factory_OBJECTS = $(am_test_factory_OBJECTS)
 am__DEPENDENCIES_1 =
 test_factory_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 test_factory_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(test_factory_LDFLAGS) $(LDFLAGS) -o $@
 am_test_is_grib_OBJECTS = test_is_grib-test_is_grib.$(OBJEXT)
@@ -273,6 +273,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+UGRID_LIBS = @UGRID_LIBS@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -353,7 +354,7 @@ test_factory_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/internal/test_util/libcode/vx_data2d_grib/Makefile.am b/internal/test_util/libcode/vx_data2d_grib/Makefile.am
@@ -16,7 +16,7 @@ test_read_grib1_SOURCES = test_read_grib1.cc
 test_read_grib1_CPPFLAGS = ${MET_CPPFLAGS}
 test_read_grib1_LDFLAGS = -L. ${MET_LDFLAGS}
 test_read_grib1_LDADD = -lvx_data2d_grib \
-	-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \
+	$(UGRID_LIBS) \
 	-lvx_data2d \
 	-lvx_grid \
 	-lvx_geodesy \

diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.in b/internal/test_util/libcode/vx_data2d_grib/Makefile.in
@@ -103,7 +103,8 @@ PROGRAMS = $(noinst_PROGRAMS)
 am_test_read_grib1_OBJECTS =  \
 	test_read_grib1-test_read_grib1.$(OBJEXT)
 test_read_grib1_OBJECTS = $(am_test_read_grib1_OBJECTS)
-test_read_grib1_DEPENDENCIES =
+am__DEPENDENCIES_1 =
+test_read_grib1_DEPENDENCIES = $(am__DEPENDENCIES_1)
 test_read_grib1_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(test_read_grib1_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
@@ -266,6 +267,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+UGRID_LIBS = @UGRID_LIBS@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -327,7 +329,7 @@ test_read_grib1_SOURCES = test_read_grib1.cc
 test_read_grib1_CPPFLAGS = ${MET_CPPFLAGS}
 test_read_grib1_LDFLAGS = -L. ${MET_LDFLAGS}
 test_read_grib1_LDADD = -lvx_data2d_grib \
-	-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \
+	$(UGRID_LIBS) \
 	-lvx_data2d \
 	-lvx_grid \
 	-lvx_geodesy \

diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am
@@ -16,7 +16,7 @@ test_read_nc_met_SOURCES = test_read_nc_met.cc
 test_read_nc_met_CPPFLAGS = ${MET_CPPFLAGS}
 test_read_nc_met_LDFLAGS = -L. ${MET_LDFLAGS}
 test_read_nc_met_LDADD = -lvx_data2d_nc_met \
-	-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \
+	$(UGRID_LIBS) \
 	-lvx_nc_util \
 	-lvx_data2d \
 	-lvx_grid \

diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in
@@ -103,7 +103,8 @@ PROGRAMS = $(noinst_PROGRAMS)
 am_test_read_nc_met_OBJECTS =  \
 	test_read_nc_met-test_read_nc_met.$(OBJEXT)
 test_read_nc_met_OBJECTS = $(am_test_read_nc_met_OBJECTS)
-test_read_nc_met_DEPENDENCIES =
+am__DEPENDENCIES_1 =
+test_read_nc_met_DEPENDENCIES = $(am__DEPENDENCIES_1)
 test_read_nc_met_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(test_read_nc_met_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@
@@ -328,7 +330,7 @@ test_read_nc_met_SOURCES = test_read_nc_met.cc
 test_read_nc_met_CPPFLAGS = ${MET_CPPFLAGS}
 test_read_nc_met_LDFLAGS = -L. ${MET_LDFLAGS}
 test_read_nc_met_LDADD = -lvx_data2d_nc_met \
-	-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \
+	$(UGRID_LIBS) \
 	-lvx_nc_util \
 	-lvx_data2d \
 	-lvx_grid \

diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.am b/internal/test_util/libcode/vx_data2d_nccf/Makefile.am
@@ -16,7 +16,7 @@ test_read_nccf_SOURCES = test_read_nccf.cc
 test_read_nccf_CPPFLAGS = ${MET_CPPFLAGS}
 test_read_nccf_LDFLAGS = -L. ${MET_LDFLAGS}
 test_read_nccf_LDADD = -lvx_data2d_nccf \
-	-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \
+	$(UGRID_LIBS) \
 	-lvx_nc_util \
 	-lvx_data2d \
 	-lvx_grid \

diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in
@@ -102,7 +102,8 @@ CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am_test_read_nccf_OBJECTS = test_read_nccf-test_read_nccf.$(OBJEXT)
 test_read_nccf_OBJECTS = $(am_test_read_nccf_OBJECTS)
-test_read_nccf_DEPENDENCIES =
+am__DEPENDENCIES_1 =
+test_read_nccf_DEPENDENCIES = $(am__DEPENDENCIES_1)
 test_read_nccf_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(test_read_nccf_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
@@ -265,6 +266,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+UGRID_LIBS = @UGRID_LIBS@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -326,7 +328,7 @@ test_read_nccf_SOURCES = test_read_nccf.cc
 test_read_nccf_CPPFLAGS = ${MET_CPPFLAGS}
 test_read_nccf_LDFLAGS = -L. ${MET_LDFLAGS}
 test_read_nccf_LDADD = -lvx_data2d_nccf \
-	-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \
+	$(UGRID_LIBS) \
 	-lvx_nc_util \
 	-lvx_data2d \
 	-lvx_grid \

diff --git a/internal/test_util/libcode/vx_grid/Makefile.am b/internal/test_util/libcode/vx_grid/Makefile.am
@@ -16,7 +16,7 @@ test_grid_area_SOURCES = test_grid_area.cc
 test_grid_area_CPPFLAGS = ${MET_CPPFLAGS}
 test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS}
 test_grid_area_LDADD = \
-	-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \
+	$(UGRID_LIBS) \
 	-lvx_grid \
 	-lvx_geodesy \
 	-lvx_nav \

diff --git a/internal/test_util/libcode/vx_grid/Makefile.in b/internal/test_util/libcode/vx_grid/Makefile.in
@@ -102,7 +102,8 @@ CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am_test_grid_area_OBJECTS = test_grid_area-test_grid_area.$(OBJEXT)
 test_grid_area_OBJECTS = $(am_test_grid_area_OBJECTS)
-test_grid_area_DEPENDENCIES =
+am__DEPENDENCIES_1 =
+test_grid_area_DEPENDENCIES = $(am__DEPENDENCIES_1)
 test_grid_area_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(test_grid_area_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
@@ -265,6 +266,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+UGRID_LIBS = @UGRID_LIBS@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -326,7 +328,7 @@ test_grid_area_SOURCES = test_grid_area.cc
 test_grid_area_CPPFLAGS = ${MET_CPPFLAGS}
 test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS}
 test_grid_area_LDADD = \
-	-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \
+	$(UGRID_LIBS) \
 	-lvx_grid \
 	-lvx_geodesy \
 	-lvx_nav \

diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.am b/internal/test_util/tools/other/mode_time_domain/Makefile.am
@@ -58,7 +58,7 @@ test_velocity_LDADD = \
 	$(PYTHON_LIBS) \
 	-lvx_statistics \
 	-lvx_data2d_nccf \
-	-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \
+	$(UGRID_LIBS) \
 	-lvx_data2d \
 	-lvx_nc_util \
 	-lvx_regrid \

diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.in b/internal/test_util/tools/other/mode_time_domain/Makefile.in
@@ -127,7 +127,8 @@ test_velocity_DEPENDENCIES = ${top_builddir}/src/tools/other/mode_time_domain/mt
 	${top_builddir}/src/tools/other/mode_time_domain/mtd-mtd_txt_output.o \
 	${top_builddir}/src/tools/other/mode_time_domain/mtd-nc_grid.o \
 	${top_builddir}/src/tools/other/mode_time_domain/mtd-nc_utils_local.o \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 test_velocity_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(test_velocity_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@
@@ -393,7 +395,7 @@ test_velocity_LDADD = \
 	$(PYTHON_LIBS) \
 	-lvx_statistics \
 	-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/libcode/vx_grid/Makefile.am b/src/libcode/vx_grid/Makefile.am
@@ -34,6 +34,11 @@ libvx_grid_a_SOURCES = \
               goes_grid.cc goes_grid.h \
               semilatlon_grid_defs.h \
               semilatlon_grid.cc semilatlon_grid.h \
-              unstructured_grid.cc unstructured_grid.h unstructured_grid_defs.h \
               vx_grid.h
+
+if ENABLE_UGRID
+  libvx_grid_a_SOURCES += unstructured_grid.cc unstructured_grid.h unstructured_grid_defs.h
+endif
+
+
 libvx_grid_a_CPPFLAGS = ${MET_CPPFLAGS}
diff --git a/src/libcode/vx_grid/Makefile.in b/src/libcode/vx_grid/Makefile.in
@@ -88,6 +88,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@ENABLE_UGRID_TRUE@am__append_1 = unstructured_grid.cc unstructured_grid.h unstructured_grid_defs.h
 subdir = src/libcode/vx_grid
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -107,6 +108,20 @@ am__v_AR_0 = @echo "  AR      " $@;
 am__v_AR_1 = 
 libvx_grid_a_AR = $(AR) $(ARFLAGS)
 libvx_grid_a_LIBADD =
+am__libvx_grid_a_SOURCES_DIST = earth_rotation.cc earth_rotation.h \
+	find_grid_by_name.cc find_grid_by_name.h grid_base.cc \
+	grid_base.h latlon_grid_defs.h latlon_grid.cc latlon_grid.h \
+	laea_grid_defs.h laea_grid.cc laea_grid.h lc_grid_defs.h \
+	lc_grid.cc lc_grid.h merc_grid_defs.h merc_grid.cc merc_grid.h \
+	gaussian_grid_defs.h gaussian_grid.cc gaussian_grid.h \
+	st_grid_defs.h st_grid.cc st_grid.h latlon_xyz.h latlon_xyz.cc \
+	rot_latlon_grid.cc rot_latlon_grid.h tcrmw_grid.cc \
+	tcrmw_grid.h goes_grid_defs.h goes_grid.cc goes_grid.h \
+	semilatlon_grid_defs.h semilatlon_grid.cc semilatlon_grid.h \
+	vx_grid.h unstructured_grid.cc unstructured_grid.h \
+	unstructured_grid_defs.h
+@ENABLE_UGRID_TRUE@am__objects_1 =  \
+@ENABLE_UGRID_TRUE@	libvx_grid_a-unstructured_grid.$(OBJEXT)
 am_libvx_grid_a_OBJECTS = libvx_grid_a-earth_rotation.$(OBJEXT) \
 	libvx_grid_a-find_grid_by_name.$(OBJEXT) \
 	libvx_grid_a-grid_base.$(OBJEXT) \
@@ -120,8 +135,7 @@ am_libvx_grid_a_OBJECTS = libvx_grid_a-earth_rotation.$(OBJEXT) \
 	libvx_grid_a-rot_latlon_grid.$(OBJEXT) \
 	libvx_grid_a-tcrmw_grid.$(OBJEXT) \
 	libvx_grid_a-goes_grid.$(OBJEXT) \
-	libvx_grid_a-semilatlon_grid.$(OBJEXT) \
-	libvx_grid_a-unstructured_grid.$(OBJEXT)
+	libvx_grid_a-semilatlon_grid.$(OBJEXT) $(am__objects_1)
 libvx_grid_a_OBJECTS = $(am_libvx_grid_a_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -184,7 +198,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(libvx_grid_a_SOURCES)
-DIST_SOURCES = $(libvx_grid_a_SOURCES)
+DIST_SOURCES = $(am__libvx_grid_a_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -309,6 +323,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+UGRID_LIBS = @UGRID_LIBS@
 VERSION = @VERSION@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
@@ -369,32 +384,17 @@ MAINTAINERCLEANFILES = Makefile.in
 
 # The library
 noinst_LIBRARIES = libvx_grid.a
-libvx_grid_a_SOURCES = \
-              earth_rotation.cc earth_rotation.h  \
-              find_grid_by_name.cc  find_grid_by_name.h \
-              grid_base.cc grid_base.h \
-              latlon_grid_defs.h \
-              latlon_grid.cc latlon_grid.h \
-              laea_grid_defs.h \
-              laea_grid.cc laea_grid.h \
-              lc_grid_defs.h \
-              lc_grid.cc lc_grid.h \
-              merc_grid_defs.h \
-              merc_grid.cc merc_grid.h \
-              gaussian_grid_defs.h \
-              gaussian_grid.cc gaussian_grid.h \
-              st_grid_defs.h \
-              st_grid.cc st_grid.h \
-              latlon_xyz.h latlon_xyz.cc \
-              rot_latlon_grid.cc rot_latlon_grid.h \
-              tcrmw_grid.cc tcrmw_grid.h \
-              goes_grid_defs.h \
-              goes_grid.cc goes_grid.h \
-              semilatlon_grid_defs.h \
-              semilatlon_grid.cc semilatlon_grid.h \
-              unstructured_grid.cc unstructured_grid.h unstructured_grid_defs.h \
-              vx_grid.h
-
+libvx_grid_a_SOURCES = earth_rotation.cc earth_rotation.h \
+	find_grid_by_name.cc find_grid_by_name.h grid_base.cc \
+	grid_base.h latlon_grid_defs.h latlon_grid.cc latlon_grid.h \
+	laea_grid_defs.h laea_grid.cc laea_grid.h lc_grid_defs.h \
+	lc_grid.cc lc_grid.h merc_grid_defs.h merc_grid.cc merc_grid.h \
+	gaussian_grid_defs.h gaussian_grid.cc gaussian_grid.h \
+	st_grid_defs.h st_grid.cc st_grid.h latlon_xyz.h latlon_xyz.cc \
+	rot_latlon_grid.cc rot_latlon_grid.h tcrmw_grid.cc \
+	tcrmw_grid.h goes_grid_defs.h goes_grid.cc goes_grid.h \
+	semilatlon_grid_defs.h semilatlon_grid.cc semilatlon_grid.h \
+	vx_grid.h $(am__append_1)
 libvx_grid_a_CPPFLAGS = ${MET_CPPFLAGS}
 all: all-am