summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2020-04-17 00:07:21 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-05-20 14:35:18 (GMT)
commit58dfaafcceabeb054b90034838294d9a1ae339ac (patch)
tree9fd3a7f9dca546ec26af6849a9bc880c360a55ef /src
parent6609048ecfaf5409391758abf0d873ecebab160d (diff)
downloadhdf5-58dfaafcceabeb054b90034838294d9a1ae339ac.zip
hdf5-58dfaafcceabeb054b90034838294d9a1ae339ac.tar.gz
hdf5-58dfaafcceabeb054b90034838294d9a1ae339ac.tar.bz2
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.am7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 01648fa..38a239a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,7 +64,7 @@ libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5lib_settings.c H5system.c \
H5FAint.c H5FAstat.c H5FAtest.c \
H5FD.c H5FDcore.c H5FDfamily.c H5FDhdfs.c H5FDint.c H5FDlog.c \
H5FDvfd_swmr.c H5FDvfd_swmr_instr.c \
- H5FDmirror.c H5FDmulti.c H5FDros3.c H5FDsec2.c H5FDspace.c \
+ H5FDmulti.c H5FDsec2.c H5FDspace.c \
H5FDsplitter.c H5FDstdio.c H5FDtest.c \
H5FDvfd_swmr.c \
H5FL.c H5FO.c H5FS.c H5FScache.c H5FSdbg.c H5FSint.c H5FSsection.c \
@@ -129,6 +129,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