diff options
| author | lrknox <lrknox> | 2017-06-12 22:04:41 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2017-06-12 22:04:41 (GMT) |
| commit | 16e0eb3c5238d358e0db3d6b3d83ac14b5550e92 (patch) | |
| tree | b530678f2a6ce550a06ae4a69e187af22aa599f4 /src | |
| parent | 62142b4cbc374e832accf687b25c8146eaab3952 (diff) | |
| download | hdf5-16e0eb3c5238d358e0db3d6b3d83ac14b5550e92.zip hdf5-16e0eb3c5238d358e0db3d6b3d83ac14b5550e92.tar.gz hdf5-16e0eb3c5238d358e0db3d6b3d83ac14b5550e92.tar.bz2 | |
Moved libdynlib* plugin test libraries to noist_LT_LIBRARIES with added
flag '-rpath /nowhere' to stop them being installed while keeping them
from linking with libhdf5, etc.
Incremented version to 1.8.19-pre1 and ran bin/release to create tar
and zip files for testing.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5public.h | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/H5public.h b/src/H5public.h index a335034..38f1933 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 8 /* For minor interface/format changes */ #define H5_VERS_RELEASE 19 /* For tweaks, bug-fixes, or development */ -#define H5_VERS_SUBRELEASE "pre1" /* For pre-releases like snap0 */ +#define H5_VERS_SUBRELEASE "pre2" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.8.19-pre1" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.8.19-pre2" /* 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 06e169f..2c5e55f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -853,12 +853,10 @@ settings_DATA = libhdf5.settings 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 = @@ -1729,7 +1727,6 @@ 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) @@ -1737,7 +1734,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 dyn progs tests check-s check-p :: $(BUILT_SOURCES) +lib 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 \ |