diff options
| author | jhendersonHDF <jhenderson@hdfgroup.org> | 2023-07-13 17:19:02 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 17:19:02 (GMT) |
| commit | 26059fc7abd51827d0e7a798fac1cfa7461db7d3 (patch) | |
| tree | d429feaa8d22f72f7415330c895d2562f405e46d /src/Makefile.am | |
| parent | b77d5bacea7f004153b2752a9cb17d26ae975cf9 (diff) | |
| download | hdf5-26059fc7abd51827d0e7a798fac1cfa7461db7d3.zip hdf5-26059fc7abd51827d0e7a798fac1cfa7461db7d3.tar.gz hdf5-26059fc7abd51827d0e7a798fac1cfa7461db7d3.tar.bz2 | |
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
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e92a71c..2272389c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -167,13 +167,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 |