summaryrefslogtreecommitdiffstats
path: root/hl/c++/test/Makefile.in
diff options
context:
space:
mode:
authorlrknox <lrknox>2017-04-25 22:04:38 (GMT)
committerlrknox <lrknox>2017-04-25 22:04:38 (GMT)
commit4a425eabc70cf5236afc41c2e56d4a57cc7c536e (patch)
tree51a0d960e786289202f9f1c24f8a37b049500ca7 /hl/c++/test/Makefile.in
parentce5637c6f17d8398b3db9d2fee704b1cee619996 (diff)
downloadhdf5-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 'hl/c++/test/Makefile.in')
-rw-r--r--hl/c++/test/Makefile.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index d93ce54..47f9bf4 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -739,18 +739,20 @@ ptableTest_SOURCES = ptableTest.cpp
# Tell conclude.am that these are C++ tests.
CXX_API = yes
-# 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 =
@@ -1220,6 +1222,7 @@ 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)
@@ -1227,7 +1230,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 \