(no commit message)

[imagemagick] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 888945af3602d11eaafce596ebd9c71b6fd8a3e1..e19776d988739c2cdd47564bb13dacf3fbd92cdb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization
+#  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
 #  dedicated to making software imaging solutions freely available.
 #
 #  You may not use this file except in compliance with the License.  You may
@@ -68,14 +68,14 @@ endif
 
 # Environment parameters to be used during tests
 TESTS_ENVIRONMENT = \
-  COMPARE="$(MEMCHECK) @abs_top_builddir@/utilities/compare" \
-  COMPOSITE="$(MEMCHECK) @abs_top_builddir@/utilities/composite" \
-  CONJURE="$(MEMCHECK) @abs_top_builddir@/utilities/conjure" \
-  CONVERT="$(MEMCHECK) @abs_top_builddir@/utilities/convert" \
-  DISPLAY="$(MEMCHECK) @abs_top_builddir@/utilities/display" \
-  IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \
-  MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
-  VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
+       COMPARE="$(MEMCHECK) @abs_top_builddir@/utilities/compare" \
+       COMPOSITE="$(MEMCHECK) @abs_top_builddir@/utilities/composite" \
+       CONJURE="$(MEMCHECK) @abs_top_builddir@/utilities/conjure" \
+       CONVERT="$(MEMCHECK) @abs_top_builddir@/utilities/convert" \
+       DISPLAY="$(MEMCHECK) @abs_top_builddir@/utilities/display" \
+       IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \
+       MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
+       VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
        LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}" \
        MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@' \
        MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@' \
@@ -203,21 +203,23 @@ check-local: $(PERLMAGICK_CHECK_LOCAL_TARGETS)
 
 # drd: valgrind's newer thread error detector
 drd:
-  $(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes \
-    --quiet $(VALGRIND_EXTRA_OPTS)' check
+       $(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes \
+         --quiet $(VALGRIND_EXTRA_OPTS)' check
 
 # helgrind: valgrind's older thread error detector
 helgrind:
-  $(MAKE) MEMCHECK='valgrind --tool=helgrind --quiet $(VALGRIND_EXTRA_OPTS)' check
+       $(MAKE) MEMCHECK='valgrind --tool=helgrind --error-exitcode=2 --quiet \
+       $(VALGRIND_EXTRA_OPTS)' check
 
 # memcheck: valgrind's memory access checker
 memcheck:
-  $(MAKE) MEMCHECK='valgrind --tool=memcheck --leak-check=full --read-var-info=yes \
-    --track-origins=yes --num-callers=12 --quiet $(VALGRIND_EXTRA_OPTS)' check
+       $(MAKE) MEMCHECK='valgrind --tool=memcheck --leak-check=full --read-var-info=yes \
+       --error-exitcode=2 --track-origins=yes --num-callers=12 \
+       --quiet $(VALGRIND_EXTRA_OPTS)' check
 
 # ptrcheck: valgrind's experimental pointer checking tool.
 ptrcheck:
-  $(MAKE) MEMCHECK='valgrind --tool=exp-ptrcheck --quiet $(VALGRIND_EXTRA_OPTS)' check
+       $(MAKE) MEMCHECK='valgrind --tool=exp-ptrcheck --quiet $(VALGRIND_EXTRA_OPTS)' check
 
 # Non-Automake subdirectories to distribute
 DISTDIRS = images scenes scripts www PerlMagick
@@ -239,7 +241,7 @@ dist-hook:
 
 # Install HTML files
 pkgdocdir = $(DOCUMENTATION_PATH)
-DOCDIRS = images www www/api www/api/MagickCore www/api/MagickWand www/Magick++
+DOCDIRS = images images/patterns www www/api www/source www/api/MagickCore www/api/MagickWand www/Magick++
 HTML_INSTALL_DATA_TARGETS = install-data-html
 install-data-html:
        $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)