X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=Makefile.am;h=8843b3611ddbdeec545aaa36e58ff6057c984c2a;hb=d48f07c4fcdc6c74b501311425930b717de75043;hp=c6ca184b7ec6dd8cd6fbd0d97409ca7d89c3ceb3;hpb=999b6470f3620c44c55bd1ed8956de6dd1d02c88;p=imagemagick

diff --git a/Makefile.am b/Makefile.am
index c6ca184b7..8843b3611 100644
--- 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
@@ -33,12 +33,12 @@ MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -shared -module -av
 # compiler, headers, and libraries are used as for a normal build.
 DISTCHECK_CONFIGURE_FLAGS=$(DISTCHECK_CONFIG_FLAGS)
 
-DISTCLEANFILES = _configs.sed magick/magick-config.h
+DISTCLEANFILES = _configs.sed MagickCore/magick-config.h
 
 ## Make sure these will be cleaned even when they're not built by default.
 CLEANFILES = \
 	$(LTDL_CLEANFILES) \
-	$(WAND_CLEANFILES) \
+	$(MAGICKWAND_CLEANFILES) \
 	$(MAGICKPP_CLEANFILES) \
 	$(UTILITIES_CLEANFILES) \
 	$(TESTS_CLEANFILES)
@@ -48,8 +48,8 @@ bin_PROGRAMS = \
 
 # Binary scripts
 bin_SCRIPTS = \
-	$(MAGICK_BIN_SCRPTS) \
-	$(WAND_BIN_SCRPTS) \
+	$(MAGICKCORE_BIN_SCRPTS) \
+	$(MAGICKWAND_BIN_SCRPTS) \
 	$(MAGICKPP_SCRPTS)
 
 include_HEADERS = \
@@ -58,7 +58,7 @@ include_HEADERS = \
 # Headers which are not installed but which are distributed
 noinst_HEADERS = \
 	$(LIBLTDL_NOINST_HDRS) \
-	$(MAGICK_NOINST_HDRS)
+	$(MAGICKCORE_NOINST_HDRS)
 
 if WIN32_NATIVE_BUILD
 SRCDIR='$(shell @WinPathScript@ $(srcdir)/)'
@@ -68,15 +68,15 @@ 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" \
-	LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}" \
+	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@/MagickCore/.libs:${LD_LIBRARY_PATH}" \
 	MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@' \
 	MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@' \
 	MAGICK_FILTER_MODULE_PATH='@MAGICK_FILTER_MODULE_PATH@' \
@@ -93,7 +93,7 @@ TEST_EXTENSIONS = .sh
 TESTS = \
 	$(TESTS_TESTS) \
 	$(MAGICKPP_TESTS) \
-	$(WAND_TESTS) \
+	$(MAGICKWAND_TESTS) \
 	$(UTILITIES_TESTS)
 
 # Tests which are expected to fail
@@ -125,8 +125,8 @@ TOP_EXTRA_DIST = \
 EXTRA_DIST = \
 	$(TOP_EXTRA_DIST) \
 	$(CONFIG_EXTRA_DIST) \
-	$(MAGICK_EXTRA_DIST) \
-	$(WAND_EXTRA_DIST) \
+	$(MAGICKCORE_EXTRA_DIST) \
+	$(MAGICKWAND_EXTRA_DIST) \
 	$(MAGICKPP_EXTRA_DIST) \
 	$(UTILITIES_EXTRA_DIST) \
 	$(TESTS_EXTRA_DIST)
@@ -141,16 +141,16 @@ MOSTLYCLEANFILES =
 check_PROGRAMS = \
 	$(TESTS_CHECK_PGRMS) \
 	$(MAGICKPP_CHECK_PGRMS) \
-	$(WAND_CHECK_PGRMS)
+	$(MAGICKWAND_CHECK_PGRMS)
 
 include m4/Makefile.am
 include config/Makefile.am
 include ltdl/Makefile.inc
 include coders/Makefile.am
-include magick/Makefile.am
-include filters/Makefile.am
-include wand/Makefile.am
+include MagickCore/Makefile.am
+include MagickWand/Makefile.am
 include Magick++/Makefile.am
+include filters/Makefile.am
 include utilities/Makefile.am
 include tests/Makefile.am
 include PerlMagick/Makefile.am
@@ -160,19 +160,19 @@ pkgconfigdir = $(libdir)/pkgconfig
 
 # Files to install in Pkgconfig directory
 pkgconfig_DATA = \
-	$(MAGICK_PKGCONFIG) \
-	$(WAND_PKGCONFIG) \
+	$(MAGICKCORE_PKGCONFIG) \
+	$(MAGICKWAND_PKGCONFIG) \
 	$(MAGICKPP_PKGCONFIG)
 
 # Manual pages to install
 man_MANS = \
-	$(MAGICK_MANS) \
-	$(WAND_MANS) \
+	$(MAGICKCORE_MANS) \
+	$(MAGICKWAND_MANS) \
 	$(MAGICKPP_MANS) \
 	$(UTILITIES_MANS)
 
 # Architecture independent data files installed in the package's data directory
-docdir = $(SHARE_PATH)
+docdir = $(DOCUMENTATION_PATH)
 doc_DATA = \
 	LICENSE \
 	ChangeLog \
@@ -201,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
 
@@ -233,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)
@@ -254,16 +262,16 @@ uninstall-data-html:
 	  rm -f -r $(DESTDIR)$(pkgdocdir)/$$dir ; \
 	done
 
-# Ensure that version.h at $(srcdir)/magick/version.h is kept up to date.
-magick-version: magick/version.h
+# Ensure that version.h at $(srcdir)/MagickCore/version.h is kept up to date.
+magick-version: MagickCore/version.h
 	@if test -f "$(srcdir)/VisualMagick/installer/inc/version.isx.in" ; then \
 	  ./config.status --file="$(srcdir)/../VisualMagick/installer/inc/version.isx" 2> /dev/null ; \
 	fi
 	@if test -n "$(VPATH)" ; then \
-	  cmp magick/version.h $(srcdir)/magick/version.h > /dev/null ; \
+	  cmp MagickCore/version.h $(srcdir)/MagickCore/version.h > /dev/null ; \
           if test $$? -eq 1 ; then \
-	    echo "Updating $(srcdir)/magick/version.h ..."; \
-	    cp magick/version.h $(srcdir)/magick/version.h ; \
+	    echo "Updating $(srcdir)/MagickCore/version.h ..."; \
+	    cp MagickCore/version.h $(srcdir)/MagickCore/version.h ; \
 	  fi ; \
 	fi ; \
 	touch magick-version
@@ -315,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 \
@@ -335,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 ==============================================================
@@ -358,4 +364,4 @@ snapshot: distcheck
 	$(MAKE) $(DIST_ARCHIVE_SRPM)
 	$(MAKE) $(DIST_WINDOWS_SRC_ZIP)
 	$(MAKE) $(DIST_WINDOWS_SRC_7ZIP)
-	mv $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) /var/ftp/pub/ImageMagick/beta/
+	mv $(DIST_ARCHIVES) $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) $(DIST_ARCHIVE_SRPM) /var/ftp/pub/ImageMagick/alpha/