diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2017-06-12 23:00:03 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2017-06-12 23:00:03 (GMT) |
| commit | c3718a079965bc9d9637780f0961db1c973c1356 (patch) | |
| tree | b530678f2a6ce550a06ae4a69e187af22aa599f4 /tools/lib/Makefile.in | |
| parent | 62142b4cbc374e832accf687b25c8146eaab3952 (diff) | |
| parent | 16e0eb3c5238d358e0db3d6b3d83ac14b5550e92 (diff) | |
| download | hdf5-c3718a079965bc9d9637780f0961db1c973c1356.zip hdf5-c3718a079965bc9d9637780f0961db1c973c1356.tar.gz hdf5-c3718a079965bc9d9637780f0961db1c973c1356.tar.bz2 | |
Merge pull request #576 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_8_19 to hdf5_1_8_19
* commit '16e0eb3c5238d358e0db3d6b3d83ac14b5550e92':
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 'tools/lib/Makefile.in')
| -rw-r--r-- | tools/lib/Makefile.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 62fa41d..3d8d642 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -684,12 +684,10 @@ LDADD = libh5tools.la $(LIBHDF5) 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 = @@ -1173,7 +1171,6 @@ help: # 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) @@ -1181,7 +1178,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 \ |