diff options
| author | dpopat <dpopat@jelly.ad.hdfgroup.org> | 2019-07-19 18:49:49 (GMT) |
|---|---|---|
| committer | dpopat <dpopat@jelly.ad.hdfgroup.org> | 2019-07-19 18:49:49 (GMT) |
| commit | 5f5bb7be8b318a39373ad7bc3c7b32a6937aacf4 (patch) | |
| tree | 6ce16f98baef8290ac7ad162189d0878c3df97e7 /tools/h5ls | |
| parent | cc5ee764e9b8d218db1228ffb5108a0092369bbb (diff) | |
| download | hdf5-5f5bb7be8b318a39373ad7bc3c7b32a6937aacf4.zip hdf5-5f5bb7be8b318a39373ad7bc3c7b32a6937aacf4.tar.gz hdf5-5f5bb7be8b318a39373ad7bc3c7b32a6937aacf4.tar.bz2 | |
Reconfigured autoconf files
Diffstat (limited to 'tools/h5ls')
| -rw-r--r-- | tools/h5ls/Makefile.am | 12 | ||||
| -rw-r--r-- | tools/h5ls/Makefile.in | 12 |
2 files changed, 15 insertions, 9 deletions
diff --git a/tools/h5ls/Makefile.am b/tools/h5ls/Makefile.am index ee31ca2..2724b34 100644 --- a/tools/h5ls/Makefile.am +++ b/tools/h5ls/Makefile.am @@ -23,17 +23,17 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib # Test programs and scripts if BUILD_TESTS_CONDITIONAL - TEST_SCRIPT=testh5ls.sh -else - TEST_SCRIPT= -endif -check_SCRIPTS=$(TEST_SCRIPT) -SCRIPT_DEPEND=h5ls$(EXEEXT) +TEST_SCRIPT=testh5ls.sh if HAVE_SHARED_CONDITIONAL if USE_PLUGINS_CONDITIONAL TEST_SCRIPT += h5ls_plugin.sh endif endif +else +TEST_SCRIPT= +endif +check_SCRIPTS=$(TEST_SCRIPT) +SCRIPT_DEPEND=h5ls$(EXEEXT) # This is our main target, the h5ls tool bin_PROGRAMS=h5ls diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 5bcf480..76b4a16 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -104,9 +104,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@HAVE_SHARED_CONDITIONAL_TRUE@@USE_PLUGINS_CONDITIONAL_TRUE@am__append_1 = h5ls_plugin.sh +@BUILD_TESTS_CONDITIONAL_TRUE@@HAVE_SHARED_CONDITIONAL_TRUE@@USE_PLUGINS_CONDITIONAL_TRUE@am__append_1 = h5ls_plugin.sh bin_PROGRAMS = h5ls$(EXEEXT) -TESTS = $(TEST_SCRIPT) +TESTS = $(am__EXEEXT_1) subdir = tools/h5ls ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \ @@ -385,6 +385,8 @@ am__set_TESTS_bases = \ bases=`echo $$bases` RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck +@BUILD_TESTS_CONDITIONAL_TRUE@am__EXEEXT_1 = testh5ls.sh \ +@BUILD_TESTS_CONDITIONAL_TRUE@ $(am__append_1) TEST_SUITE_LOG = test-suite.log am__test_logs1 = $(TESTS:=.log) am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) @@ -491,6 +493,8 @@ HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ @@ -678,9 +682,11 @@ TRACE = perl $(top_srcdir)/bin/trace # .chklog files are output from those tests. # *.clog and *.clog2 are from the MPE option. CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 +@BUILD_TESTS_CONDITIONAL_FALSE@TEST_SCRIPT = # Test programs and scripts -TEST_SCRIPT = testh5ls.sh $(am__append_1) +@BUILD_TESTS_CONDITIONAL_TRUE@TEST_SCRIPT = testh5ls.sh \ +@BUILD_TESTS_CONDITIONAL_TRUE@ $(am__append_1) check_SCRIPTS = $(TEST_SCRIPT) SCRIPT_DEPEND = h5ls$(EXEEXT) |