diff --git a/Makefile.am b/Makefile.am
index f0a2e48..888945a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -201,17 +201,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 --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 \
+ --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
@@ -315,9 +321,9 @@
#
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 ==============================================================
@@ -335,13 +341,12 @@
$(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
.PHONY: rpm
-rpm:
+rpm: dist
rm -rf $(RPMDIR)
$(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 ==============================================================
diff --git a/Makefile.in b/Makefile.in
index e47828e..4008271 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4613,7 +4613,7 @@
#
# RPM build support
#
-@RPM_DELEGATE_TRUE@DIST_ARCHIVE_SRPM = $(distdir).src.rpm
+@RPM_DELEGATE_TRUE@DIST_ARCHIVE_SRPM = $(distdir)-1.src.rpm
@RPM_DELEGATE_TRUE@RPMDIR = rpmbuild
@RPM_DELEGATE_TRUE@RPMARCH = $(MAGICK_TARGET_CPU)
@RPM_DELEGATE_FALSE@DIST_ARCHIVE_RPM =
@@ -11117,17 +11117,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 --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 \
+ --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
dist-hook:
( \
builddir=`pwd` ; \
@@ -11190,7 +11196,7 @@
@P7ZIP_DELEGATE_TRUE@ chmod 644 $(DIST_WINDOWS_SRC_7ZIP)
rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
@RPM_DELEGATE_TRUE@.PHONY: srpm
-@RPM_DELEGATE_TRUE@$(DIST_ARCHIVE_SRPM) srpm: dist-bzip2
+@RPM_DELEGATE_TRUE@$(DIST_ARCHIVE_SRPM) srpm: dist
@RPM_DELEGATE_TRUE@ rm -f $(DIST_ARCHIVE_SRPM)
@RPM_DELEGATE_TRUE@ $(RPM) --define="_sourcedir `pwd`" --define="_srcrpmdir `pwd`" --nodeps --bs ImageMagick.spec
@RPM_DELEGATE_TRUE@ @echo ==============================================================
@@ -11198,13 +11204,12 @@
@RPM_DELEGATE_TRUE@ @echo ==============================================================
@RPM_DELEGATE_TRUE@.PHONY: rpm
-@RPM_DELEGATE_TRUE@rpm:
+@RPM_DELEGATE_TRUE@rpm: dist
@RPM_DELEGATE_TRUE@ rm -rf $(RPMDIR)
@RPM_DELEGATE_TRUE@ $(MKDIR_P) $(RPMDIR)
@RPM_DELEGATE_TRUE@ $(MKDIR_P) $(RPMDIR)/BUILD
@RPM_DELEGATE_TRUE@ $(MKDIR_P) $(RPMDIR)/RPMS
@RPM_DELEGATE_TRUE@ $(RPM) --define="_sourcedir `pwd`" --define="_rpmdir `pwd`/$(RPMDIR)/RPMS" --define="_builddir `pwd`/$(RPMDIR)/BUILD" --nodeps -bb ImageMagick.spec
-@RPM_DELEGATE_TRUE@ rm -rf rpmbuild
@RPM_DELEGATE_TRUE@ @echo ==============================================================
@RPM_DELEGATE_TRUE@ @echo $(DIST_ARCHIVE_RPM) is ready for distribution.
@RPM_DELEGATE_TRUE@ @echo ==============================================================
diff --git a/config/configure.xml b/config/configure.xml
index 9ab1478..c33dc86 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,7 +10,7 @@
<configure name="LIB_VERSION" value="0x661"/>
<configure name="LIB_VERSION_NUMBER" value="6,6,1,5"/>
<configure name="RELEASE_DATE" value="2010-04-17"/>
- <configure name="CONFIGURE" value="./configure '--enable-maintainer-mode'"/>
+ <configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
<configure name="VERSION" value="6.6.1"/>