summaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorjhendersonHDF <jhenderson@hdfgroup.org>2023-07-27 19:11:28 (GMT)
committerGitHub <noreply@github.com>2023-07-27 19:11:28 (GMT)
commit17a5a1a37ccc851ca9123b2921fbae15c4814edf (patch)
treebdc30fe342f691bd8c0d2454a81a195b4d31cef9 /src/Makefile.am
parent144bec301c874554cdd8651148dede93fd5279dc (diff)
downloadhdf5-17a5a1a37ccc851ca9123b2921fbae15c4814edf.zip
hdf5-17a5a1a37ccc851ca9123b2921fbae15c4814edf.tar.gz
hdf5-17a5a1a37ccc851ca9123b2921fbae15c4814edf.tar.bz2
Subfiling VFD source cleanup (#3241) (#3290)
* Subfiling VFD source cleanup (#3241) * Subfiling VFD source cleanup Modularize Subfiling CMake code into separate CMakeLists.txt file Update Mercury util code to latest version and update Copyright Generate mercury_util_config.h header file instead of using pre-generated file Remove unnecessary Mercury functionality Fix minor warning in Subfiling VFD code * Remove Mercury headers from Autotools publicly-distributed header list * Fix CMake builds when Subfiling VFD isn't enabled (#3250) * Fix CMake builds when Subfiling VFD isn't enabled * Add Subfiling VFD entry to hdf5-config.cmake.in
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 5650c38..c546b89 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -174,13 +174,10 @@ if SUBFILING_VFD_CONDITIONAL
# Temporarily use internal Mercury until usage of Mercury is refactored
if HAVE_MERCURY_CONDITIONAL
- include_HEADERS += H5FDsubfiling/mercury/src/util/mercury_thread.h \
- H5FDsubfiling/mercury/src/util/mercury_thread_mutex.h H5FDsubfiling/mercury/src/util/mercury_thread_pool.h
-
- libhdf5_la_SOURCES += H5FDsubfiling/mercury/src/util/mercury_dlog.c \
- H5FDsubfiling/mercury/src/util/mercury_log.c H5FDsubfiling/mercury/src/util/mercury_thread.c \
- H5FDsubfiling/mercury/src/util/mercury_thread_condition.c H5FDsubfiling/mercury/src/util/mercury_thread_pool.c \
- H5FDsubfiling/mercury/src/util/mercury_thread_mutex.c H5FDsubfiling/mercury/src/util/mercury_util.c
+ libhdf5_la_SOURCES += H5FDsubfiling/mercury/src/util/mercury_thread.c \
+ H5FDsubfiling/mercury/src/util/mercury_thread_condition.c \
+ H5FDsubfiling/mercury/src/util/mercury_thread_pool.c \
+ H5FDsubfiling/mercury/src/util/mercury_thread_mutex.c
endif
endif