diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2017-05-16 04:15:15 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2017-05-16 04:15:15 (GMT) |
| commit | 0fbb49ac81078a35f8d999bf9242d8a12b0921cf (patch) | |
| tree | bc884e91036c447416ba5e586cdc812a6e0bd751 /c++/src | |
| parent | 4732761fe69bde35363f4041d2da13c3a1709663 (diff) | |
| parent | a98d4e42fa244ac48b4e7e8c2fc5010a96ef0d4b (diff) | |
| download | hdf5-0fbb49ac81078a35f8d999bf9242d8a12b0921cf.zip hdf5-0fbb49ac81078a35f8d999bf9242d8a12b0921cf.tar.gz hdf5-0fbb49ac81078a35f8d999bf9242d8a12b0921cf.tar.bz2 | |
Merge branch 'hdf5_1_8' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_1_8_bmr into hdf5_1_8
Diffstat (limited to 'c++/src')
| -rw-r--r-- | c++/src/Makefile.in | 7 | ||||
| -rw-r--r-- | c++/src/cpp_doc_config | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index cc6682e..ce9c05a 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -744,7 +744,7 @@ DISTCLEANFILES = h5c++ libhdf5.settings # Mark this directory as part of the C++ API 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 @@ -752,10 +752,12 @@ CXX_API = yes 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 = @@ -1355,6 +1357,7 @@ mostlyclean-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) @@ -1362,7 +1365,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 \ diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config index b059e5e..27e581b 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -38,7 +38,7 @@ PROJECT_NAME = "HDF5 C++ API" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "1.8.19-snap2 currently under development" +PROJECT_NUMBER = "1.8.19-snap3 currently under development" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a |