diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-04-25 20:46:03 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-04-25 20:46:03 (GMT) |
| commit | b3fb91a932546724344205529a37226aaa34367e (patch) | |
| tree | 9706077c350765bdb1110f5bb0a0b5769b420345 /config/conclude.am | |
| parent | c9779df05a4b280c0e5b698607cf0de40637cc58 (diff) | |
| download | hdf5-b3fb91a932546724344205529a37226aaa34367e.zip hdf5-b3fb91a932546724344205529a37226aaa34367e.tar.gz hdf5-b3fb91a932546724344205529a37226aaa34367e.tar.bz2 | |
HDFFV-10173 revert and add dynlib flags
Diffstat (limited to 'config/conclude.am')
| -rw-r--r-- | config/conclude.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/conclude.am b/config/conclude.am index cd1554c..55b805a 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -16,17 +16,19 @@ ## Textually included at the end of most HDF5 Makefiles.am. ## Contains build rules. -# 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) TESTS = $(TEST_PROG) $(TEST_SCRIPT) $(EXTRA_TEST) +dyndir=$(libdir) TEST_EXTENSIONS = .sh SH_LOG_COMPILER = $(SHELL) @@ -34,6 +36,7 @@ AM_SH_LOG_FLAGS = # 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) @@ -41,7 +44,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 \ |