From 33399832359612f4bad6536e2a7da82a2065dfc4 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Wed, 29 Apr 2026 18:09:06 +0000 Subject: [PATCH 01/14] HYRAX-2121, update the dmrpp basline files due to the update of the HDF5 version. --- .../unit-tests/grid_1_2d.h5.dmrpp.baseline | 10 ++++----- .../grid_2_2d_sin.h5.dmrpp.baseline | 22 +++++++++---------- .../missing_data_url_dmrpp.baseline | 4 ++-- .../missing_dmrpp.baseline | 4 ++-- .../missing_group_dmrpp.baseline | 8 +++---- .../missing_group_dmrpp_comp.baseline | 16 +++++++------- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/modules/dmrpp_module/get_dmrpp/unit-tests/grid_1_2d.h5.dmrpp.baseline b/modules/dmrpp_module/get_dmrpp/unit-tests/grid_1_2d.h5.dmrpp.baseline index 6a66404752..78f8075981 100644 --- a/modules/dmrpp_module/get_dmrpp/unit-tests/grid_1_2d.h5.dmrpp.baseline +++ b/modules/dmrpp_module/get_dmrpp/unit-tests/grid_1_2d.h5.dmrpp.baseline @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@ 8 - + @@ -19,7 +19,7 @@ 4 - + @@ -70,7 +70,7 @@ - 2025-11-11T13:44:29Z + 2026-04-29T17:58:18Z 3.21.1 @@ -82,7 +82,7 @@ libdap-3.21.1 - build_dmrpp -f /Users/myang6/work/opendap/hyrax-1913-test/bes/modules/dmrpp_module/get_dmrpp/unit-tests/grid_1_2d.h5 -r grid_1_2d.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M + build_dmrpp -f /home/rocky/kent/hyrax-2121-test/bes/modules/dmrpp_module/get_dmrpp/unit-tests/grid_1_2d.h5 -r grid_1_2d.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M diff --git a/modules/dmrpp_module/get_dmrpp/unit-tests/grid_2_2d_sin.h5.dmrpp.baseline b/modules/dmrpp_module/get_dmrpp/unit-tests/grid_2_2d_sin.h5.dmrpp.baseline index 2f7d45a7c6..41ee552a4a 100644 --- a/modules/dmrpp_module/get_dmrpp/unit-tests/grid_2_2d_sin.h5.dmrpp.baseline +++ b/modules/dmrpp_module/get_dmrpp/unit-tests/grid_2_2d_sin.h5.dmrpp.baseline @@ -1,8 +1,8 @@ - + - 2026-03-26T14:41:34Z + 2026-04-29T18:03:20Z 3.21.1 @@ -14,7 +14,7 @@ libdap-3.21.1 - build_dmrpp -f /Users/myang6/work/opendap/hyrax-2043/bes/modules/dmrpp_module/get_dmrpp/unit-tests/grid_2_2d_sin.h5 -r grid_2_2d_sin.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M + build_dmrpp -f /home/rocky/kent/hyrax-2121-test/bes/modules/dmrpp_module/get_dmrpp/unit-tests/grid_2_2d_sin.h5 -r grid_2_2d_sin.h5.dmr -u OPeNDAP_DMRpp_DATA_ACCESS_URL -M @@ -56,7 +56,7 @@ 2 - + @@ -75,7 +75,7 @@ 2 - + @@ -86,7 +86,7 @@ 2 2 - + @@ -97,7 +97,7 @@ 2 2 - + @@ -156,7 +156,7 @@ 4 - + @@ -175,7 +175,7 @@ 4 - + @@ -186,7 +186,7 @@ 4 4 - + @@ -197,7 +197,7 @@ 4 4 - + diff --git a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_data_url_dmrpp.baseline b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_data_url_dmrpp.baseline index ac70ca067b..9a71d64f6d 100644 --- a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_data_url_dmrpp.baseline +++ b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_data_url_dmrpp.baseline @@ -9,7 +9,7 @@ 8 - + @@ -19,7 +19,7 @@ 4 - + diff --git a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_dmrpp.baseline b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_dmrpp.baseline index eded97eca8..d157565ea2 100644 --- a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_dmrpp.baseline +++ b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_dmrpp.baseline @@ -9,7 +9,7 @@ 8 - + @@ -19,7 +19,7 @@ 4 - + diff --git a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp.baseline b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp.baseline index 9dcf2299e5..21ce609e2b 100644 --- a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp.baseline +++ b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp.baseline @@ -52,7 +52,7 @@ H5.EnableCheckNameClashing=true 8 - + @@ -62,7 +62,7 @@ H5.EnableCheckNameClashing=true 16 - + @@ -91,7 +91,7 @@ H5.EnableCheckNameClashing=true 4 - + @@ -101,7 +101,7 @@ H5.EnableCheckNameClashing=true 8 - + diff --git a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp_comp.baseline b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp_comp.baseline index 199726dfc2..2d564afa10 100644 --- a/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp_comp.baseline +++ b/modules/dmrpp_module/tests_build_dmrpp/get_dmrpp_baselines/missing_group_dmrpp_comp.baseline @@ -76,7 +76,7 @@ H5.EnableCheckNameClashing=true 2 - + @@ -95,7 +95,7 @@ H5.EnableCheckNameClashing=true 2 - + @@ -106,7 +106,7 @@ H5.EnableCheckNameClashing=true 2 2 - + @@ -117,7 +117,7 @@ H5.EnableCheckNameClashing=true 2 2 - + @@ -176,7 +176,7 @@ H5.EnableCheckNameClashing=true 4 - + @@ -195,7 +195,7 @@ H5.EnableCheckNameClashing=true 4 - + @@ -206,7 +206,7 @@ H5.EnableCheckNameClashing=true 4 4 - + @@ -217,7 +217,7 @@ H5.EnableCheckNameClashing=true 4 4 - + From 9956c09e45b3159c834f166a0a5f3e09a19be1ad Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Thu, 30 Apr 2026 14:12:06 +0000 Subject: [PATCH 02/14] HYRAX-2121-test-deploy: Just trigger the travis build. --- modules/hdf5_handler/README | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/hdf5_handler/README b/modules/hdf5_handler/README index 121098d6e3..44470b13d3 100644 --- a/modules/hdf5_handler/README +++ b/modules/hdf5_handler/README @@ -4,6 +4,7 @@ see the INSTALL. For comprehensive information about the HDF5 handler, check https://github.com/OPENDAP/hyrax_guide/blob/master/handlers/BES_Modules_The_HDF5_Handler.adoc and https://hdfeos.org/software/hdf5_handler.php +We are in the process of using the HDF5 2.1.1. What's new for Hyrax 1.16.9 1. CF option From 078df7e07a34a78d7ca0f7cf3d37269240f9b792 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Tue, 12 May 2026 12:58:04 -0600 Subject: [PATCH 03/14] rpath is now correctly used in the dmrpp module --- modules/dmrpp_module/Makefile.am | 6 +++--- modules/dmrpp_module/build_dmrpp_h4/Makefile.am | 5 +---- modules/dmrpp_module/dmrpp_transmitter/Makefile.am | 3 ++- modules/dmrpp_module/ngap_container/Makefile.am | 3 --- modules/dmrpp_module/ngap_container/unit-tests/Makefile.am | 2 -- modules/dmrpp_module/unit-tests/Makefile.am | 3 --- 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/modules/dmrpp_module/Makefile.am b/modules/dmrpp_module/Makefile.am index b2cdb9aa8e..1986997421 100644 --- a/modules/dmrpp_module/Makefile.am +++ b/modules/dmrpp_module/Makefile.am @@ -22,7 +22,7 @@ AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" # the --disable-shared is not required, but it seems to help with debuggers. CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align -AM_LDFLAGS = +# Do not initialize AM_LDFLAGS here; configure may set dependency rpath flags. include $(top_srcdir)/coverage.mk SUBDIRS = ngap_container dmrpp_transmitter build_dmrpp_h4 . unit-tests tests data tests_build_dmrpp get_dmrpp @@ -49,7 +49,7 @@ vlsa_util.h float_byteswap.h DMRPP_MODULE = DmrppModule.cc DmrppRequestHandler.cc DmrppModule.h DmrppRequestHandler.h libdmrpp_module_la_SOURCES = $(BES_HDRS) $(BES_SRCS) $(DMRPP_MODULE) -libdmrpp_module_la_LDFLAGS = -avoid-version -module +libdmrpp_module_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -module libdmrpp_module_la_LIBADD = -L$(builddir)/ngap_container -lngap $(BES_DISPATCH_LIB) \ $(BES_HTTP_LIB) $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) \ $(H5_LDFLAGS) $(H5_LIBS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) -ltest-types \ @@ -68,7 +68,7 @@ h5common.h: Makefile build_dmrpp_CPPFLAGS = $(AM_CPPFLAGS) $(H5_CPPFLAGS) -I$(top_srcdir)/modules/hdf5_handler build_dmrpp_SOURCES = $(BES_SRCS) $(BES_HDRS) DmrppRequestHandler.cc DmrppRequestHandler.h \ build_dmrpp.cc build_dmrpp_util.cc build_dmrpp_util.h h5common.cc h5common.h -build_dmrpp_LDFLAGS = $(top_builddir)/dap/.libs/libdap_module.a +build_dmrpp_LDFLAGS = $(AM_LDFLAGS) $(top_builddir)/dap/.libs/libdap_module.a build_dmrpp_LDADD = $(BES_DISPATCH_LIB) $(BES_HTTP_LIB) -L$(builddir)/ngap_container -lngap \ $(H5_LDFLAGS) $(H5_LIBS) $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) \ $(XML2_LIBS) $(BYTESWAP_LIBS) -lz diff --git a/modules/dmrpp_module/build_dmrpp_h4/Makefile.am b/modules/dmrpp_module/build_dmrpp_h4/Makefile.am index 5cc1ccc21e..c8da39d4f3 100644 --- a/modules/dmrpp_module/build_dmrpp_h4/Makefile.am +++ b/modules/dmrpp_module/build_dmrpp_h4/Makefile.am @@ -19,7 +19,6 @@ AM_CPPFLAGS = $(HDF4_CFLAGS) $(HDFEOS2_CPPFLAGS) -I$(top_srcdir) -I$(top_srcdir) AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" AM_CXXFLAGS= -AM_LDFLAGS = include $(top_srcdir)/coverage.mk bin_PROGRAMS = build_dmrpp_h4 @@ -39,7 +38,7 @@ HDR = build_dmrpp_util_h4.h ../Chunk.h ../DMRpp.h ../DMZ.h ../DmrppArray.h ../Dm ../DmrppRequestHandler.h ../CurlHandlePool.h ../vlsa_util.h ../byteswap_compat.h ../float_byteswap.h build_dmrpp_h4_CPPFLAGS = $(AM_CPPFLAGS) -build_dmrpp_h4_LDFLAGS = $(HDFEOS2_LDFLAGS) $(HDF4_LDFLAGS) $(BES_DAP_LIB_LDFLAGS) +build_dmrpp_h4_LDFLAGS = $(AM_LDFLAGS) $(HDFEOS2_LDFLAGS) $(HDF4_LDFLAGS) $(BES_DAP_LIB_LDFLAGS) build_dmrpp_h4_LDADD = $(BES_DISPATCH_LIB) $(BES_HTTP_LIB) -L$(builddir)/../ngap_container -lngap \ $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) $(XML2_LIBS) \ $(BYTESWAP_LIBS) $(HDFEOS2_LIBS) $(HDF4_LIBS) @@ -58,5 +57,3 @@ C4_DIR=./cccc .PHONY: cccc cccc: cccc --outdir=$(C4_DIR) $(CMR_SRC) $(CMR_HDR) - - diff --git a/modules/dmrpp_module/dmrpp_transmitter/Makefile.am b/modules/dmrpp_module/dmrpp_transmitter/Makefile.am index 0bbec6fc7e..ba28909cd1 100644 --- a/modules/dmrpp_module/dmrpp_transmitter/Makefile.am +++ b/modules/dmrpp_module/dmrpp_transmitter/Makefile.am @@ -8,7 +8,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/dap -I$(top_srcdir)/dispatch -I$(top_srcdir)/http -I$(top_srcdir)/modules/dmrpp_module/ngap_container AM_CXXFLAGS = -AM_LDFLAGS = $(DMRPP_LDFLAGS) +# Preserve configure-provided dependency rpath flags, then add DMR++ flags. +AM_LDFLAGS += $(DMRPP_LDFLAGS) LIBADD = $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) if COMPILER_IS_GCC diff --git a/modules/dmrpp_module/ngap_container/Makefile.am b/modules/dmrpp_module/ngap_container/Makefile.am index ecd6d3c059..3214728485 100644 --- a/modules/dmrpp_module/ngap_container/Makefile.am +++ b/modules/dmrpp_module/ngap_container/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/dispatch -I$(top_srcdir)/dap -I$(t LIBADD = AM_CXXFLAGS= -AM_LDFLAGS = include $(top_srcdir)/coverage.mk SUBDIRS = . unit-tests @@ -41,5 +40,3 @@ C4_DIR=./cccc .PHONY: cccc cccc: cccc --outdir=$(C4_DIR) $(NGAP_SRC) $(NGAP_HDR) - - diff --git a/modules/dmrpp_module/ngap_container/unit-tests/Makefile.am b/modules/dmrpp_module/ngap_container/unit-tests/Makefile.am index 29673eed03..9a92971616 100644 --- a/modules/dmrpp_module/ngap_container/unit-tests/Makefile.am +++ b/modules/dmrpp_module/ngap_container/unit-tests/Makefile.am @@ -22,7 +22,6 @@ endif CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align -Werror AM_CXXFLAGS= -AM_LDFLAGS = include $(top_srcdir)/coverage.mk DISTCLEANFILES = test_config.h *.Po @@ -107,4 +106,3 @@ NgapApiTest_LDADD = $(LIBADD) NgapOwnedContainerTest_SOURCES = NgapOwnedContainerTest.cc NgapOwnedContainerTest_LDADD = $(LIBADD) - diff --git a/modules/dmrpp_module/unit-tests/Makefile.am b/modules/dmrpp_module/unit-tests/Makefile.am index b9cad3c4af..0a4c81aa32 100644 --- a/modules/dmrpp_module/unit-tests/Makefile.am +++ b/modules/dmrpp_module/unit-tests/Makefile.am @@ -29,7 +29,6 @@ endif CXXFLAGS_DEBUG = -g3 -O0 -Wall -Wcast-align AM_CXXFLAGS = -Wno-vla-extension -Wno-inconsistent-missing-override -Wno-unused-variable -AM_LDFLAGS = include $(top_srcdir)/coverage.mk # This determines what gets built by make check @@ -129,5 +128,3 @@ build_dmrpp_util_test_LDADD = $(H5_LDFLAGS) $(H5_LIBS) ../.libs/libdmrpp_module. vlsa_util_test_SOURCES = vlsa_util_test.cc vlsa_util_test_LDADD = ../.libs/libdmrpp_module.a $(LIBADD) - - From fe168f46ead9406c80afb5910a3c57cb5cdd4033 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Wed, 13 May 2026 12:23:39 -0600 Subject: [PATCH 04/14] Potential fix for HDF5 2.1 distcheck failure --- modules/dmrpp_module/Makefile.am | 2 +- modules/hdf5_handler/Makefile.am | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/dmrpp_module/Makefile.am b/modules/dmrpp_module/Makefile.am index 1986997421..5698688c92 100644 --- a/modules/dmrpp_module/Makefile.am +++ b/modules/dmrpp_module/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I conf AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/dispatch -I$(top_srcdir)/dap -I$(top_srcdir)/xmlcommand \ -I$(top_srcdir)/http -I$(top_srcdir)/modules/dmrpp_module/ngap_container -I$(top_srcdir)/pugixml/src $(DAP_CFLAGS) -AM_CXXFLAGS = -Wno-vla-extension -Wno-inconsistent-missing-override +AM_CXXFLAGS = $(CXXFLAGS) -Wno-vla-extension -Wno-inconsistent-missing-override AM_CPPFLAGS += $(OPENSSL_INC) diff --git a/modules/hdf5_handler/Makefile.am b/modules/hdf5_handler/Makefile.am index f364daf495..642044c482 100644 --- a/modules/hdf5_handler/Makefile.am +++ b/modules/hdf5_handler/Makefile.am @@ -30,8 +30,7 @@ AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" BUILT_SOURCES = $(GRAM_SRCS) -AM_CXXFLAGS= -AM_LDFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) include $(top_srcdir)/coverage.mk SUBDIRS = gctp . bes-testsuite From 68070f654251a42774bf971c6ed20b2ae5f63278 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Wed, 13 May 2026 15:39:35 -0600 Subject: [PATCH 05/14] Isolate EL builds - do they work --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 355b83e272..6d9bc29fe9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -142,7 +142,7 @@ stages: jobs: include: - - stage: build-and-test + - stage: never #build-and-test name: "check" script: - export BES_BUILD=main @@ -153,7 +153,7 @@ jobs: - echo "LD_LIBRARY_PATH - $LD_LIBRARY_PATH" >&2 - make -j16 && make install && besctl start && make check -j16 && besctl stop - - stage: build-and-test + - stage: never #build-and-test name: "distcheck" script: - export BES_BUILD=distcheck @@ -161,7 +161,7 @@ jobs: - ./configure $CONFIGURE_OPTIONS --disable-dependency-tracking --prefix=$prefix --with-dependencies=$prefix/deps --enable-developer - make distcheck -j16 GZIP_ENV=--fast - - stage: build-and-test + - stage: never # build-and-test name: "dist" script: - export BES_BUILD=srcdist From e7ffe68e7bd5fd8c230a66c51253811c11003dfd Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Thu, 14 May 2026 13:30:25 -0600 Subject: [PATCH 06/14] Correctly escape '$ORIGIN' in configure.ac (use \$\$ORIGIN) --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 99b94671de..45f58cf89a 100644 --- a/configure.ac +++ b/configure.ac @@ -564,7 +564,7 @@ AS_IF([test -n "$deps_libdir"], [AM_LDFLAGS="$AM_LDFLAGS -Wl,-rpath,$deps_libdir" AS_IF([test -n "$deps_libdir64"], [AM_LDFLAGS="$AM_LDFLAGS -Wl,-rpath,$deps_libdir64"]) - AM_LDFLAGS="$AM_LDFLAGS -Wl,-rpath,'\$ORIGIN'"]) + AM_LDFLAGS="$AM_LDFLAGS -Wl,-rpath,'\$\$ORIGIN'"]) AC_MSG_NOTICE([Set Automake linker flags to $AM_LDFLAGS]) AC_SUBST([AM_LDFLAGS])]) @@ -830,7 +830,7 @@ AS_IF([test -n "$with_gdal_prefix" -a $with_gdal_prefix = no], # Add the OS-specific shared linker syntax for the rpath option. jhrg 4/10/26 AM_COND_IF([DARWIN], [GDAL_LDFLAGS="$GDAL_LDFLAGS -Wl,-rpath,@loader_path"], - [GDAL_LDFLAGS="$GDAL_LDFLAGS -Wl,-rpath,'\$ORIGIN'"]) + [GDAL_LDFLAGS="$GDAL_LDFLAGS -Wl,-rpath,'\$\$ORIGIN'"]) # The newer versions of gdal-config have a --dep-libs option that includes # the libs of the dependencies. We need to use that to get the proj library, From 9ac35caa52613e46426017e753b3b012a182c944 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Thu, 14 May 2026 14:24:50 -0600 Subject: [PATCH 07/14] Turn on the full build --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d9bc29fe9..355b83e272 100644 --- a/.travis.yml +++ b/.travis.yml @@ -142,7 +142,7 @@ stages: jobs: include: - - stage: never #build-and-test + - stage: build-and-test name: "check" script: - export BES_BUILD=main @@ -153,7 +153,7 @@ jobs: - echo "LD_LIBRARY_PATH - $LD_LIBRARY_PATH" >&2 - make -j16 && make install && besctl start && make check -j16 && besctl stop - - stage: never #build-and-test + - stage: build-and-test name: "distcheck" script: - export BES_BUILD=distcheck @@ -161,7 +161,7 @@ jobs: - ./configure $CONFIGURE_OPTIONS --disable-dependency-tracking --prefix=$prefix --with-dependencies=$prefix/deps --enable-developer - make distcheck -j16 GZIP_ENV=--fast - - stage: never # build-and-test + - stage: build-and-test name: "dist" script: - export BES_BUILD=srcdist From b1c97449bdcf81c76530f989cc6a193229ca55b0 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Thu, 14 May 2026 15:30:10 -0600 Subject: [PATCH 08/14] Add $(AM_LDFLAGS) to module LDFLAGS to pickup rpath switches --- modules/hdf5_handler/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hdf5_handler/Makefile.am b/modules/hdf5_handler/Makefile.am index 642044c482..f4bafdb8fe 100644 --- a/modules/hdf5_handler/Makefile.am +++ b/modules/hdf5_handler/Makefile.am @@ -76,7 +76,7 @@ SERVER_HDR = HDF5RequestHandler.h HDF5Module.h HDF5_DDS.h HDF5_DMR.h HDF5_DataMe libhdf5_module_la_SOURCES = $(HDF5DTYPE_SRCS) $(HDF5_SRCS) $(HDF5CFDTYPE_SRCS) $(HDF5CF_SRCS) $(SERVER_SRC) $(HDF5CFDTYPE_HDRS) $(HDF5CF_HDRS) $(HDF5DTYPE_HDRS) $(HDF5_HDRS) $(SERVER_HDR) # libhdf5_module_la_CPPFLAGS = $(BES_CPPFLAGS) -libhdf5_module_la_LDFLAGS = -avoid-version -module +libhdf5_module_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -module libhdf5_module_la_LIBADD = $(LIBADD) EXTRA_DIST = he5das.yy he5dds.yy he5das.lex he5dds.lex OSX_Resources \ From 07b6463dc32fd26b7107ca87e50dbea5f13aa153 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Thu, 14 May 2026 15:51:22 -0600 Subject: [PATCH 09/14] Trigger a new BES travis build --- modules/hdf5_handler/README | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/hdf5_handler/README b/modules/hdf5_handler/README index 44470b13d3..8e7eeb7c74 100644 --- a/modules/hdf5_handler/README +++ b/modules/hdf5_handler/README @@ -1,3 +1,4 @@ + This file describes the HDF5 handler developed by The HDF Group and OPeNDAP, Inc. under a grant from NASA. For information about building the HDF5 handler, see the INSTALL. For comprehensive information about the HDF5 handler, check From f1926096ae07f62ae086ff3246b24cda849f3e64 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Fri, 15 May 2026 14:22:14 -0600 Subject: [PATCH 10/14] Fix the linkage of the fileout_netcdf module --- modules/fileout_netcdf/Makefile.am | 5 ++--- modules/functions/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/fileout_netcdf/Makefile.am b/modules/fileout_netcdf/Makefile.am index f8aa9dda9a..ed55788c26 100644 --- a/modules/fileout_netcdf/Makefile.am +++ b/modules/fileout_netcdf/Makefile.am @@ -18,8 +18,7 @@ LIBADD = $(NC_LDFLAGS) $(NC_LIBS) $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" -AM_CXXFLAGS = -Wno-inconsistent-missing-override -AM_LDFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) -Wno-inconsistent-missing-override include $(top_srcdir)/coverage.mk SUBDIRS = . data/build_test_data unit-tests tests @@ -29,7 +28,7 @@ lib_bes_LTLIBRARIES = libfonc_module.la libfonc_module_la_SOURCES = $(FONC_SRC) $(FONC_HDR) # libfonc_module_la_CPPFLAGS = $(BES_CPPFLAGS) -libfonc_module_la_LDFLAGS = -avoid-version -module +libfonc_module_la_LDFLAGS = $(AM_LDFLAGS)-avoid-version -module libfonc_module_la_LIBADD = $(LIBADD) FONC_SRC = FONcTransform.cc FONcTransmitter.cc FONcRequestHandler.cc \ diff --git a/modules/functions/Makefile.am b/modules/functions/Makefile.am index ffa62dd061..f200b954b7 100644 --- a/modules/functions/Makefile.am +++ b/modules/functions/Makefile.am @@ -20,7 +20,7 @@ CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align -Wno-deprecated # Do not initialize AM_LDFLAGS here so that this code builds using the # -rpath linker options set by configure. jhrg 1/23/26 -AM_CXXFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) include $(top_srcdir)/coverage.mk if BES_DEVELOPER From c03988e140dc60280b9b502a3a856cc863ba3c14 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Fri, 15 May 2026 15:56:04 -0600 Subject: [PATCH 11/14] Fix the Stare function build This is the AM_LDFLAGS fix in YABM (yet another broken Makefile) --- modules/functions/stare/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/functions/stare/Makefile.am b/modules/functions/stare/Makefile.am index 53f4877c49..d651053ce8 100644 --- a/modules/functions/stare/Makefile.am +++ b/modules/functions/stare/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS = $(DAP_CFLAGS) -I$(top_srcdir)/modules/functions/stare -I$(top_srcd -I$(STARE_INC) -I$(prefix)/deps/include $(NC_CPPFLAGS) # Added -Wno-deprecated to suppress warnings about auto_ptr<>. jhrg 11/7/19 -AM_CXXFLAGS = -Wno-deprecated -Wno-vla-extension -Wno-c++14-extensions +AM_CXXFLAGS = $(CXXFLAGS) -Wno-deprecated -Wno-vla-extension -Wno-c++14-extensions # AM_LDADD = $(DAP_CLIENT_LIBS) -L$(abs_top_builddir)/dispatch -lbes_dispatch $(H5_LDFLAGS) $(H5_LIBS) \ # $(STARE_LDFLAGS) $(STARE_LIBS) $(NC_LDFLAGS) $(NC_LIBS) @@ -21,7 +21,6 @@ endif # debugging. Set CXXFLAGS to this in the nightly build using export ... CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align -AM_LDFLAGS = include $(top_srcdir)/coverage.mk # Old programs used at the start of the STARE project. jhrg 8/20/20 From c0d4e25328dcf061e376b9f8ecb36378af1b4bc0 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Fri, 15 May 2026 16:24:09 -0600 Subject: [PATCH 12/14] Fixed functions/stare/unit-tests' Makefile --- modules/functions/stare/unit-tests/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/functions/stare/unit-tests/Makefile.am b/modules/functions/stare/unit-tests/Makefile.am index 2cd67e1902..b474b824b8 100644 --- a/modules/functions/stare/unit-tests/Makefile.am +++ b/modules/functions/stare/unit-tests/Makefile.am @@ -24,8 +24,7 @@ endif # debugging. Set CXXFLAGS to this in the nightly build using export ... CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align -AM_CXXFLAGS= -AM_LDFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) include $(top_srcdir)/coverage.mk BUILT_SOURCES = test_config.h bes.conf From 36f2a16355889a27f282697e8eaae17893525223 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Fri, 15 May 2026 16:47:23 -0600 Subject: [PATCH 13/14] Feed up with hamfisted AM_LDFLAGS lines, I fixed them all... --- modules/asciival/Makefile.am | 2 +- modules/asciival/tests/Makefile.am | 2 +- modules/asciival/unit-tests/Makefile.am | 2 +- modules/cmr_module/Makefile.am | 2 +- modules/cmr_module/unit-tests/Makefile.am | 2 +- modules/csv_handler/Makefile.am | 2 +- modules/csv_handler/tests/Makefile.am | 2 +- modules/debug_functions/Makefile.am | 2 +- modules/debug_functions/unit-tests/Makefile.am | 2 +- modules/dmrpp_module/dmrpp_transmitter/Makefile.am | 2 +- modules/fileout_covjson/Makefile.am | 2 +- modules/fileout_covjson/unit-tests/Makefile.am | 2 +- modules/fileout_json/Makefile.am | 2 +- modules/fileout_json/unit-tests/Makefile.am | 2 +- modules/fileout_netcdf/unit-tests/Makefile.am | 2 +- modules/fits_handler/Makefile.am | 2 +- modules/freeform_handler/FFND/Makefile.am | 2 +- modules/freeform_handler/Makefile.am | 2 +- modules/functions/unit-tests/Makefile.am | 2 +- modules/gateway_module/Makefile.am | 2 +- modules/gateway_module/tests/Makefile.am | 2 +- modules/gdal_module/Makefile.am | 2 +- modules/gdal_module/reader/Makefile.am | 2 +- modules/gdal_module/writer/Makefile.am | 2 +- modules/hdf4_handler/Makefile.am | 2 +- modules/hdf5_handler/bes-testsuite/Makefile.am | 2 +- modules/hdf5_handler/gctp/src/Makefile.am | 2 +- modules/httpd_catalog_module/Makefile.am | 2 +- modules/httpd_catalog_module/unit-tests/Makefile.am | 2 +- modules/ncml_module/Makefile.am | 2 +- modules/netcdf_handler/Makefile.am | 2 +- modules/netcdf_handler/tests/Makefile.am | 2 +- modules/s3_reader/Makefile.am | 2 +- modules/s3_reader/tests/Makefile.am | 2 +- modules/s3_reader/unit-tests/Makefile.am | 2 +- modules/ugrid_functions/Makefile.am | 2 +- modules/ugrid_functions/tests/Makefile.am | 2 +- modules/ugrid_functions/unit-tests/Makefile.am | 2 +- modules/usage/Makefile.am | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/modules/asciival/Makefile.am b/modules/asciival/Makefile.am index 77caa403ff..df84944676 100644 --- a/modules/asciival/Makefile.am +++ b/modules/asciival/Makefile.am @@ -21,7 +21,7 @@ AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" CXXFLAGS_DEBUG = -g3 -O0 -Wall AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = . unit-tests tests diff --git a/modules/asciival/tests/Makefile.am b/modules/asciival/tests/Makefile.am index 3ea71b5f26..5d55635729 100644 --- a/modules/asciival/tests/Makefile.am +++ b/modules/asciival/tests/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -I$(top_srcdir) -AM_CXXFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) # These are not used by automake but are often useful for certain types of # debugging. The best way to use these is to run configure as: diff --git a/modules/asciival/unit-tests/Makefile.am b/modules/asciival/unit-tests/Makefile.am index bbc212a90c..50dc0d8c43 100644 --- a/modules/asciival/unit-tests/Makefile.am +++ b/modules/asciival/unit-tests/Makefile.am @@ -21,7 +21,7 @@ endif # debugging. Set CXXFLAGS to this in the nightly build using export ... CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align -Werror -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk # This header file is used for parse files diff --git a/modules/cmr_module/Makefile.am b/modules/cmr_module/Makefile.am index 4ae97261ae..3d6e24a7d1 100644 --- a/modules/cmr_module/Makefile.am +++ b/modules/cmr_module/Makefile.am @@ -17,7 +17,7 @@ LIBADD = $(BES_DISPATCH_LIB) $(BES_HTTP_LIB) $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIB AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = . diff --git a/modules/cmr_module/unit-tests/Makefile.am b/modules/cmr_module/unit-tests/Makefile.am index 4e2faaea6b..110957fcc7 100644 --- a/modules/cmr_module/unit-tests/Makefile.am +++ b/modules/cmr_module/unit-tests/Makefile.am @@ -21,7 +21,7 @@ endif CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align -Werror AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk DISTCLEANFILES = test_config.h *.Po diff --git a/modules/csv_handler/Makefile.am b/modules/csv_handler/Makefile.am index 9d6f5a212c..2a5327f0b3 100644 --- a/modules/csv_handler/Makefile.am +++ b/modules/csv_handler/Makefile.am @@ -21,7 +21,7 @@ lib_besdir=$(libdir)/bes lib_bes_LTLIBRARIES = libcsv_module.la AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = . tests diff --git a/modules/csv_handler/tests/Makefile.am b/modules/csv_handler/tests/Makefile.am index e46c0a5570..9e1e33824a 100644 --- a/modules/csv_handler/tests/Makefile.am +++ b/modules/csv_handler/tests/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -I$(top_srcdir) -AM_CXXFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) # These are not used by automake but are often useful for certain types of # debugging. The best way to use these is to run configure as: diff --git a/modules/debug_functions/Makefile.am b/modules/debug_functions/Makefile.am index 8bfa90588b..a369216883 100644 --- a/modules/debug_functions/Makefile.am +++ b/modules/debug_functions/Makefile.am @@ -18,7 +18,7 @@ LIBADD = $(GF_LIBS) $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) $(BES_HTTP_LIB) CXXFLAGS_DEBUG = -g3 -O0 -Wall -Wcast-align AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = . unit-tests tests diff --git a/modules/debug_functions/unit-tests/Makefile.am b/modules/debug_functions/unit-tests/Makefile.am index 1a7731ed11..12831c612b 100644 --- a/modules/debug_functions/unit-tests/Makefile.am +++ b/modules/debug_functions/unit-tests/Makefile.am @@ -24,7 +24,7 @@ endif CXXFLAGS_DEBUG = -g3 -O0 -Wall -Wcast-align AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk # This determines what gets built by make check diff --git a/modules/dmrpp_module/dmrpp_transmitter/Makefile.am b/modules/dmrpp_module/dmrpp_transmitter/Makefile.am index ba28909cd1..f173b33a05 100644 --- a/modules/dmrpp_module/dmrpp_transmitter/Makefile.am +++ b/modules/dmrpp_module/dmrpp_transmitter/Makefile.am @@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects AM_CPPFLAGS = -I$(top_srcdir)/dap -I$(top_srcdir)/dispatch -I$(top_srcdir)/http \ -I$(top_srcdir)/modules/dmrpp_module/ngap_container -AM_CXXFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) # Preserve configure-provided dependency rpath flags, then add DMR++ flags. AM_LDFLAGS += $(DMRPP_LDFLAGS) LIBADD = $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) diff --git a/modules/fileout_covjson/Makefile.am b/modules/fileout_covjson/Makefile.am index 65a6aa3c2f..bf9c19799c 100644 --- a/modules/fileout_covjson/Makefile.am +++ b/modules/fileout_covjson/Makefile.am @@ -19,7 +19,7 @@ AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" AM_CPPFLAGS += -Wno-vla-extension AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = . unit-tests tests diff --git a/modules/fileout_covjson/unit-tests/Makefile.am b/modules/fileout_covjson/unit-tests/Makefile.am index 7a7be6dfe9..0a64009a2d 100644 --- a/modules/fileout_covjson/unit-tests/Makefile.am +++ b/modules/fileout_covjson/unit-tests/Makefile.am @@ -18,7 +18,7 @@ endif CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align -Werror AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk DISTCLEANFILES = test_config.h *.Po diff --git a/modules/fileout_json/Makefile.am b/modules/fileout_json/Makefile.am index 53628ee89c..9c4abce6d2 100644 --- a/modules/fileout_json/Makefile.am +++ b/modules/fileout_json/Makefile.am @@ -18,7 +18,7 @@ LIBADD = $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = . unit-tests tests diff --git a/modules/fileout_json/unit-tests/Makefile.am b/modules/fileout_json/unit-tests/Makefile.am index ca4fa38cad..57ebc897b5 100644 --- a/modules/fileout_json/unit-tests/Makefile.am +++ b/modules/fileout_json/unit-tests/Makefile.am @@ -18,7 +18,7 @@ endif CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align -Werror AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk DISTCLEANFILES = test_config.h *.Po diff --git a/modules/fileout_netcdf/unit-tests/Makefile.am b/modules/fileout_netcdf/unit-tests/Makefile.am index b4b095eeee..f0b0ec5cb5 100644 --- a/modules/fileout_netcdf/unit-tests/Makefile.am +++ b/modules/fileout_netcdf/unit-tests/Makefile.am @@ -18,7 +18,7 @@ endif CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align -Werror AM_CXXFLAGS = -Wno-inconsistent-missing-override -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk DISTCLEANFILES = test_config.h *.Po diff --git a/modules/fits_handler/Makefile.am b/modules/fits_handler/Makefile.am index 54d2f76152..e6d78c9e4f 100644 --- a/modules/fits_handler/Makefile.am +++ b/modules/fits_handler/Makefile.am @@ -19,7 +19,7 @@ LIBADD = $(CFITS_LDFLAGS) $(CFITS_LIBS) $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = . tests diff --git a/modules/freeform_handler/FFND/Makefile.am b/modules/freeform_handler/FFND/Makefile.am index 617f2b7d85..8d0d7ee038 100644 --- a/modules/freeform_handler/FFND/Makefile.am +++ b/modules/freeform_handler/FFND/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS = -DFREEFORM $(FF_CPPFLAGS) CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align -Werror AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk noinst_LTLIBRARIES = libfreeform.la diff --git a/modules/freeform_handler/Makefile.am b/modules/freeform_handler/Makefile.am index cd348e9f75..347e9b11ed 100644 --- a/modules/freeform_handler/Makefile.am +++ b/modules/freeform_handler/Makefile.am @@ -23,7 +23,7 @@ LIBADD = $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) FFND/libfreeform.la AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk lib_besdir=$(libdir)/bes diff --git a/modules/functions/unit-tests/Makefile.am b/modules/functions/unit-tests/Makefile.am index c037681070..f96e7522ff 100644 --- a/modules/functions/unit-tests/Makefile.am +++ b/modules/functions/unit-tests/Makefile.am @@ -26,7 +26,7 @@ endif CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk # This determines what gets built by make check diff --git a/modules/gateway_module/Makefile.am b/modules/gateway_module/Makefile.am index 791a492c0c..5682582024 100644 --- a/modules/gateway_module/Makefile.am +++ b/modules/gateway_module/Makefile.am @@ -20,7 +20,7 @@ LIBADD = $(BES_DISPATCH_LIB) $(BES_HTTP_LIB) $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIB AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = . tests diff --git a/modules/gateway_module/tests/Makefile.am b/modules/gateway_module/tests/Makefile.am index fdba81bab8..b57c1fb02d 100644 --- a/modules/gateway_module/tests/Makefile.am +++ b/modules/gateway_module/tests/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -I$(top_srcdir) # AM_CPPFLAGS = -AM_CXXFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) # These are not used by automake but are often useful for certain types of # debugging. The best way to use these is to run configure as: diff --git a/modules/gdal_module/Makefile.am b/modules/gdal_module/Makefile.am index 20d8c39827..9bff787567 100644 --- a/modules/gdal_module/Makefile.am +++ b/modules/gdal_module/Makefile.am @@ -14,7 +14,7 @@ M_NAME=gdal_module M_VER=1.0.3 AM_CPPFLAGS = $(GDAL_CFLAGS) $(DAP_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/dap -I$(top_srcdir)/dispatch -AM_CXXFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) LIBADD = $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) -lgdal_reader -lgdal_writer AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" diff --git a/modules/gdal_module/reader/Makefile.am b/modules/gdal_module/reader/Makefile.am index c39e4ea7b4..cff0421231 100644 --- a/modules/gdal_module/reader/Makefile.am +++ b/modules/gdal_module/reader/Makefile.am @@ -10,7 +10,7 @@ AM_CPPFLAGS = $(GDAL_CFLAGS) $(DAP_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/dap - AM_LDFLAGS = $(GDAL_LDFLAGS) LIBADD = $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) -AM_CXXFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) if COMPILER_IS_GCC AM_CXXFLAGS += -Wall -W -Wcast-align diff --git a/modules/gdal_module/writer/Makefile.am b/modules/gdal_module/writer/Makefile.am index bee2b4850a..dac9b1c242 100644 --- a/modules/gdal_module/writer/Makefile.am +++ b/modules/gdal_module/writer/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = $(GDAL_CFLAGS) $(DAP_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/dap -I$(top_srcdir)/dispatch -AM_CXXFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) AM_LDFLAGS = $(GDAL_LDFLAGS) LIBADD = $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) diff --git a/modules/hdf4_handler/Makefile.am b/modules/hdf4_handler/Makefile.am index 8d34681024..446aca7bde 100644 --- a/modules/hdf4_handler/Makefile.am +++ b/modules/hdf4_handler/Makefile.am @@ -32,7 +32,7 @@ endif AM_CPPFLAGS += -DUSE_DAP4 -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" # jhrg 5/12/21 Note that this is defined above. AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = hdfclass . bes-testsuite diff --git a/modules/hdf5_handler/bes-testsuite/Makefile.am b/modules/hdf5_handler/bes-testsuite/Makefile.am index f3be483bca..2b11a83bf3 100644 --- a/modules/hdf5_handler/bes-testsuite/Makefile.am +++ b/modules/hdf5_handler/bes-testsuite/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -I$(top_srcdir) -AM_CXXFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) # These are not used by automake but are often useful for certain types of # debugging. The best way to use these is to run configure as: diff --git a/modules/hdf5_handler/gctp/src/Makefile.am b/modules/hdf5_handler/gctp/src/Makefile.am index 23d5c2d760..d3b1c52d40 100755 --- a/modules/hdf5_handler/gctp/src/Makefile.am +++ b/modules/hdf5_handler/gctp/src/Makefile.am @@ -12,7 +12,7 @@ AM_CPPFLAGS = -I$(srcdir)/../include/ AM_CFLAGS = -fpic -Wno-implicit-function-declaration AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk # Library source files diff --git a/modules/httpd_catalog_module/Makefile.am b/modules/httpd_catalog_module/Makefile.am index 6cce1538db..222bd0b31f 100644 --- a/modules/httpd_catalog_module/Makefile.am +++ b/modules/httpd_catalog_module/Makefile.am @@ -18,7 +18,7 @@ LIBADD = $(BES_DISPATCH_LIB) $(BES_HTTP_LIB) $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIB AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = . unit-tests tests diff --git a/modules/httpd_catalog_module/unit-tests/Makefile.am b/modules/httpd_catalog_module/unit-tests/Makefile.am index 5f9f7884cc..53f5679a8e 100644 --- a/modules/httpd_catalog_module/unit-tests/Makefile.am +++ b/modules/httpd_catalog_module/unit-tests/Makefile.am @@ -24,7 +24,7 @@ endif CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align -Werror AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk DISTCLEANFILES = test_config.h *.Po diff --git a/modules/ncml_module/Makefile.am b/modules/ncml_module/Makefile.am index 3e4b7c9174..4b3208b82b 100644 --- a/modules/ncml_module/Makefile.am +++ b/modules/ncml_module/Makefile.am @@ -23,7 +23,7 @@ lib_besdir=$(libdir)/bes lib_bes_LTLIBRARIES = libncml_module.la AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = . tests diff --git a/modules/netcdf_handler/Makefile.am b/modules/netcdf_handler/Makefile.am index 14f01f9a8a..33347746e9 100644 --- a/modules/netcdf_handler/Makefile.am +++ b/modules/netcdf_handler/Makefile.am @@ -19,7 +19,7 @@ LIBADD = $(NC_LDFLAGS) $(NC_LIBS) $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = . tests diff --git a/modules/netcdf_handler/tests/Makefile.am b/modules/netcdf_handler/tests/Makefile.am index 1bb5d46b04..1f21b535a6 100644 --- a/modules/netcdf_handler/tests/Makefile.am +++ b/modules/netcdf_handler/tests/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -AM_CXXFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) # These are not used by automake but are often useful for certain types of # debugging. The best way to use these is to run configure as: diff --git a/modules/s3_reader/Makefile.am b/modules/s3_reader/Makefile.am index ec0fd0a406..6058dce583 100644 --- a/modules/s3_reader/Makefile.am +++ b/modules/s3_reader/Makefile.am @@ -16,7 +16,7 @@ LIBADD = $(BES_DISPATCH_LIB) $(BES_HTTP_LIB) $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIB AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = . tests diff --git a/modules/s3_reader/tests/Makefile.am b/modules/s3_reader/tests/Makefile.am index ffebe13a94..370c8eb83b 100644 --- a/modules/s3_reader/tests/Makefile.am +++ b/modules/s3_reader/tests/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -I$(top_srcdir) -AM_CXXFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) BES_CONF_IN = bes.conf.in diff --git a/modules/s3_reader/unit-tests/Makefile.am b/modules/s3_reader/unit-tests/Makefile.am index c37ef7f199..4f39bafa75 100644 --- a/modules/s3_reader/unit-tests/Makefile.am +++ b/modules/s3_reader/unit-tests/Makefile.am @@ -17,7 +17,7 @@ endif CXXFLAGS_DEBUG = -g3 -O0 -Wall -W -Wcast-align -Werror AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk DISTCLEANFILES = test_config.h *.Po diff --git a/modules/ugrid_functions/Makefile.am b/modules/ugrid_functions/Makefile.am index 54f7abae05..efd4cf731f 100644 --- a/modules/ugrid_functions/Makefile.am +++ b/modules/ugrid_functions/Makefile.am @@ -18,7 +18,7 @@ LIBADD = $(GF_LIBS) $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) CXXFLAGS_DEBUG = -g3 -O0 -Wall -Wcast-align AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk SUBDIRS = . unit-tests tests diff --git a/modules/ugrid_functions/tests/Makefile.am b/modules/ugrid_functions/tests/Makefile.am index 17cf76da1e..807a678263 100644 --- a/modules/ugrid_functions/tests/Makefile.am +++ b/modules/ugrid_functions/tests/Makefile.am @@ -6,7 +6,7 @@ TESTS_ENVIRONMENT=valgrind --trace-children=yes --error-exitcode=1 --dsymutil=ye endif AM_CPPFLAGS = -I$(top_srcdir) -AM_CXXFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) # These are not used by automake but are often useful for certain types of # debugging. The best way to use these is to run configure as: diff --git a/modules/ugrid_functions/unit-tests/Makefile.am b/modules/ugrid_functions/unit-tests/Makefile.am index 63bd3df766..85018b7a91 100644 --- a/modules/ugrid_functions/unit-tests/Makefile.am +++ b/modules/ugrid_functions/unit-tests/Makefile.am @@ -28,7 +28,7 @@ endif CXXFLAGS_DEBUG = -g3 -O0 -Wall -Wcast-align AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk # This determines what gets built by make check diff --git a/modules/usage/Makefile.am b/modules/usage/Makefile.am index e8186fa374..7de54da558 100644 --- a/modules/usage/Makefile.am +++ b/modules/usage/Makefile.am @@ -18,7 +18,7 @@ LIBADD = $(DAP_SERVER_LIBS) $(DAP_CLIENT_LIBS) AM_CPPFLAGS += -DMODULE_NAME=\"$(M_NAME)\" -DMODULE_VERSION=\"$(M_VER)\" AM_CXXFLAGS= -AM_LDFLAGS = + include $(top_srcdir)/coverage.mk lib_besdir=$(libdir)/bes From 51e94345cb7cb94eb061175f126802c3dad9b471 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Fri, 15 May 2026 17:40:06 -0600 Subject: [PATCH 14/14] Fix Makefiles in aws --- aws/Makefile.am | 3 +-- aws/unit-tests/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/aws/Makefile.am b/aws/Makefile.am index 101c877912..3a76fd2833 100644 --- a/aws/Makefile.am +++ b/aws/Makefile.am @@ -13,8 +13,7 @@ if BES_DEVELOPER AM_CPPFLAGS += -DBES_DEVELOPER endif -AM_CXXFLAGS= -AM_LDFLAGS = +AM_CXXFLAGS = $(CXXFLAGS) include $(top_srcdir)/coverage.mk SUBDIRS = . unit-tests diff --git a/aws/unit-tests/Makefile.am b/aws/unit-tests/Makefile.am index afde77137d..26f5410d43 100644 --- a/aws/unit-tests/Makefile.am +++ b/aws/unit-tests/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = -I$(aws_prefix)/include -I$(top_srcdir) -I$(top_srcdir)/aws -I$(to # to, but before we had configure.ac set to include the the deps lib dir # we used special code just for the AWS library. I'll keep that for now. # jhrg 1/7/26 -AM_LDFLAGS = -L$(aws_libdir) +AM_LDFLAGS += -L$(aws_libdir) # This should be 'AM_LDADD' but for some reason the check_PROGRAMS variable doesn't work # like bin_PROGRAMS.