diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2009-04-28 19:41:42 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2009-04-28 19:41:42 (GMT) |
commit | 665f528813749ce6b1ce9afdf104262a65a4a2cd (patch) | |
tree | 5839f00d5537981ae08fad294dc46a7a9a0f4efd /Makefile.in | |
parent | 75a7a98214a0a408adff8b90b697682f10a4de77 (diff) | |
download | hdf5-665f528813749ce6b1ce9afdf104262a65a4a2cd.zip hdf5-665f528813749ce6b1ce9afdf104262a65a4a2cd.tar.gz hdf5-665f528813749ce6b1ce9afdf104262a65a4a2cd.tar.bz2 |
[svn-r16875] Merged changes from the trunk into the branch:
svn merge -r16602:16869 https://svn.hdfgroup.uiuc.edu/hdf5/trunk
Tested on: smirom
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 9ab76bd..6e0e40b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -350,7 +350,9 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. # *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog + +# Some files/directories generated during check that should be cleaned +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *-tmp @BUILD_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR = # Define subdirectories to build. @@ -418,7 +420,7 @@ clean-libtool: -rm -rf .libs _libs distclean-libtool: - -rm -f libtool + -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -495,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -853,6 +855,7 @@ check-clean: (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ fi; \ done + $(RM) -rf prefix-tmp destdir-tmp # Some C++ compilers/linkers will create a directory named ii_files in # the root directory, which should be cleaned. @@ -890,6 +893,23 @@ installcheck-local: # check-install is just a synonym for installcheck check-install: installcheck +# check-all-install tests all installation methods. +# Install via different mechanism and then compare against the default. +# Fine if only libXXX.a files are different since they may have been ranlib'ed. +check-all-install: + @echo Installing to default location + $(MAKE) install + @echo Installing to different prefix location + $(MAKE) prefix=${ROOT}/prefix-tmp install + @echo Compare against the default installation. + @echo Fine if only libXXX.a files are different. + -diff -r prefix-tmp ${prefix} + @echo Installing to different $$\DESTDIR location + env DESTDIR=${ROOT}/destdir-tmp $(MAKE) install + @echo Compare against the default installation. + @echo Fine if only libXXX.a files are different. + -diff -r destdir-tmp${prefix} ${prefix} + # Only source files in the src directory include tracing information, # so 'make trace' only needs to recurse into that directory. trace: |