summaryrefslogtreecommitdiffstats
path: root/tools/h5jam/Makefile.am
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-04-07 17:26:44 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-04-07 17:26:44 (GMT)
commitab2d9f1e9c44502f6dfe69969974a99d2953159d (patch)
tree32d9a9298ab53b766baf1486704ca4ddd9b61d4b /tools/h5jam/Makefile.am
parentfadc2d8c61c975cd6a64443ffbaa9ff6999a2419 (diff)
downloadhdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.zip
hdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.tar.gz
hdf5-ab2d9f1e9c44502f6dfe69969974a99d2953159d.tar.bz2
[svn-r24980] HDFFV-8290: Merge automake 1.14.1 changes from trunk
Tested: h5committest
Diffstat (limited to 'tools/h5jam/Makefile.am')
-rw-r--r--tools/h5jam/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/h5jam/Makefile.am b/tools/h5jam/Makefile.am
index c6ccebf..60a62b9 100644
--- a/tools/h5jam/Makefile.am
+++ b/tools/h5jam/Makefile.am
@@ -21,7 +21,7 @@
include $(top_srcdir)/config/commence.am
# Include src and tools/lib directories
-INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
+AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
bin_PROGRAMS=h5jam h5unjam
check_PROGRAMS=tellub h5jamgentest getub
@@ -39,7 +39,7 @@ LDADD=$(LIBH5TOOLS) $(LIBHDF5)
# Temporary files. *.h5 are generated by jamgentest. They should
# copied to the testfiles/ directory if update is required.
-CHECK_CLEANFILES+=*.h5
+CHECK_CLEANFILES+=*.h5 testfiles/h5jam-*-sav testfiles/h5unjam-*-sav
DISTCLEANFILES=testh5jam.sh
include $(top_srcdir)/config/conclude.am