Per #2760, moving mask_filters.h/.cc from vx_pointdata_python to vx_d…

…ata. Would still like to add a GHA test configuration options. Could also add a new --enable-all configuration option.
dtcenter · Dec 13, 2023 · 489ff41 · 489ff41
1 parent 7c6df3c
commit 489ff41
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/src/libcode/vx_data2d/Makefile.am b/src/libcode/vx_data2d/Makefile.am
@@ -18,6 +18,7 @@ libvx_data2d_a_SOURCES = \
               data_class.cc data_class.h \
               data2d_utils.cc data2d_utils.h \
               table_lookup.cc table_lookup.h \
+              mask_filters.cc mask_filters.h \
               vx_data2d.h
 libvx_data2d_a_CPPFLAGS = ${MET_CPPFLAGS}
 

diff --git a/src/libcode/vx_data2d/Makefile.in b/src/libcode/vx_data2d/Makefile.in
@@ -113,7 +113,8 @@ am_libvx_data2d_a_OBJECTS =  \
 	libvx_data2d_a-var_info.$(OBJEXT) \
 	libvx_data2d_a-data_class.$(OBJEXT) \
 	libvx_data2d_a-data2d_utils.$(OBJEXT) \
-	libvx_data2d_a-table_lookup.$(OBJEXT)
+	libvx_data2d_a-table_lookup.$(OBJEXT) \
+	libvx_data2d_a-mask_filters.$(OBJEXT)
 libvx_data2d_a_OBJECTS = $(am_libvx_data2d_a_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -134,6 +135,7 @@ am__depfiles_remade = ./$(DEPDIR)/libvx_data2d_a-data2d_utils.Po \
 	./$(DEPDIR)/libvx_data2d_a-data_class.Po \
 	./$(DEPDIR)/libvx_data2d_a-level_info.Po \
 	./$(DEPDIR)/libvx_data2d_a-leveltype_to_string.Po \
+	./$(DEPDIR)/libvx_data2d_a-mask_filters.Po \
 	./$(DEPDIR)/libvx_data2d_a-table_lookup.Po \
 	./$(DEPDIR)/libvx_data2d_a-var_info.Po
 am__mv = mv -f
@@ -361,6 +363,7 @@ libvx_data2d_a_SOURCES = \
               data_class.cc data_class.h \
               data2d_utils.cc data2d_utils.h \
               table_lookup.cc table_lookup.h \
+              mask_filters.cc mask_filters.h \
               vx_data2d.h
 
 libvx_data2d_a_CPPFLAGS = ${MET_CPPFLAGS}
@@ -416,6 +419,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_data2d_a-data_class.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_data2d_a-level_info.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_data2d_a-leveltype_to_string.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_data2d_a-mask_filters.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_data2d_a-table_lookup.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_data2d_a-var_info.Po@am__quote@ # am--include-marker
 
@@ -523,6 +527,20 @@ libvx_data2d_a-table_lookup.obj: table_lookup.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_data2d_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_data2d_a-table_lookup.obj `if test -f 'table_lookup.cc'; then $(CYGPATH_W) 'table_lookup.cc'; else $(CYGPATH_W) '$(srcdir)/table_lookup.cc'; fi`
 
+libvx_data2d_a-mask_filters.o: mask_filters.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_data2d_a-mask_filters.o -MD -MP -MF $(DEPDIR)/libvx_data2d_a-mask_filters.Tpo -c -o libvx_data2d_a-mask_filters.o `test -f 'mask_filters.cc' || echo '$(srcdir)/'`mask_filters.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libvx_data2d_a-mask_filters.Tpo $(DEPDIR)/libvx_data2d_a-mask_filters.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='mask_filters.cc' object='libvx_data2d_a-mask_filters.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_data2d_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_data2d_a-mask_filters.o `test -f 'mask_filters.cc' || echo '$(srcdir)/'`mask_filters.cc
+
+libvx_data2d_a-mask_filters.obj: mask_filters.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_data2d_a-mask_filters.obj -MD -MP -MF $(DEPDIR)/libvx_data2d_a-mask_filters.Tpo -c -o libvx_data2d_a-mask_filters.obj `if test -f 'mask_filters.cc'; then $(CYGPATH_W) 'mask_filters.cc'; else $(CYGPATH_W) '$(srcdir)/mask_filters.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libvx_data2d_a-mask_filters.Tpo $(DEPDIR)/libvx_data2d_a-mask_filters.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='mask_filters.cc' object='libvx_data2d_a-mask_filters.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_data2d_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_data2d_a-mask_filters.obj `if test -f 'mask_filters.cc'; then $(CYGPATH_W) 'mask_filters.cc'; else $(CYGPATH_W) '$(srcdir)/mask_filters.cc'; fi`
+
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
@@ -651,6 +669,7 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/libvx_data2d_a-data_class.Po
 	-rm -f ./$(DEPDIR)/libvx_data2d_a-level_info.Po
 	-rm -f ./$(DEPDIR)/libvx_data2d_a-leveltype_to_string.Po
+	-rm -f ./$(DEPDIR)/libvx_data2d_a-mask_filters.Po
 	-rm -f ./$(DEPDIR)/libvx_data2d_a-table_lookup.Po
 	-rm -f ./$(DEPDIR)/libvx_data2d_a-var_info.Po
 	-rm -f Makefile
@@ -702,6 +721,7 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/libvx_data2d_a-data_class.Po
 	-rm -f ./$(DEPDIR)/libvx_data2d_a-level_info.Po
 	-rm -f ./$(DEPDIR)/libvx_data2d_a-leveltype_to_string.Po
+	-rm -f ./$(DEPDIR)/libvx_data2d_a-mask_filters.Po
 	-rm -f ./$(DEPDIR)/libvx_data2d_a-table_lookup.Po
 	-rm -f ./$(DEPDIR)/libvx_data2d_a-var_info.Po
 	-rm -f Makefile

diff --git a/...bcode/vx_pointdata_python/mask_filters.cc → src/libcode/vx_data2d/mask_filters.cc b/...bcode/vx_pointdata_python/mask_filters.cc → src/libcode/vx_data2d/mask_filters.cc
diff --git a/...ibcode/vx_pointdata_python/mask_filters.h → src/libcode/vx_data2d/mask_filters.h b/...ibcode/vx_pointdata_python/mask_filters.h → src/libcode/vx_data2d/mask_filters.h
diff --git a/src/libcode/vx_pointdata_python/Makefile.am b/src/libcode/vx_pointdata_python/Makefile.am
@@ -12,7 +12,6 @@ include ${top_srcdir}/Make-include
 
 noinst_LIBRARIES = libvx_pointdata_python.a
 libvx_pointdata_python_a_SOURCES = \
-              mask_filters.h mask_filters.cc \
               pointdata_python.h pointdata_python.cc \
               pointdata_from_array.h pointdata_from_array.cc pointdata_from_array.hpp \
               python_pointdata.h python_pointdata.cc python_pointdata.hpp

diff --git a/src/libcode/vx_pointdata_python/Makefile.in b/src/libcode/vx_pointdata_python/Makefile.in
@@ -108,7 +108,6 @@ am__v_AR_1 =
 libvx_pointdata_python_a_AR = $(AR) $(ARFLAGS)
 libvx_pointdata_python_a_LIBADD =
 am_libvx_pointdata_python_a_OBJECTS =  \
-	libvx_pointdata_python_a-mask_filters.$(OBJEXT) \
 	libvx_pointdata_python_a-pointdata_python.$(OBJEXT) \
 	libvx_pointdata_python_a-pointdata_from_array.$(OBJEXT) \
 	libvx_pointdata_python_a-python_pointdata.$(OBJEXT)
@@ -130,7 +129,6 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade =  \
-	./$(DEPDIR)/libvx_pointdata_python_a-mask_filters.Po \
 	./$(DEPDIR)/libvx_pointdata_python_a-pointdata_from_array.Po \
 	./$(DEPDIR)/libvx_pointdata_python_a-pointdata_python.Po \
 	./$(DEPDIR)/libvx_pointdata_python_a-python_pointdata.Po
@@ -353,7 +351,6 @@ MAINTAINERCLEANFILES = Makefile.in
 # The library
 noinst_LIBRARIES = libvx_pointdata_python.a
 libvx_pointdata_python_a_SOURCES = \
-              mask_filters.h mask_filters.cc \
               pointdata_python.h pointdata_python.cc \
               pointdata_from_array.h pointdata_from_array.cc pointdata_from_array.hpp \
               python_pointdata.h python_pointdata.cc python_pointdata.hpp
@@ -407,7 +404,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_pointdata_python_a-mask_filters.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_pointdata_python_a-pointdata_from_array.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_pointdata_python_a-pointdata_python.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_pointdata_python_a-python_pointdata.Po@am__quote@ # am--include-marker
@@ -432,20 +428,6 @@ am--depfiles: $(am__depfiles_remade)
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-libvx_pointdata_python_a-mask_filters.o: mask_filters.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_pointdata_python_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_pointdata_python_a-mask_filters.o -MD -MP -MF $(DEPDIR)/libvx_pointdata_python_a-mask_filters.Tpo -c -o libvx_pointdata_python_a-mask_filters.o `test -f 'mask_filters.cc' || echo '$(srcdir)/'`mask_filters.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libvx_pointdata_python_a-mask_filters.Tpo $(DEPDIR)/libvx_pointdata_python_a-mask_filters.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='mask_filters.cc' object='libvx_pointdata_python_a-mask_filters.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_pointdata_python_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_pointdata_python_a-mask_filters.o `test -f 'mask_filters.cc' || echo '$(srcdir)/'`mask_filters.cc
-
-libvx_pointdata_python_a-mask_filters.obj: mask_filters.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_pointdata_python_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_pointdata_python_a-mask_filters.obj -MD -MP -MF $(DEPDIR)/libvx_pointdata_python_a-mask_filters.Tpo -c -o libvx_pointdata_python_a-mask_filters.obj `if test -f 'mask_filters.cc'; then $(CYGPATH_W) 'mask_filters.cc'; else $(CYGPATH_W) '$(srcdir)/mask_filters.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libvx_pointdata_python_a-mask_filters.Tpo $(DEPDIR)/libvx_pointdata_python_a-mask_filters.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='mask_filters.cc' object='libvx_pointdata_python_a-mask_filters.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_pointdata_python_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_pointdata_python_a-mask_filters.obj `if test -f 'mask_filters.cc'; then $(CYGPATH_W) 'mask_filters.cc'; else $(CYGPATH_W) '$(srcdir)/mask_filters.cc'; fi`
-
 libvx_pointdata_python_a-pointdata_python.o: pointdata_python.cc
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_pointdata_python_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_pointdata_python_a-pointdata_python.o -MD -MP -MF $(DEPDIR)/libvx_pointdata_python_a-pointdata_python.Tpo -c -o libvx_pointdata_python_a-pointdata_python.o `test -f 'pointdata_python.cc' || echo '$(srcdir)/'`pointdata_python.cc
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libvx_pointdata_python_a-pointdata_python.Tpo $(DEPDIR)/libvx_pointdata_python_a-pointdata_python.Po
@@ -612,8 +594,7 @@ clean: clean-am
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/libvx_pointdata_python_a-mask_filters.Po
-	-rm -f ./$(DEPDIR)/libvx_pointdata_python_a-pointdata_from_array.Po
+		-rm -f ./$(DEPDIR)/libvx_pointdata_python_a-pointdata_from_array.Po
 	-rm -f ./$(DEPDIR)/libvx_pointdata_python_a-pointdata_python.Po
 	-rm -f ./$(DEPDIR)/libvx_pointdata_python_a-python_pointdata.Po
 	-rm -f Makefile
@@ -661,8 +642,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/libvx_pointdata_python_a-mask_filters.Po
-	-rm -f ./$(DEPDIR)/libvx_pointdata_python_a-pointdata_from_array.Po
+		-rm -f ./$(DEPDIR)/libvx_pointdata_python_a-pointdata_from_array.Po
 	-rm -f ./$(DEPDIR)/libvx_pointdata_python_a-pointdata_python.Po
 	-rm -f ./$(DEPDIR)/libvx_pointdata_python_a-python_pointdata.Po
 	-rm -f Makefile