summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-06-23 19:16:31 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-06-23 19:16:31 (GMT)
commit46d917001cc78bb7250167f755c12ae6dea6854c (patch)
tree8f03c918de43ece1026803f66115b457b3573bc6 /Makefile.am
parenta051d43645edb74483fcc2757fa267d081f527df (diff)
downloadhdf5-46d917001cc78bb7250167f755c12ae6dea6854c.zip
hdf5-46d917001cc78bb7250167f755c12ae6dea6854c.tar.gz
hdf5-46d917001cc78bb7250167f755c12ae6dea6854c.tar.bz2
[svn-r15262] Description:
Merge revisions 15037:15130 from trunk into metadata journaling branch Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Mac OS X/32 10.5.2 (amazon) in debug mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'Makefile.am')
-rwxr-xr-xMakefile.am9
1 files changed, 1 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 9f2574a..c0d6827 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,7 +73,7 @@ else
endif
SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
- $(HDF5_HL_DIR)
+ $(HDF5_HL_DIR) perform
DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples
# Some files generated during configure that should be cleaned
@@ -101,13 +101,6 @@ tests:
fi; \
done
-check-perform:
- @@SETX@; for d in perform; do \
- if test $$d != .; then \
- (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
- fi; \
- done
-
install-exec-local:
@cd perform && $(MAKE) $(AM_MAKEFLAGS) install
uninstall-local: