From cd6e32fc7d6a5a8af89089ef3ed8c565929353fe Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Thu, 7 Jul 2022 11:16:53 -0600 Subject: [PATCH] Per #1954, since I'm adding new files to the vx_grid library, I had to run bootstrap on seneca to regenerate Makefile.in in vx_grid. Otherwise, running it on my laptop with a different autoconf version would modify all instances of Makefile.in. ci_run_unit --- src/libcode/vx_grid/Makefile.in | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/libcode/vx_grid/Makefile.in b/src/libcode/vx_grid/Makefile.in index 09155d44c7..c189cc64dd 100644 --- a/src/libcode/vx_grid/Makefile.in +++ b/src/libcode/vx_grid/Makefile.in @@ -118,7 +118,8 @@ am_libvx_grid_a_OBJECTS = libvx_grid_a-earth_rotation.$(OBJEXT) \ libvx_grid_a-latlon_xyz.$(OBJEXT) \ libvx_grid_a-rot_latlon_grid.$(OBJEXT) \ libvx_grid_a-tcrmw_grid.$(OBJEXT) \ - libvx_grid_a-goes_grid.$(OBJEXT) + libvx_grid_a-goes_grid.$(OBJEXT) \ + libvx_grid_a-unstructured_grid.$(OBJEXT) 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@) @@ -146,7 +147,8 @@ am__depfiles_remade = ./$(DEPDIR)/libvx_grid_a-earth_rotation.Po \ ./$(DEPDIR)/libvx_grid_a-merc_grid.Po \ ./$(DEPDIR)/libvx_grid_a-rot_latlon_grid.Po \ ./$(DEPDIR)/libvx_grid_a-st_grid.Po \ - ./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po + ./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po \ + ./$(DEPDIR)/libvx_grid_a-unstructured_grid.Po am__mv = mv -f AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -370,7 +372,10 @@ libvx_grid_a_SOURCES = \ 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 \ + goes_grid_defs.h \ + goes_grid.cc goes_grid.h \ + unstructured_grid_defs.h \ + unstructured_grid.cc unstructured_grid.h \ vx_grid.h libvx_grid_a_CPPFLAGS = ${MET_CPPFLAGS} @@ -434,6 +439,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-rot_latlon_grid.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-st_grid.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-unstructured_grid.Po@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -623,6 +629,20 @@ libvx_grid_a-goes_grid.obj: goes_grid.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_grid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_grid_a-goes_grid.obj `if test -f 'goes_grid.cc'; then $(CYGPATH_W) 'goes_grid.cc'; else $(CYGPATH_W) '$(srcdir)/goes_grid.cc'; fi` +libvx_grid_a-unstructured_grid.o: unstructured_grid.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_grid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_grid_a-unstructured_grid.o -MD -MP -MF $(DEPDIR)/libvx_grid_a-unstructured_grid.Tpo -c -o libvx_grid_a-unstructured_grid.o `test -f 'unstructured_grid.cc' || echo '$(srcdir)/'`unstructured_grid.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_grid_a-unstructured_grid.Tpo $(DEPDIR)/libvx_grid_a-unstructured_grid.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='unstructured_grid.cc' object='libvx_grid_a-unstructured_grid.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_grid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_grid_a-unstructured_grid.o `test -f 'unstructured_grid.cc' || echo '$(srcdir)/'`unstructured_grid.cc + +libvx_grid_a-unstructured_grid.obj: unstructured_grid.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_grid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_grid_a-unstructured_grid.obj -MD -MP -MF $(DEPDIR)/libvx_grid_a-unstructured_grid.Tpo -c -o libvx_grid_a-unstructured_grid.obj `if test -f 'unstructured_grid.cc'; then $(CYGPATH_W) 'unstructured_grid.cc'; else $(CYGPATH_W) '$(srcdir)/unstructured_grid.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_grid_a-unstructured_grid.Tpo $(DEPDIR)/libvx_grid_a-unstructured_grid.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='unstructured_grid.cc' object='libvx_grid_a-unstructured_grid.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_grid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_grid_a-unstructured_grid.obj `if test -f 'unstructured_grid.cc'; then $(CYGPATH_W) 'unstructured_grid.cc'; else $(CYGPATH_W) '$(srcdir)/unstructured_grid.cc'; fi` + ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique tags: tags-am @@ -760,6 +780,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libvx_grid_a-rot_latlon_grid.Po -rm -f ./$(DEPDIR)/libvx_grid_a-st_grid.Po -rm -f ./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po + -rm -f ./$(DEPDIR)/libvx_grid_a-unstructured_grid.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -817,6 +838,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libvx_grid_a-rot_latlon_grid.Po -rm -f ./$(DEPDIR)/libvx_grid_a-st_grid.Po -rm -f ./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po + -rm -f ./$(DEPDIR)/libvx_grid_a-unstructured_grid.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic