diff options
| author | lrknox <lrknox> | 2017-04-21 19:32:45 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2017-04-21 19:32:45 (GMT) |
| commit | 7bd516f2ead21e8470cc25c0b664ad6b56c723a0 (patch) | |
| tree | a5e18ecf1179c161f3d426c29b3a272df67aebd2 /config | |
| parent | 6ef69b7b1748a48c236c60f45a1ee590de7b5194 (diff) | |
| download | hdf5-7bd516f2ead21e8470cc25c0b664ad6b56c723a0.zip hdf5-7bd516f2ead21e8470cc25c0b664ad6b56c723a0.tar.gz hdf5-7bd516f2ead21e8470cc25c0b664ad6b56c723a0.tar.bz2 | |
Our best effort to build dynamic plugin tests and not install them with
"make install". It seems the install-exec-hook doesn't remove the last
to be installed.
Diffstat (limited to 'config')
| -rw-r--r-- | config/conclude.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config/conclude.am b/config/conclude.am index 1932170..cad55a3 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -18,18 +18,19 @@ ## Textually included at the end of most HDF5 Makefiles.am. ## Contains build rules. -# Automake needs to be taught how to build lib, pkglib, 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. LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES) \ $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB) -PKGLIB = $(pkglib_LTLIBRARIES) +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) @@ -37,7 +38,7 @@ AM_SH_LOG_FLAGS = # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. -build-pkglib: $(PKGLIB) +build-dyn: $(DYN) build-lib: $(LIB) build-progs: $(LIB) $(PROGS) build-tests: $(LIB) $(PROGS) $(chk_TESTS) @@ -45,7 +46,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 pkglib 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 \ |