(no commit message)

[imagemagick] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0e26d599de78c2c19c6474dc3617675d25938fde..857f28fd8d458ff357b0a33a65dc35e84b7bc79b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+#  Copyright 1999-2012 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
@@ -17,10 +17,6 @@
 #  Top-Level Makefile for building ImageMagick.
 #
 
-AUTOMAKE_OPTIONS = 1.11 subdir-objects parallel-tests color-tests dist-zip dist-bzip2 dist-xz dist-lzma foreign
-
-topincludedir = @includedir@/ImageMagick
-
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 ACLOCAL_AMFLAGS = -I m4
@@ -66,28 +62,23 @@ else
 SRCDIR="$(srcdir)/"
 endif
 
+# Tests with .tap extensions use the TAP protocol and TAP driver
+LOG_COMPILER = $(SHELL)
+
+SH_LOG_COMPILER = $(LOG_COMPILER)
+TAP_LOG_COMPILER = $(LOG_COMPILER)
+
+# Test extensions
+TEST_EXTENSIONS = .sh .tap
+
+TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+       $(top_srcdir)/config/tap-driver.sh
+
 # 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@/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@' \
        MAKE="$(MAKE)" \
        MAKEFLAGS="$(MAKEFLAGS)" \
-       MEMCHECK="$(MEMCHECK)" \
-       PATH="@abs_top_builddir@/utilities:${PATH}" \
-       SRCDIR=$(SRCDIR)
-
-# Test extensions
-TEST_EXTENSIONS = .sh
+       MEMCHECK="$(MEMCHECK)"
 
 # Tests to run
 TESTS = \
@@ -187,11 +178,17 @@ endif
 
 all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINER_TARGETS)
 
-install-exec-local: $(PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS)
+install-exec-local: $(PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS) \
+       $(UTILITIES_INSTALL_EXEC_LOCAL_TARGETS)
 
-install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) $(HTML_INSTALL_DATA_TARGETS)
+install-data-local: $(MAGICK_INSTALL_DATA_LOCAL_TARGETS) \
+       $(PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS) \
+       $(HTML_INSTALL_DATA_TARGETS)
 
-uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) $(HTML_UNINSTALL_DATA_TARGETS)
+uninstall-local: $(MAGICK_UNINSTALL_LOCAL_TARGETS) \
+       $(PERLMAGICK_UNINSTALL_LOCAL_TARGETS) \
+       $(HTML_UNINSTALL_DATA_TARGETS) \
+       $(UTILITIES_UNINSTALL_LOCAL_TARGETS)
 
 clean-local: $(PERLMAGICK_CLEAN_LOCAL_TARGETS)
 
@@ -325,7 +322,7 @@ if RPM_DELEGATE
 
 DIST_ARCHIVE_SRPM=$(distdir)-1.src.rpm
 .PHONY: srpm
-$(DIST_ARCHIVE_SRPM) srpm: dist
+$(DIST_ARCHIVE_SRPM) srpm: dist-bzip2
        rm -f $(DIST_ARCHIVE_SRPM)
        $(RPM) --define="_sourcedir `pwd`" --define="_srcrpmdir `pwd`" --nodeps --bs ImageMagick.spec
        @echo ==============================================================