diff options
| author | lrknox <lrknox> | 2017-08-25 20:10:42 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2017-08-25 20:10:42 (GMT) |
| commit | 7f758f2eea5c918a9100e6e7e6e0744a85e4c571 (patch) | |
| tree | 49e9f344d5ad4af560d895bd698fdac35c246155 /c++/test | |
| parent | 1115133e11e43c45f5f20d74ca4bae76815c63d3 (diff) | |
| parent | 23a702e7bad93fc4f14eab07678c75d276e2d0ad (diff) | |
| download | hdf5-7f758f2eea5c918a9100e6e7e6e0744a85e4c571.zip hdf5-7f758f2eea5c918a9100e6e7e6e0744a85e4c571.tar.gz hdf5-7f758f2eea5c918a9100e6e7e6e0744a85e4c571.tar.bz2 | |
Merge branch '1.8/master' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into hdf5_1_8
Diffstat (limited to 'c++/test')
| -rw-r--r-- | c++/test/Makefile.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index afd001f..841a797 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -548,6 +548,7 @@ THREADSAFE = @THREADSAFE@ TIME = @TIME@ TR = @TR@ TRACE_API = @TRACE_API@ +UNAME_CYGWIN = @UNAME_CYGWIN@ UNAME_INFO = @UNAME_INFO@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ @@ -693,12 +694,10 @@ 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 = @@ -1189,7 +1188,6 @@ 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) @@ -1197,7 +1195,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 dyn progs tests check-s check-p :: $(BUILT_SOURCES) +lib 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 \ |