summaryrefslogtreecommitdiffstats
path: root/test/Makefile.in
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2015-02-24 21:53:56 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2015-02-24 21:53:56 (GMT)
commit2ca5b16a9fd79d240d5e4ebe4689033c6c7182ad (patch)
tree30e44b12fa5cfd92d8524fcf2717e19ec21e2043 /test/Makefile.in
parent3f72ec11cdd07c30ee0340e3c1e9b13d88495807 (diff)
parent48d9c30923a5d298670cf1f8e930c9a9624f80b9 (diff)
downloadhdf5-2ca5b16a9fd79d240d5e4ebe4689033c6c7182ad.zip
hdf5-2ca5b16a9fd79d240d5e4ebe4689033c6c7182ad.tar.gz
hdf5-2ca5b16a9fd79d240d5e4ebe4689033c6c7182ad.tar.bz2
[svn-r26296] Merge r26050 through 26295 from trunk to vds branch.
Tested: ummon
Diffstat (limited to 'test/Makefile.in')
-rw-r--r--test/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 45db393..f5a25ce 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -115,7 +115,8 @@ check_PROGRAMS = $(am__EXEEXT_1) error_test$(EXEEXT) \
TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT)
subdir = test
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
+ $(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
@@ -899,7 +900,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTRUMENT = @INSTRUMENT@
INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LARGEFILE = @LARGEFILE@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@