New upstream version 5.3.1

1 files changed, 165 insertions, 92 deletions

diff --git a/Makefile.in b/Makefile.in
index b87a166..18b54d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -19,7 +19,17 @@
 #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
 #export STP_DATA_PATH = $(top_srcdir)/src/xml
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -82,30 +92,22 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/scripts/global.mk INSTALL NEWS README \
-	AUTHORS ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in ABOUT-NLS COPYING \
-	$(top_srcdir)/scripts/compile \
-	$(top_srcdir)/scripts/config.guess \
-	$(top_srcdir)/scripts/config.rpath \
-	$(top_srcdir)/scripts/config.sub \
-	$(top_srcdir)/scripts/install-sh \
-	$(top_srcdir)/scripts/ltmain.sh $(top_srcdir)/scripts/missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -146,7 +148,7 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
+	cscope distdir distdir-am dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
@@ -169,6 +171,15 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(top_srcdir)/scripts/compile \
+	$(top_srcdir)/scripts/config.guess \
+	$(top_srcdir)/scripts/config.rpath \
+	$(top_srcdir)/scripts/config.sub \
+	$(top_srcdir)/scripts/global.mk \
+	$(top_srcdir)/scripts/install-sh \
+	$(top_srcdir)/scripts/ltmain.sh $(top_srcdir)/scripts/missing \
+	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -205,8 +216,8 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 GZIP_ENV = --best
-DIST_ARCHIVES = $(distdir).tar.bz2
-DIST_TARGETS = dist-bzip2
+DIST_ARCHIVES = $(distdir).tar.bz2 $(distdir).tar.xz
+DIST_TARGETS = dist-xz dist-bzip2
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -220,6 +231,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASH = @BASH@
+BASHREAL = @BASHREAL@
 BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BZIP2 = @BZIP2@
 CC = @CC@
@@ -240,7 +253,6 @@ DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DIALOG = @DIALOG@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
@@ -257,6 +269,7 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FIND = @FIND@
 GENPPD_LIBS = @GENPPD_LIBS@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GIMP2_CFLAGS = @GIMP2_CFLAGS@
 GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
@@ -319,10 +332,12 @@ LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
+MINIMAL_PRINTERS_TO_TEST = @MINIMAL_PRINTERS_TO_TEST@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -346,7 +361,6 @@ PKGROOT = @PKGROOT@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
@@ -364,9 +378,11 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XZ = @XZ@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+ZPAQ = @ZPAQ@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -435,9 +451,19 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4 -I m4local
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
-GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 SUBDIRS = include src samples test po man doc scripts
 DISTDIRS = m4 m4extra
+
+#################################################################
+#			       TESTING				#
+#################################################################
+CPUS = `scripts/count-cpus`
+
+# STP_PROFILE=full
+MAKECHECK = STP_TEST_SUITE=1 /usr/bin/time make -k -s -j$(CPUS) DISTCHECK_CONFIGURE_FLAGS=NO_PKGCONFIG_PATHS=1 check
+MAKEDISTCHECK = STP_TEST_SUITE=1 STP_TEST_DIST=1 /usr/bin/time make -k -s -j$(CPUS) DISTCHECK_CONFIGURE_FLAGS=NO_PKGCONFIG_PATHS=1 distcheck
+MAKECHECK_PARALLEL = STP_PARALLEL=$(CPUS) $(MAKECHECK)
+MAKEDISTCHECK_PARALLEL = STP_PARALLEL=$(CPUS) $(MAKEDISTCHECK)
 CLEANSCRIPTS = \
 	scripts/depcomp \
 	scripts/install-sh \
@@ -483,7 +509,6 @@ MAINTAINERCLEANFILES = \
 	aclocal.m4 \
 	config.h.in \
 	configure \
-	configure.in \
 	Makefile.in \
 	stamp-h.in \
 	stamp-h1.in \
@@ -514,17 +539,16 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;
-$(top_srcdir)/scripts/global.mk:
+$(top_srcdir)/scripts/global.mk $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -536,8 +560,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -665,7 +689,10 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@case `sed 15q $(srcdir)/NEWS` in \
 	*"$(VERSION)"*) : ;; \
 	*) \
@@ -739,7 +766,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
@@ -748,17 +775,22 @@ dist-bzip2: distdir
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__post_remove_distdir)
-
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -776,7 +808,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -786,22 +818,23 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -899,12 +932,14 @@ distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags
+	distclean-libtool distclean-local distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
+html: html-recursive
+
 html-am:
 
 info: info-recursive
@@ -949,8 +984,12 @@ mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
+pdf: pdf-recursive
+
 pdf-am:
 
+ps: ps-recursive
+
 ps-am:
 
 uninstall-am:
@@ -963,16 +1002,19 @@ uninstall-am:
 	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
 	dist-tarZ dist-xz dist-zip distcheck distclean \
 	distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-am uninstall uninstall-am
+	distclean-local distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
+
+.PRECIOUS: Makefile
 
 
 @SET_MAKE@
@@ -983,10 +1025,6 @@ $(top_builddir)/src/main/libgutenprint.la:
 	cd $(top_builddir)/src/main; \
 	$(MAKE)
 
-$(top_builddir)/src/gutenprintui/libgutenprintui.la:
-	cd $(top_builddir)/src/gutenprintui; \
-	$(MAKE)
-
 $(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
 	cd $(top_builddir)/src/gutenprintui2; \
 	$(MAKE)
@@ -1000,7 +1038,7 @@ libtool: $(LIBTOOL_DEPS)
 # access, and because it usually runs as superuser rather than the user
 # who normally builds Gutenprint.
 install-data-local: NEWS AUTHORS COPYING README
-	$(mkdir_p) $(DESTDIR)$(docdir)
+	$(MKDIR_P) $(DESTDIR)$(docdir)
 	$(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(docdir)
 	$(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(docdir)
 	$(INSTALL_DATA) $(srcdir)/AUTHORS $(DESTDIR)$(docdir)
@@ -1013,21 +1051,14 @@ install-data-local: NEWS AUTHORS COPYING README
 # live branches from that time) to save a lot of diffs.
 
 ChangeLog:
-	if [ -d .git -a -f ChangeLog.pre-5.3 ] ; then \
+	if [ -d .git -a -f ChangeLog.pre-5.2.11 ] ; then \
 	  $(MAKE) -C scripts mkgitlog; \
-	  scripts/mkgitlog -i ChangeLog.pre-5.3 -r gutenprint-5_3-OPEN > ChangeLog; \
+	  scripts/mkgitlog -i ChangeLog.pre-5.2.11 -r gutenprint-5_2_11 > ChangeLog; \
 	fi
 
-configure.in:
-	$(LN_S) $(srcdir)/configure.ac $(srcdir)/configure.in
-
 dist-time-check:
-	@current_date=`date +%Y%m%d`; \
-	configure_date=`ls -l --time-style=+%Y%m%d $(top_builddir)/configure | awk '{print $$6}'`; \
-	echo "Checking that 'configure' was built today."; \
-	if test "$$current_date" != "$$configure_date" ; then \
-	  echo "configure is out of date -- rerun ./autogen.sh first!"; \
-	  exit 1; \
+	@if [ "$(top_srcdir)/configure" -ot "$(top_srcdir)/configure.ac" ] ; then \
+	  echo "*** configure is out of date (older than configure.ac) -- rerun ./autogen.sh first!"; exit 1; \
 	fi
 
 git-version-stamp:
@@ -1044,39 +1075,81 @@ dist-hook: dist-time-check git-version-stamp
 	    done \
 	  fi \
 	done
-# Remove configure.in (libtool bug workaround)
-	$(RM) -f $(distdir)/configure.in
 # Remove any backup files found in distdir
 	$(FIND) $(distdir) -name '.*' -print | xargs $(RM) -rf
 	$(FIND) $(distdir) -name '#*' -print | xargs $(RM) -rf
 	$(FIND) $(distdir) -name '*~' -print | xargs $(RM) -rf
 
-install-cups: all
-	cd src/cups ; \
-	$(MAKE) install
+snapshot: scripts/gversion git-version-stamp
+	$(MAKE) dist distdir=$(PACKAGE)-`scripts/gversion`-`date +"%Y%m%d"`
 
-install-gimp: all
-	cd src/gimp ; \
-	$(MAKE) install
+# ...but we can't do
+# AM_TESTS_ENVIRONMENT=STP_PARALLEL=$(shell scripts/count-cpus)
+# because $(shell...) is (still only) a GNU extension, which we
+# want to avoid.  And we can't do
+# AM_TESTS_ENVIRONMENT=STP_PARALLEL=`scripts/count-cpus`
+# because all expansions are lazy, so anything not in the root directory
+# won't find the script.  And we can't even do
+# AM_TESTS_ENVIRONMENT=STP_PARALLEL=`(at)TOP_BUILDDIR(at)scripts/count-cpus`
+# because TOP_BUILDDIR itself is a relative path.  And, just to make it
+# even more fun, we won't be able to do
+# AM_TESTS_ENVIRONMENT!=
+# syntax even if POSIX approves it because it's only present in GNU make 4,
+# but Apple doesn't use that.
 
-docs:
-	cd doc ; \
-	$(MAKE) docs
+check-parallel: scripts/count-cpus
+	$(MAKECHECK_PARALLEL)
 
-html:
-	cd doc ; \
-	$(MAKE) html
+check-minimal: scripts/count-cpus
+	STP_TEST_PROFILE=minimal $(MAKECHECK_PARALLEL)
 
-ps:
-	cd doc ; \
-	$(MAKE) ps
+check-fast: scripts/count-cpus
+	STP_TEST_PROFILE=fast $(MAKECHECK_PARALLEL)
 
-pdf:
-	cd doc ; \
-	$(MAKE) pdf
+check-full: scripts/count-cpus
+	STP_TEST_PROFILE=full $(MAKECHECK_PARALLEL)
 
-snapshot: scripts/gversion git-version-stamp
-	$(MAKE) dist distdir=$(PACKAGE)-`scripts/gversion`-`date +"%Y%m%d"`
+check-valgrind-minimal: scripts/count-cpus
+	STP_TEST_PROFILE=valgrind_minimal $(MAKECHECK_PARALLEL)
+
+check-valgrind-fast: scripts/count-cpus
+	STP_TEST_PROFILE=valgrind_fast $(MAKECHECK_PARALLEL)
+
+check-valgrind: scripts/count-cpus
+	STP_TEST_PROFILE=valgrind $(MAKECHECK_PARALLEL)
+
+distcheck-parallel: scripts/count-cpus
+	$(MAKEDISTCHECK_PARALLEL)
+
+distcheck-minimal: scripts/count-cpus
+	STP_TEST_PROFILE=minimal $(MAKEDISTCHECK_PARALLEL)
+
+distcheck-fast: scripts/count-cpus
+	STP_TEST_PROFILE=fast $(MAKEDISTCHECK_PARALLEL)
+
+distcheck-full: scripts/count-cpus
+	STP_TEST_PROFILE=full $(MAKEDISTCHECK_PARALLEL)
+
+distcheck-valgrind-minimal: scripts/count-cpus
+	STP_TEST_PROFILE=valgrind_minimal $(MAKEDISTCHECK_PARALLEL)
+
+distcheck-valgrind-fast: scripts/count-cpus
+	STP_TEST_PROFILE=valgrind_fast $(MAKEDISTCHECK_PARALLEL)
+
+distcheck-valgrind: scripts/count-cpus
+	STP_TEST_PROFILE=valgrind $(MAKEDISTCHECK_PARALLEL)
+
+checksums: scripts/count-cpus
+	STP_PARALLEL=$(CPUS) make -C src/testpattern checksums-release
+
+build-release: scripts/build-release scripts/count-cpus
+	STP_PARALLEL=$(CPUS) /usr/bin/time scripts/build-release
+
+sanity: scripts/build-release scripts/count-cpus
+	STP_PARALLEL=$(CPUS) /usr/bin/time scripts/build-release preflight check_git check_git_builds
+
+distclean-local:
+	-rm -f config.summary
 
 .PHONY: deb html install-cups install-gimp snapshot ChangeLog Phony dist-time-check git-version-stamp