summaryrefslogtreecommitdiffstats
path: root/c++/examples
diff options
context:
space:
mode:
authorlrknox <lrknox>2017-06-12 22:04:41 (GMT)
committerlrknox <lrknox>2017-06-12 22:04:41 (GMT)
commit16e0eb3c5238d358e0db3d6b3d83ac14b5550e92 (patch)
treeb530678f2a6ce550a06ae4a69e187af22aa599f4 /c++/examples
parent62142b4cbc374e832accf687b25c8146eaab3952 (diff)
downloadhdf5-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 'c++/examples')
-rw-r--r--c++/examples/Makefile.in5
1 files changed, 1 insertions, 4 deletions
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index d819404..c280200 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -654,12 +654,10 @@ CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA)
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 =
@@ -1134,7 +1132,6 @@ installcheck-local:
# 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)
@@ -1142,7 +1139,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 \