(no commit message)

[imagemagick] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 07aeaa6a51b26dea2b1cf1bf1cb395f9b920d8d7..97ff0fd43b321849f1e7c68940965da3ed2c9981 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@' \
@@ -201,11 +201,6 @@ maintainer-clean-local: $(PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS)
 
 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
-
 # drd: valgrind's newer thread error detector
 drd:
        $(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes \
@@ -246,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 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)