summaryrefslogtreecommitdiffstats
path: root/hl/tools/gif2h5
diff options
context:
space:
mode:
authorlrknox <lrknox>2017-05-10 18:54:18 (GMT)
committerlrknox <lrknox>2017-05-10 18:54:18 (GMT)
commit0ff30fa67ca92fe59d99b4bbc6addbc01f219043 (patch)
tree84fdfb11c5b74c92737d4b0e4224d609140e34e4 /hl/tools/gif2h5
parentfaef710a862566208fb34bff1d10dd50a02233f2 (diff)
downloadhdf5-0ff30fa67ca92fe59d99b4bbc6addbc01f219043.zip
hdf5-0ff30fa67ca92fe59d99b4bbc6addbc01f219043.tar.gz
hdf5-0ff30fa67ca92fe59d99b4bbc6addbc01f219043.tar.bz2
Move libdynlib* test lib files from lib_LTLIBRARIES to dyn_LTLIBRARIES
and other changes to Makefiles and config/conclude.am to eliminate link errors with new libdynlib*_la_LDFLAGS which were added to stop libdynlib* files linking to external libraries.
Diffstat (limited to 'hl/tools/gif2h5')
-rw-r--r--hl/tools/gif2h5/Makefile.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 231cb08..ce2bc6c 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -695,7 +695,7 @@ h52gifgentst_SOURCES = h52gifgentst.c
# library.
LDADD = $(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5)
-# 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
@@ -703,10 +703,12 @@ LDADD = $(LIBH5_HL) $(LIBH5TOOLS) $(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 =
@@ -1237,6 +1239,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)
@@ -1244,7 +1247,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 \