diff options
| author | lrknox <lrknox> | 2017-04-25 22:04:38 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2017-04-25 22:04:38 (GMT) |
| commit | 4a425eabc70cf5236afc41c2e56d4a57cc7c536e (patch) | |
| tree | 51a0d960e786289202f9f1c24f8a37b049500ca7 /src | |
| parent | ce5637c6f17d8398b3db9d2fee704b1cee619996 (diff) | |
| download | hdf5-4a425eabc70cf5236afc41c2e56d4a57cc7c536e.zip hdf5-4a425eabc70cf5236afc41c2e56d4a57cc7c536e.tar.gz hdf5-4a425eabc70cf5236afc41c2e56d4a57cc7c536e.tar.bz2 | |
Commit version change to 1.10.1 and changes to Makfile.ins and other
files generated by running autogen.sh.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5public.h | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/H5public.h b/src/H5public.h index 8b9ac45..496d8ce 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -93,9 +93,9 @@ extern "C" { #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 10 /* For minor interface/format changes */ #define H5_VERS_RELEASE 1 /* For tweaks, bug-fixes, or development */ -#define H5_VERS_SUBRELEASE "pre3" /* For pre-releases like snap0 */ +#define H5_VERS_SUBRELEASE "" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.10.1-pre3" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.10.1" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) diff --git a/src/Makefile.in b/src/Makefile.in index 8c6029d..9dff057 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -971,18 +971,20 @@ include_HEADERS = hdf5.h H5api_adpt.h H5overflow.h H5pubconf.h H5public.h H5vers settingsdir = $(libdir) settings_DATA = libhdf5.settings -# Automake needs to be taught how to build lib, progs, and tests targets. +# Automake needs to be taught how to build lib, dyn, progs and tests targets. # These will be filled in automatically for the most part (e.g., # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and # EXTRA_TEST variables are supplied to allow the user to force targets to -# be built at certain times. +# be built at certain times. LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES) \ $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB) +DYN = $(dyn_LTLIBRARIES) PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS) \ $(EXTRA_PROG) chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) +dyndir = $(libdir) TEST_EXTENSIONS = .sh SH_LOG_COMPILER = $(SHELL) AM_SH_LOG_FLAGS = @@ -1908,6 +1910,7 @@ trace: $(libhdf5_la_SOURCES) # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. +build-dyn: $(DYN) build-lib: $(LIB) build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(chk_TESTS) @@ -1915,7 +1918,7 @@ build-tests: $(LIB) $(PROGS) $(chk_TESTS) # General rule for recursive building targets. # BUILT_SOURCES contain targets that need to be built before anything else # in the directory (e.g., for Fortran type detection) -lib progs tests check-s check-p :: $(BUILT_SOURCES) +lib dyn progs tests check-s check-p :: $(BUILT_SOURCES) @$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1; @for d in X $(SUBDIRS); do \ if test $$d != X && test $$d != .; then \ |