(no commit message)

[imagemagick] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2253a7c3bea5e9a3ce6b432a73c3d0ea930c1d6d..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,15 +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" \
-  REFERENCE_IMAGE="$(MEMCHECK) @abs_top_builddir@/images/rose.pnm" \
+       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@' \
@@ -180,7 +179,10 @@ doc_DATA = \
        NEWS.txt
 
 if MAINTAINER_MODE
-MAINTAINER_TARGETS = magick-version
+MAINTAINER_TARGETS = \
+       magick-version \
+  ImageMagick.spec \
+  $(PERLMAGICK_MAINTAINER_TARGETS)
 endif
 
 all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINER_TARGETS)
@@ -199,15 +201,23 @@ 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
+       $(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 --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
 
@@ -231,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)
@@ -313,17 +323,17 @@ endif # P7ZIP_DELEGATE
 #
 if RPM_DELEGATE
 
-DIST_ARCHIVE_SRPM=$(distdir).src.rpm
+DIST_ARCHIVE_SRPM=$(distdir)-1.src.rpm
 .PHONY: srpm
-$(DIST_ARCHIVE_SRPM) srpm: dist-bzip2
+$(DIST_ARCHIVE_SRPM) srpm: dist
        rm -f $(DIST_ARCHIVE_SRPM)
        $(RPM) --define="_sourcedir `pwd`" --define="_srcrpmdir `pwd`" --nodeps --bs ImageMagick.spec
        @echo ==============================================================
        @echo $(DIST_ARCHIVE_SRPM) is ready for distribution.
        @echo ==============================================================
 
-RPMDIR=redhat
-RPMARCH=i386
+RPMDIR=rpmbuild
+RPMARCH=$(MAGICK_TARGET_CPU)
 
 DIST_ARCHIVE_RPM= \
        $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
@@ -333,14 +343,12 @@ DIST_ARCHIVE_RPM= \
        $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
 
 .PHONY: rpm
-rpm:
+rpm:   dist
        rm -rf $(RPMDIR)
-       mkdir $(RPMDIR)
-       mkdir $(RPMDIR)/BUILD
-       mkdir $(RPMDIR)/RPMS
-       $(MAKE) distcheck
+       $(MKDIR_P) $(RPMDIR)
+       $(MKDIR_P) $(RPMDIR)/BUILD
+       $(MKDIR_P) $(RPMDIR)/RPMS
        $(RPM) --define="_sourcedir `pwd`" --define="_rpmdir `pwd`/$(RPMDIR)/RPMS" --define="_builddir `pwd`/$(RPMDIR)/BUILD" --nodeps -bb ImageMagick.spec
-       rm -rf rpmbuild
        @echo ==============================================================
        @echo $(DIST_ARCHIVE_RPM) is ready for distribution.
        @echo ==============================================================