diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-04-17 03:10:47 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-04-17 03:10:47 (GMT) |
| commit | 19bca90648a6435d3757c8345ae629b588861f70 (patch) | |
| tree | ab89bcc86bc815ba8ccd303cb355d064c446e817 /src | |
| parent | 66842e3347a52e18aea227ba893a4d48ee0b80e7 (diff) | |
| parent | 9ecca22dd1852145810280e8c54aa6b0ab26b604 (diff) | |
| download | hdf5-19bca90648a6435d3757c8345ae629b588861f70.zip hdf5-19bca90648a6435d3757c8345ae629b588861f70.tar.gz hdf5-19bca90648a6435d3757c8345ae629b588861f70.tar.bz2 | |
Merge pull request #2521 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor to develop
* commit '9ecca22dd1852145810280e8c54aa6b0ab26b604':
Fixed problems with S3 and HDFS VFDs. * Updated info struct parameter to correct info_string * Fixed Makefile.am where the S3 VFD was listed twice, causing duplicated symbols errors.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4f40e60..787b502 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -62,7 +62,7 @@ libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5lib_settings.c H5system.c \ H5FA.c H5FAcache.c H5FAdbg.c H5FAdblock.c H5FAdblkpage.c H5FAhdr.c \ H5FAint.c H5FAstat.c H5FAtest.c \ H5FD.c H5FDcore.c H5FDfamily.c H5FDhdfs.c H5FDint.c H5FDlog.c \ - H5FDmirror.c H5FDmulti.c H5FDros3.c H5FDsec2.c H5FDspace.c \ + H5FDmulti.c H5FDsec2.c H5FDspace.c \ H5FDsplitter.c H5FDstdio.c H5FDtest.c \ H5FL.c H5FO.c H5FS.c H5FScache.c H5FSdbg.c H5FSint.c H5FSsection.c \ H5FSstat.c H5FStest.c \ @@ -126,6 +126,11 @@ if DIRECT_VFD_CONDITIONAL libhdf5_la_SOURCES += H5FDdirect.c endif +# Only compile the mirror VFD if necessary +if MIRROR_VFD_CONDITIONAL + libhdf5_la_SOURCES += H5FDmirror.c +endif + # Only compile the read-only S3 VFD if necessary if ROS3_VFD_CONDITIONAL libhdf5_la_SOURCES += H5FDros3.c H5FDs3comms.c |