summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlrknox <lrknox>2016-11-18 21:52:36 (GMT)
committerlrknox <lrknox>2016-11-18 21:52:36 (GMT)
commitb550fe9a3226632270110e36e82133d461f8f921 (patch)
treeabb90f2d8ff703548330f7cd341e0387110d714e /src
parent0fbd91aaf224a2de55594cdc929f93c92832da4f (diff)
parent6974764348a88590d1901f316f956893dfa223d8 (diff)
downloadhdf5-b550fe9a3226632270110e36e82133d461f8f921.zip
hdf5-b550fe9a3226632270110e36e82133d461f8f921.tar.gz
hdf5-b550fe9a3226632270110e36e82133d461f8f921.tar.bz2
Merge commit '6974764348a' into hdf5_1_8
(HDF5 1.8.18 release changes) Update HISTORY-1_8.txt and RELEASE.txt files.
Diffstat (limited to 'src')
-rw-r--r--src/H5config.h.in3
-rw-r--r--src/Makefile.in63
2 files changed, 39 insertions, 27 deletions
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 0ed6ae8..27b962a 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -342,8 +342,7 @@
with special algorithm. */
#undef LONG_TO_LDOUBLE_SPECIAL
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define if the metadata trace file code is to be compiled in */
diff --git a/src/Makefile.in b/src/Makefile.in
index 979f4a6..c1d926e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -98,13 +108,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/config/commence.am \
- $(top_srcdir)/config/lt_vers.am \
- $(top_srcdir)/config/conclude.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(srcdir)/H5config.h.in \
- $(top_srcdir)/bin/mkinstalldirs $(srcdir)/libhdf5.settings.in \
- $(top_srcdir)/bin/depcomp $(include_HEADERS) \
- $(top_srcdir)/bin/test-driver COPYING
noinst_PROGRAMS = H5detect$(EXEEXT) H5make_libsettings$(EXEEXT)
TESTS =
subdir = src
@@ -113,6 +116,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
$(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
CONFIG_HEADER = H5config.h
CONFIG_CLEAN_FILES = libhdf5.settings
@@ -447,6 +452,12 @@ am__set_b = \
*) \
b='$*';; \
esac
+am__DIST_COMMON = $(srcdir)/H5config.h.in $(srcdir)/Makefile.in \
+ $(srcdir)/libhdf5.settings.in $(top_srcdir)/bin/depcomp \
+ $(top_srcdir)/bin/mkinstalldirs $(top_srcdir)/bin/test-driver \
+ $(top_srcdir)/config/commence.am \
+ $(top_srcdir)/config/conclude.am \
+ $(top_srcdir)/config/lt_vers.am COPYING
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
@@ -554,6 +565,7 @@ LL_PATH = @LL_PATH@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_STATIC_EXEC = @LT_STATIC_EXEC@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -718,26 +730,26 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
# See libtool versioning documentation online.
# After making changes, run bin/reconfigure to update other configure related
# files like Makefile.in.
-LT_VERS_INTERFACE = 11
+LT_VERS_INTERFACE = 12
LT_VERS_REVISION = 1
-LT_VERS_AGE = 1
-LT_CXX_VERS_INTERFACE = 11
-LT_CXX_VERS_REVISION = 1
+LT_VERS_AGE = 2
+LT_CXX_VERS_INTERFACE = 13
+LT_CXX_VERS_REVISION = 0
LT_CXX_VERS_AGE = 0
LT_F_VERS_INTERFACE = 10
-LT_F_VERS_REVISION = 3
+LT_F_VERS_REVISION = 4
LT_F_VERS_AGE = 0
-LT_HL_VERS_INTERFACE = 10
-LT_HL_VERS_REVISION = 3
-LT_HL_VERS_AGE = 0
-LT_HL_CXX_VERS_INTERFACE = 10
-LT_HL_CXX_VERS_REVISION = 3
-LT_HL_CXX_VERS_AGE = 0
+LT_HL_VERS_INTERFACE = 11
+LT_HL_VERS_REVISION = 1
+LT_HL_VERS_AGE = 1
+LT_HL_CXX_VERS_INTERFACE = 12
+LT_HL_CXX_VERS_REVISION = 0
+LT_HL_CXX_VERS_AGE = 1
LT_HL_F_VERS_INTERFACE = 10
LT_HL_F_VERS_REVISION = 3
LT_HL_F_VERS_AGE = 0
LT_TOOLS_VERS_INTERFACE = 10
-LT_TOOLS_VERS_REVISION = 3
+LT_TOOLS_VERS_REVISION = 4
LT_TOOLS_VERS_AGE = 0
# Our main target, the HDF5 library
@@ -871,7 +883,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign src/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -880,7 +891,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/config/commence.am $(top_srcdir)/config/lt_vers.am $(top_srcdir)/config/conclude.am:
+$(top_srcdir)/config/commence.am $(top_srcdir)/config/lt_vers.am $(top_srcdir)/config/conclude.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1363,7 +1374,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1644,6 +1655,8 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
uninstall-includeHEADERS uninstall-libLTLIBRARIES \
uninstall-settingsDATA
+.PRECIOUS: Makefile
+
# List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
# This tells the Makefiles that these targets are not files to be built but