New upstream version 5.3.1

author: Didier Raboud <odyx@debian.org> 2018-09-25 08:33:05 +0200
committer: Didier Raboud <odyx@debian.org> 2018-09-25 08:33:05 +0200
commit: e50542121e724e851fc5d6c68bb773f80c0bc12c (patch)
tree: 655c3f6331a6e8fd8b09ceb4da8f5896484ae16a /include
parent: 9dd97a029bf391c42b1dc76f2f7c5e386bb8f466 (diff)
37 files changed, 525 insertions, 285 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 604dcd2..6fa4698 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -11,8 +11,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in.
 
diff --git a/include/Makefile.in b/include/Makefile.in
index 13a1e6a..19508b0 100644
--- a/include/Makefile.in
+++ b/include/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,22 +92,21 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/scripts/global.mk $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am
 subdir = include
 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 $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -136,7 +145,7 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
+	distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -157,6 +166,8 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -192,6 +203,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASH = @BASH@
+BASHREAL = @BASHREAL@
 BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BZIP2 = @BZIP2@
 CC = @CC@
@@ -212,7 +225,6 @@ DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DIALOG = @DIALOG@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
@@ -229,6 +241,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@
@@ -291,10 +304,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@
@@ -318,7 +333,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@
@@ -336,9 +350,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@
@@ -407,7 +423,6 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = gutenprint gutenprintui2
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
-GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
 
@@ -424,16 +439,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu include/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(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)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -549,7 +563,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -721,6 +738,8 @@ uninstall-am:
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 @SET_MAKE@
 
@@ -730,10 +749,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)
diff --git a/include/gutenprint/Makefile.am b/include/gutenprint/Makefile.am
index 466d01e..a5193a1 100644
--- a/include/gutenprint/Makefile.am
+++ b/include/gutenprint/Makefile.am
@@ -11,8 +11,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in.
 
@@ -25,29 +24,30 @@ include $(top_srcdir)/scripts/global.mk
 
 noinst_HEADERS = gutenprint-intl.h gutenprint-intl-internal.h
 
-pkginclude_HEADERS = \
-	gutenprint.h \
-	gutenprint-module.h \
-	array.h \
-	bit-ops.h \
-	channel.h \
-	color.h \
-	curve-cache.h \
-	curve.h \
-	dither.h \
-	image.h \
-	list.h \
-	module.h \
-	mxml.h \
-	paper.h \
-	path.h \
-	printers.h \
-	sequence.h \
-	string-list.h \
-	types.h \
-	util.h \
-	vars.h \
-	weave.h \
+pkginclude_HEADERS =				\
+	gutenprint.h				\
+	gutenprint-module.h			\
+	array.h					\
+	bit-ops.h				\
+	channel.h				\
+	color.h					\
+	curve-cache.h				\
+	curve.h					\
+	dither.h				\
+	image.h					\
+	list.h					\
+	module.h				\
+	mxml.h					\
+	paper.h					\
+	path.h					\
+	printers.h				\
+	refcache.h				\
+	sequence.h				\
+	string-list.h				\
+	types.h					\
+	util.h					\
+	vars.h					\
+	weave.h					\
 	xml.h
 
 nodist_pkginclude_HEADERS = gutenprint-version.h
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index 8d2c372..4d5be3f 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/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,
@@ -20,7 +20,17 @@
 #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 \
       ?) ;; \
@@ -83,23 +93,22 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/scripts/global.mk $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(srcdir)/gutenprint-version.h.in \
-	$(noinst_HEADERS) $(pkginclude_HEADERS)
 subdir = include/gutenprint
 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 $(noinst_HEADERS) \
+	$(pkginclude_HEADERS) $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = gutenprint-version.h
@@ -173,6 +182,9 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/gutenprint-version.h.in \
+	$(top_srcdir)/scripts/global.mk
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -183,6 +195,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASH = @BASH@
+BASHREAL = @BASHREAL@
 BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BZIP2 = @BZIP2@
 CC = @CC@
@@ -203,7 +217,6 @@ DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DIALOG = @DIALOG@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
@@ -220,6 +233,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@
@@ -282,10 +296,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@
@@ -309,7 +325,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@
@@ -327,9 +342,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@
@@ -397,31 +414,31 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
-GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 noinst_HEADERS = gutenprint-intl.h gutenprint-intl-internal.h
 pkginclude_HEADERS = \
-	gutenprint.h \
-	gutenprint-module.h \
-	array.h \
-	bit-ops.h \
-	channel.h \
-	color.h \
-	curve-cache.h \
-	curve.h \
-	dither.h \
-	image.h \
-	list.h \
-	module.h \
-	mxml.h \
-	paper.h \
-	path.h \
-	printers.h \
-	sequence.h \
-	string-list.h \
-	types.h \
-	util.h \
-	vars.h \
-	weave.h \
+	gutenprint.h				\
+	gutenprint-module.h			\
+	array.h					\
+	bit-ops.h				\
+	channel.h				\
+	color.h					\
+	curve-cache.h				\
+	curve.h					\
+	dither.h				\
+	image.h					\
+	list.h					\
+	module.h				\
+	mxml.h					\
+	paper.h					\
+	path.h					\
+	printers.h				\
+	refcache.h				\
+	sequence.h				\
+	string-list.h				\
+	types.h					\
+	util.h					\
+	vars.h					\
+	weave.h					\
 	xml.h
 
 nodist_pkginclude_HEADERS = gutenprint-version.h
@@ -444,16 +461,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/gutenprint/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu include/gutenprint/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(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)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -566,7 +582,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -720,6 +739,8 @@ uninstall-am: uninstall-nodist_pkgincludeHEADERS \
 	tags tags-am uninstall uninstall-am \
 	uninstall-nodist_pkgincludeHEADERS uninstall-pkgincludeHEADERS
 
+.PRECIOUS: Makefile
+
 
 @SET_MAKE@
 
@@ -729,10 +750,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)
diff --git a/include/gutenprint/array.h b/include/gutenprint/array.h
index c01b768..8e90587 100644
--- a/include/gutenprint/array.h
+++ b/include/gutenprint/array.h
@@ -13,8 +13,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
@@ -159,6 +158,70 @@ extern int stp_array_get_point(const stp_array_t *array, int x, int y,
    */
 extern const stp_sequence_t *stp_array_get_sequence(const stp_array_t *array);
 
+/**
+ * Write an array to a file.
+ * The printable representation is guaranteed to contain only 7-bit
+ * printable ASCII characters, and is null-terminated.  The array will
+ * not contain any space, newline, single quote, or comma characters.
+ * Furthermore, a printed array will be read back correctly in all locales.
+ * These calls are not guaranteed to provide more than 6 decimal places
+ * of precision or +/-0.5e-6 accuracy, whichever is less.
+ * @warning NOTE that these calls are not thread-safe!  These
+ * routines may manipulate the locale to achieve a safe
+ * representation.
+ * @param file the file to write.
+ * @param array the array to use.
+ * @returns 1 on success, 0 on failure.
+ */
+extern int stp_array_write(FILE *file, const stp_array_t *array);
+
+/**
+ * Write an array to a string.
+ * The printable representation is guaranteed to contain only 7-bit
+ * printable ASCII characters, and is null-terminated.  The array will
+ * not contain any space, newline, or comma characters.  Furthermore,
+ * a printed array will be read back correctly in all locales.
+ * These calls are not guaranteed to provide more than 6 decimal places
+ * of precision or +/-0.5e-6 accuracy, whichever is less.
+ * @warning NOTE that these calls are not thread-safe!  These
+ * routines may manipulate the locale to achieve a safe
+ * representation.
+ * @param array the array to use.
+ * @returns a pointer to a string.  This is allocated on the heap, and
+ * it is the caller's responsibility to free it.
+ */
+extern char *stp_array_write_string(const stp_array_t *array);
+
+/**
+ * Create an array from a stream.
+ * @warning NOTE that these calls are not thread-safe!  These
+ * routines may manipulate the locale to achieve a safe
+ * representation.
+ * @param fp the stream to read.
+ * @returns the newly created array, or NULL if an error occurred.
+ */
+extern stp_array_t *stp_array_create_from_stream(FILE* fp);
+
+/**
+ * Create an array from a stream.
+ * @warning NOTE that these calls are not thread-safe!  These
+ * routines may manipulate the locale to achieve a safe
+ * representation.
+ * @param file the file to read.
+ * @returns the newly created array, or NULL if an error occurred.
+ */
+extern stp_array_t *stp_array_create_from_file(const char* file);
+
+/**
+ * Create an array from a string.
+ * @warning NOTE that these calls are not thread-safe!  These
+ * routines may manipulate the locale to achieve a safe
+ * representation.
+ * @param string the string to read.
+ * @returns the newly created array, or NULL if an error occurred.
+ */
+extern stp_array_t *stp_array_create_from_string(const char* string);
+
   /** @} */
 
 #ifdef __cplusplus
diff --git a/include/gutenprint/bit-ops.h b/include/gutenprint/bit-ops.h
index 4cee3c0..7af6978 100644
--- a/include/gutenprint/bit-ops.h
+++ b/include/gutenprint/bit-ops.h
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/include/gutenprint/channel.h b/include/gutenprint/channel.h
index 0886b69..cc0d476 100644
--- a/include/gutenprint/channel.h
+++ b/include/gutenprint/channel.h
@@ -16,8 +16,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * Revision History:
  *
@@ -82,6 +81,7 @@ extern void stp_channel_convert(const stp_vars_t *v, unsigned *zero_mask);
 extern unsigned short * stp_channel_get_input(const stp_vars_t *v);
 
 extern unsigned short * stp_channel_get_output(const stp_vars_t *v);
+extern unsigned char * stp_channel_get_output_8bit(const stp_vars_t *v);
 
 #ifdef __cplusplus
   }
diff --git a/include/gutenprint/color.h b/include/gutenprint/color.h
index 8c1f3cf..296bf65 100644
--- a/include/gutenprint/color.h
+++ b/include/gutenprint/color.h
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/include/gutenprint/curve-cache.h b/include/gutenprint/curve-cache.h
index 2a68831..8ae147a 100644
--- a/include/gutenprint/curve-cache.h
+++ b/include/gutenprint/curve-cache.h
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/include/gutenprint/curve.h b/include/gutenprint/curve.h
index 50de3c4..c106943 100644
--- a/include/gutenprint/curve.h
+++ b/include/gutenprint/curve.h
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/include/gutenprint/dither.h b/include/gutenprint/dither.h
index 22ec34e..73f3ab7 100644
--- a/include/gutenprint/dither.h
+++ b/include/gutenprint/dither.h
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * Revision History:
  *
diff --git a/include/gutenprint/gutenprint-intl-internal.h b/include/gutenprint/gutenprint-intl-internal.h
index dbffca8..4ed2a62 100644
--- a/include/gutenprint/gutenprint-intl-internal.h
+++ b/include/gutenprint/gutenprint-intl-internal.h
@@ -16,8 +16,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/include/gutenprint/gutenprint-intl.h b/include/gutenprint/gutenprint-intl.h
index add28d1..1a17b5a 100644
--- a/include/gutenprint/gutenprint-intl.h
+++ b/include/gutenprint/gutenprint-intl.h
@@ -16,8 +16,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/include/gutenprint/gutenprint-module.h b/include/gutenprint/gutenprint-module.h
index 8717d03..f5d2803 100644
--- a/include/gutenprint/gutenprint-module.h
+++ b/include/gutenprint/gutenprint-module.h
@@ -16,8 +16,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * Revision History:
  *
diff --git a/include/gutenprint/gutenprint-version.h.in b/include/gutenprint/gutenprint-version.h.in
index 62b25b8..124ba5c 100644
--- a/include/gutenprint/gutenprint-version.h.in
+++ b/include/gutenprint/gutenprint-version.h.in
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * Revision History:
  *
diff --git a/include/gutenprint/gutenprint.h b/include/gutenprint/gutenprint.h
index 9d99879..a43773d 100644
--- a/include/gutenprint/gutenprint.h
+++ b/include/gutenprint/gutenprint.h
@@ -16,8 +16,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * Revision History:
  *
@@ -51,6 +50,7 @@ extern "C" {
 #include <gutenprint/image.h>
 #include <gutenprint/paper.h>
 #include <gutenprint/printers.h>
+#include <gutenprint/refcache.h>
 #include <gutenprint/sequence.h>
 #include <gutenprint/string-list.h>
 #include <gutenprint/util.h>
diff --git a/include/gutenprint/image.h b/include/gutenprint/image.h
index ff08b3e..510b708 100644
--- a/include/gutenprint/image.h
+++ b/include/gutenprint/image.h
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/include/gutenprint/list.h b/include/gutenprint/list.h
index d352ace..e13f0a6 100644
--- a/include/gutenprint/list.h
+++ b/include/gutenprint/list.h
@@ -17,8 +17,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/include/gutenprint/module.h b/include/gutenprint/module.h
index 0554091..5ae2b92 100644
--- a/include/gutenprint/module.h
+++ b/include/gutenprint/module.h
@@ -17,8 +17,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/include/gutenprint/mxml.h b/include/gutenprint/mxml.h
index cb107f5..e1abb41 100644
--- a/include/gutenprint/mxml.h
+++ b/include/gutenprint/mxml.h
@@ -153,6 +153,7 @@ extern stp_mxml_node_t	*stp_mxmlNewDimension(stp_mxml_node_t *parent,
 					      stp_dimension_t real);
 extern stp_mxml_node_t	*stp_mxmlNewText(stp_mxml_node_t *parent, int whitespace,
 			             const char *string);
+extern stp_mxml_node_t	*stp_mxmlParent(stp_mxml_node_t *node);
 extern void		stp_mxmlRemove(stp_mxml_node_t *node);
 extern char		*stp_mxmlSaveAllocString(stp_mxml_node_t *node,
 			        	     int (*cb)(stp_mxml_node_t *, int));
diff --git a/include/gutenprint/paper.h b/include/gutenprint/paper.h
index e0ee713..0f5869e 100644
--- a/include/gutenprint/paper.h
+++ b/include/gutenprint/paper.h
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
@@ -63,20 +62,18 @@ typedef enum
   /** Standard paper size */
   PAPERSIZE_TYPE_STANDARD = 0,
   /** Envelope */
-  PAPERSIZE_TYPE_ENVELOPE,
-  /** Special (not normally displayed) */
-  PAPERSIZE_TYPE_SPECIAL
+  PAPERSIZE_TYPE_ENVELOPE
 } stp_papersize_type_t;
 
 /** The papersize data type. */
 typedef struct
 {
   /** Short unique name (not translated). */
-  char *name;
+  const char *name;
   /** Long descriptive name (translated). */
-  char *text;
+  const char *text;
   /** Comment. */
-  char *comment;
+  const char *comment;
   /** Paper width. */
   stp_dimension_t width;
   /** Paper height. */
@@ -96,45 +93,13 @@ typedef struct
 } stp_papersize_t;
 
 /**
- * Get the number of available papersizes.
- * @returns the number of papersizes.
- */
-extern int stp_known_papersizes(void);
-
-/**
  * Get a papersize by name.
+ * @param v the Gutenprint vars object
  * @param name the short unique name of the paper.
  * @returns a static pointer to the papersize, or NULL on failure.
  */
-extern const stp_papersize_t *stp_get_papersize_by_name(const char *name);
-
-/**
- * Get a papersize by size.
- * The nearest available size to the size requested will be found.
- * Only paper sizes within 5 points of width and height will be considered.
- * @param length the length of the paper.
- * @param width the width of the paper
- * @returns a static pointer to the papersize, or NULL on failure.
- */
-extern const stp_papersize_t *stp_get_papersize_by_size(stp_dimension_t length,
-							stp_dimension_t width);
-
-/**
- * Get a papersize by size if an exact match is found.
- * @param length the length of the paper.
- * @param width the width of the paper
- * @returns a static pointer to the papersize, or NULL on failure.
- */
-extern const stp_papersize_t *stp_get_papersize_by_size_exact(stp_dimension_t length,
-							      stp_dimension_t width);
-
-/**
- * Get a papersize by its index number.
- * @param idx the index number.  This must not be greater than (total
- * number of papers - 1).
- * @returns a static pointer to the papersize, or NULL on failure.
- */
-extern const stp_papersize_t *stp_get_papersize_by_index(int idx);
+extern const stp_papersize_t *stp_describe_papersize(const stp_vars_t *v,
+						     const char *name);
 
 /**
  * Get the default paper dimensions for the current configuration.
diff --git a/include/gutenprint/path.h b/include/gutenprint/path.h
index ffa7f1b..bd52133 100644
--- a/include/gutenprint/path.h
+++ b/include/gutenprint/path.h
@@ -16,8 +16,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
@@ -44,12 +43,28 @@ extern stp_list_t *stp_path_search(stp_list_t *dirlist,
 extern void stp_path_split(stp_list_t *list,
 			   const char *path);
 
-extern stp_list_t *stpi_data_path(void);
+/*
+ * Split a path (colon-separated list of strings) into
+ * its components.  The components may be anything that does not contain
+ * a token.
+ */
+extern stp_list_t *stp_generate_path(const char *path);
+
+extern stp_list_t *stp_data_path(void);
 
 extern stp_list_t *stpi_list_files_on_data_path(const char *name);
 
+/*
+ * Join a path and filename together.
+ */
 extern char *stpi_path_merge(const char *path, const char *file);
 
+/*
+ * Find the first occurrence of <file> on <path>.
+ * File must be a plain file and readable.
+ * Return value must be freed
+ */
+extern char *stp_path_find_file(const char *path, const char *file);
 
 #ifdef __cplusplus
   }
diff --git a/include/gutenprint/printers.h b/include/gutenprint/printers.h
index 3506e72..7801e40 100644
--- a/include/gutenprint/printers.h
+++ b/include/gutenprint/printers.h
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
@@ -90,14 +89,6 @@ extern const stp_printer_t *stp_get_printer_by_driver(const char *driver);
 extern const stp_printer_t *stp_get_printer_by_device_id(const char *device_id);
 
 /**
- * Get a printer model by its foomatic ID.
- * @param foomatic_id the printer model's foomatic ID
- * @returns a pointer to the printer model, or NULL on failure.  The
- * pointer should not be freed.
- */
-extern const stp_printer_t *stp_get_printer_by_foomatic_id(const char *foomatic_id);
-
-/**
  * Get the printer model from a vars object.
  * @param v the vars to use.
  * @returns a pointer to the printer model, or NULL on failure.  The
@@ -151,13 +142,6 @@ extern const char *stp_printer_get_family(const stp_printer_t *p);
 extern const char *stp_printer_get_manufacturer(const stp_printer_t *p);
 
 /**
- * Get a printer model's foomatic ID
- * @param p the printer model to use.
- * @returns the foomatic ID or NULL (should never be freed)
- */
-extern const char *stp_printer_get_foomatic_id(const stp_printer_t *p);
-
-/**
  * Get a printer model's comment string
  * @param p the printer model to use.
  * @returns the comments or NULL (should never be freed)
@@ -240,44 +224,10 @@ extern int stp_end_job(const stp_vars_t *v, stp_image_t *image);
  */
 extern stp_string_list_t *stp_get_external_options(const stp_vars_t *v);
 
-typedef struct
-{
-  stp_parameter_list_t (*list_parameters)(const stp_vars_t *v);
-  void  (*parameters)(const stp_vars_t *v, const char *name,
-		      stp_parameter_t *);
-  void  (*media_size)(const stp_vars_t *v, stp_dimension_t *width,
-		      stp_dimension_t *height);
-  void  (*imageable_area)(const stp_vars_t *v, stp_dimension_t *left,
-			  stp_dimension_t *right, stp_dimension_t *bottom,
-			  stp_dimension_t *top);
-  void  (*maximum_imageable_area)(const stp_vars_t *v, stp_dimension_t *left,
-				  stp_dimension_t *right, stp_dimension_t *bottom,
-				  stp_dimension_t *top);
-  void  (*limit)(const stp_vars_t *v, stp_dimension_t *max_width,
-		 stp_dimension_t *max_height, stp_dimension_t *min_width,
-		 stp_dimension_t *min_height);
-  int   (*print)(const stp_vars_t *v, stp_image_t *image);
-  void  (*describe_resolution)(const stp_vars_t *v, stp_resolution_t *x,
-			       stp_resolution_t *y);
-  const char *(*describe_output)(const stp_vars_t *v);
-  int   (*verify)(stp_vars_t *v);
-  int   (*start_job)(const stp_vars_t *v, stp_image_t *image);
-  int   (*end_job)(const stp_vars_t *v, stp_image_t *image);
-  stp_string_list_t *(*get_external_options)(const stp_vars_t *v);
-} stp_printfuncs_t;
-
-typedef struct stp_family
-{
-  const stp_printfuncs_t *printfuncs;   /* printfuncs for the printer */
-  stp_list_t             *printer_list; /* list of printers */
-} stp_family_t;
-
 extern int stp_get_model_id(const stp_vars_t *v);
 
 extern int stp_verify_printer_params(stp_vars_t *v);
 
-extern int stp_family_register(stp_list_t *family);
-extern int stp_family_unregister(stp_list_t *family);
 extern void stp_initialize_printer_defaults(void);
 
 extern stp_parameter_list_t stp_printer_list_parameters(const stp_vars_t *v);
diff --git a/include/gutenprint/refcache.h b/include/gutenprint/refcache.h
new file mode 100644
index 0000000..e4270f9
--- /dev/null
+++ b/include/gutenprint/refcache.h
@@ -0,0 +1,101 @@
+/*
+ *   libgutenprint reference cache
+ *
+ *   Copyright 2017 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the Free
+ *   Software Foundation; either version 2 of the License, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *   for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @file gutenprint/refcache.h
+ * @brief A simple reference cache
+ */
+
+#ifndef GUTENPRINT_REFCACHE_H
+#define GUTENPRINT_REFCACHE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gutenprint/string-list.h>
+
+/**
+ * Create a new object cache
+ * @param name The name of the cache to create
+ * @returns True if created, false if cache already exists.
+ */
+
+extern int stp_refcache_create(const char *name);
+
+/**
+ * Find an item in a cache
+ * @param cache the cache to use.
+ * @param item the name of the item to cache
+ * @returns item if exists, NULL otherwise
+ */
+extern void *stp_refcache_find_item(const char *cache, const char *item);
+
+/**
+ * Add an item to a cache
+ * @param cache the cache to use or create.
+ * @param item the name of the item to cache
+ * @param data pointer to the data item to store
+ * @returns true if item added; false if already exists
+ */
+extern int stp_refcache_add_item(const char *cache, const char *item, void *data);
+
+/**
+ * Remove an item from cache.  The item's data is not freed.  If cache
+ * or item does not exist this is a no-op.
+ * @param cache the cache to use.
+ * @param item the name of the item to remove from cache
+ */
+extern void stp_refcache_remove_item(const char *cache, const char *item);
+
+/**
+ * Replace an item's data, or add if it doesn't exist.
+ * The old data (if any) is not freed.  Fails if cache does not already exist.
+ * @param cache the cache to use.
+ * @param item the name of the item to add/update.
+ * @param data the data to be added/updated for the cached item.
+ */
+extern void stp_refcache_replace_item(const char *cache, const char *item,
+				      void *data);
+
+/**
+ * Destroy a cache.  The individual items are not freed.  If cache does not
+ * exist this is a no-op.
+ * @param cache the cache to destroy.
+ */
+extern void stp_refcache_destroy(const char *cache);
+
+/**
+ * Return a static list of all caches in existence.
+ * @returns list of caches in existence
+ */
+extern const stp_string_list_t *stp_refcache_list_caches(void);
+
+/**
+ * Return a static list of items in a specified cache
+ * @param cache name of cache
+ * @returns list of items in cache or NULL if cache does not exist
+ */
+extern const stp_string_list_t *stp_refcache_list_cache_items(const char *cache);
+
+#ifdef __cplusplus
+  }
+#endif
+
+#endif /* GUTENPRINT_REFCACHE_H */
diff --git a/include/gutenprint/sequence.h b/include/gutenprint/sequence.h
index 2e0bf01..0f2edca 100644
--- a/include/gutenprint/sequence.h
+++ b/include/gutenprint/sequence.h
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/include/gutenprint/string-list.h b/include/gutenprint/string-list.h
index 07a9ea9..2431857 100644
--- a/include/gutenprint/string-list.h
+++ b/include/gutenprint/string-list.h
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/include/gutenprint/types.h b/include/gutenprint/types.h
index f3de460..3b84062 100644
--- a/include/gutenprint/types.h
+++ b/include/gutenprint/types.h
@@ -14,12 +14,11 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
- * @file gutenprint/types
+ * @file gutenprint/types.h
  * @brief Gutenprint dimension type declarations
  */
 
@@ -31,7 +30,9 @@ extern "C" {
 #endif
 
 typedef double stp_dimension_t;
+#define STP_DABS fabs
 typedef int stp_resolution_t;
+#define STP_RABS abs
 
 #ifdef __cplusplus
   }
diff --git a/include/gutenprint/util.h b/include/gutenprint/util.h
index 27c701d..57ee637 100644
--- a/include/gutenprint/util.h
+++ b/include/gutenprint/util.h
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
@@ -47,7 +46,8 @@ extern "C" {
 
 /**
  * Initialise libgimpprint.
- * This function must be called prior to any other use of the library.
+ * This function must be called prior to any other use of the library
+ * except as specifically noted.
  * It is responsible for loading modules and XML data and initialising
  * internal data structures.
  * @returns 0 on success, 1 on failure.
@@ -55,6 +55,62 @@ extern "C" {
 extern int stp_init(void);
 
 /**
+ * Set global error output function.  This may be called prior to
+ * stp_init().
+ * @param val function to perform error output.  Default is to write to stderr.
+ */
+extern void stp_set_global_errfunc(stp_outfunc_t val);
+
+/**
+ * Get global error output function.  This may be called prior to
+ * stp_init().
+ * @returns current global output function; null if default.
+ */
+extern stp_outfunc_t stp_get_global_errfunc(void);
+
+/**
+ * Set global debug output function.  This may be called prior to
+ * stp_init().
+ * @param val function to perform debug output.  Default is to write to stderr
+ */
+extern void stp_set_global_dbgfunc(stp_outfunc_t val);
+
+/**
+ * Get global debug output function.  This may be called prior to
+ * stp_init().
+ * @returns current global output function; null if default.
+ */
+extern stp_outfunc_t stp_get_global_dbgfunc(void);
+
+/**
+ * Set global error output data.  This may be called prior to
+ * stp_init().
+ * @param val data (e. g. FILE * or file descriptor) to perform error output.
+ */
+extern void stp_set_global_errdata(void * val);
+
+/**
+ * Get global error output data.  This may be called prior to
+ * stp_init().
+ * @returns current global output data; null if default.
+ */
+extern void * stp_get_global_errdata(void);
+
+/**
+ * Set global debug output data.  This may be called prior to
+ * stp_init().
+ * @param val data (e. g. FILE * or file descriptor) to perform debug output.
+ */
+extern void stp_set_global_dbgdata(void *val);
+
+/**
+ * Get global debug output data.  This may be called prior to
+ * stp_init().
+ * @returns current global output data; null if default.
+ */
+extern void * stp_get_global_dbgdata(void);
+
+/**
  * Set the output encoding.  This function sets the encoding that all
  * strings translated by gettext are output in.  It is a wrapper
  * around the gettext bind_textdomain_codeset() function.
@@ -132,6 +188,9 @@ extern void stp_catprintf(char **strp, const char *format, ...)
 #define STP_DBG_NO_COMPRESSION	0x400000
 #define STP_DBG_ASSERTIONS	0x800000
 #define STP_DBG_DPL		0x1000000
+#define STP_DBG_ESCP2_XML	0x2000000
+#define STP_DBG_ARRAY_ERRORS	0x4000000
+#define STP_DBG_STATIC_TIME	0x8000000
 
 extern unsigned long stp_get_debug_level(void);
 extern void stp_dprintf(unsigned long level, const stp_vars_t *v,
diff --git a/include/gutenprint/vars.h b/include/gutenprint/vars.h
index cff7071..399009d 100644
--- a/include/gutenprint/vars.h
+++ b/include/gutenprint/vars.h
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
@@ -206,6 +205,13 @@ typedef const void *stp_const_parameter_list_t;
  */
 typedef void (*stp_outfunc_t) (void *data, const char *buffer, size_t bytes);
 
+/**
+ * Print an stp_vars_t in debugging format.
+ * @param v stp_vars_t to dump
+ * @param prefix Prefix to prepend to each line (null pointer gives
+ *        empty prefix)
+ */
+extern void stp_vars_print_error(const stp_vars_t *v, const char *prefix);
 
 /****************************************************************
 *                                                               *
@@ -389,7 +395,7 @@ extern void stp_set_outfunc(stp_vars_t *v, stp_outfunc_t val);
 extern stp_outfunc_t stp_get_outfunc(const stp_vars_t *v);
 
 /**
- * Set the function used to print error and diagnostic information.
+ * Set the function used to print error information.
  * These must be supplied by the caller.  errdata is passed as an
  * arguments to errfunc; typically it will be a file descriptor.
  * @param v the vars to use.
@@ -405,6 +411,22 @@ extern void stp_set_errfunc(stp_vars_t *v, stp_outfunc_t val);
 extern stp_outfunc_t stp_get_errfunc(const stp_vars_t *v);
 
 /**
+ * Set the function used to print diagnostic information.
+ * These must be supplied by the caller.  dbgdata is passed as an
+ * arguments to dbgfunc; typically it will be a file descriptor.
+ * @param v the vars to use.
+ * @param val the value to set.
+ */
+extern void stp_set_dbgfunc(stp_vars_t *v, stp_outfunc_t val);
+
+/**
+ * Get the function used to print output information.
+ * @param v the vars to use.
+ * @returns the outfunc.
+ */
+extern stp_outfunc_t stp_get_dbgfunc(const stp_vars_t *v);
+
+/**
  * Set the output data.
  * @param v the vars to use.
  * @param val the output data.  This will typically be a file
@@ -437,6 +459,22 @@ extern void stp_set_errdata(stp_vars_t *v, void *val);
 extern void *stp_get_errdata(const stp_vars_t *v);
 
 /**
+ * Set the debug output data.
+ * @param v the vars to use.
+ * @param val the debug data.  This will typically be a file
+ * descriptor, but it is entirely up to the caller exactly what type
+ * this might be.
+ */
+extern void stp_set_dbgdata(stp_vars_t *v, void *val);
+
+/**
+ * Get the debug output data.
+ * @param v the vars to use.
+ * @returns the output data.
+ */
+extern void *stp_get_dbgdata(const stp_vars_t *v);
+
+/**
  * Merge defaults for a printer with user-chosen settings.
  * @deprecated This is likely to go away.
  * @param user the destination vars.
diff --git a/include/gutenprint/weave.h b/include/gutenprint/weave.h
index 6f7202e..eec5e01 100644
--- a/include/gutenprint/weave.h
+++ b/include/gutenprint/weave.h
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * Revision History:
  *
diff --git a/include/gutenprint/xml.h b/include/gutenprint/xml.h
index 19afd8f..966ff73 100644
--- a/include/gutenprint/xml.h
+++ b/include/gutenprint/xml.h
@@ -16,8 +16,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
@@ -81,6 +80,26 @@ extern void stp_vars_fill_from_xmltree_ref(stp_mxml_node_t *da,
 extern stp_mxml_node_t *stp_xmltree_create_from_vars(const stp_vars_t *v);
 
 extern void stp_xml_parse_file_named(const char *name);
+extern stp_mxml_node_t *stp_xml_parse_file_from_path(const char *name,
+						     const char *topnodename,
+						     const char *path);
+extern stp_mxml_node_t *stp_xml_parse_file_from_path_uncached(const char *name,
+							      const char *topnodename,
+							      const char *path);
+/*
+ * Abort if we don't find the matching file
+ * It is not necessary to check that the return is not NULL
+ */
+extern stp_mxml_node_t *stp_xml_parse_file_from_path_safe(const char *name,
+							  const char *topnodename,
+							  const char *path);
+extern stp_mxml_node_t *stp_xml_parse_file_from_path_uncached_safe(const char *name,
+								   const char *topnodename,
+								   const char *path);
+
+extern void stp_xml_free_parsed_file(stp_mxml_node_t *node);
+
+extern void stpi_print_xml_node(stp_mxml_node_t *node);
 
 #ifdef __cplusplus
 }
diff --git a/include/gutenprintui2/Makefile.am b/include/gutenprintui2/Makefile.am
index 9e6692e..4850526 100644
--- a/include/gutenprintui2/Makefile.am
+++ b/include/gutenprintui2/Makefile.am
@@ -11,8 +11,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in.
 
diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in
index 1dead4b..692a4e3 100644
--- a/include/gutenprintui2/Makefile.in
+++ b/include/gutenprintui2/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,
@@ -20,7 +20,17 @@
 #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,22 +92,22 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/scripts/global.mk $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(am__pkginclude_HEADERS_DIST)
 subdir = include/gutenprintui2
 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 $(am__pkginclude_HEADERS_DIST) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -171,6 +181,8 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/scripts/global.mk
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgincludedir = $(includedir)/gutenprintui2
 ACLOCAL = @ACLOCAL@
@@ -182,6 +194,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASH = @BASH@
+BASHREAL = @BASHREAL@
 BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BZIP2 = @BZIP2@
 CC = @CC@
@@ -202,7 +216,6 @@ DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DIALOG = @DIALOG@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
@@ -219,6 +232,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@
@@ -281,10 +295,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@
@@ -308,7 +324,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@
@@ -326,9 +341,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@
@@ -396,7 +413,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
-GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 stpui_public_h_sources = \
 	gutenprintui.h		\
 	curve.h			\
@@ -426,16 +442,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/gutenprintui2/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu include/gutenprintui2/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(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)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -525,7 +540,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -675,6 +693,8 @@ uninstall-am: uninstall-pkgincludeHEADERS
 	ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-pkgincludeHEADERS
 
+.PRECIOUS: Makefile
+
 
 @SET_MAKE@
 
@@ -684,10 +704,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)
diff --git a/include/gutenprintui2/curve.h b/include/gutenprintui2/curve.h
index ccfa912..291f2f2 100644
--- a/include/gutenprintui2/curve.h
+++ b/include/gutenprintui2/curve.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <https://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/include/gutenprintui2/gammacurve.h b/include/gutenprintui2/gammacurve.h
index 5b538bf..02ed28b 100644
--- a/include/gutenprintui2/gammacurve.h
+++ b/include/gutenprintui2/gammacurve.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <https://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/include/gutenprintui2/gutenprintui.h b/include/gutenprintui2/gutenprintui.h
index 730888d..eaa91ae 100644
--- a/include/gutenprintui2/gutenprintui.h
+++ b/include/gutenprintui2/gutenprintui.h
@@ -16,8 +16,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  *
  * Revision History:
@@ -34,8 +33,10 @@ extern "C" {
 
 
 #ifdef __GNUC__
+#ifndef inline
 #define inline __inline__
 #endif
+#endif
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstrict-prototypes"
diff --git a/include/gutenprintui2/typebuiltins.h b/include/gutenprintui2/typebuiltins.h
index 921b899..f8c4101 100644
--- a/include/gutenprintui2/typebuiltins.h
+++ b/include/gutenprintui2/typebuiltins.h
@@ -1,5 +1,5 @@
 
-
+/* This file is generated by glib-mkenums, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */
 
 #ifndef GUTENPRINTUI_TYPE_BUILTINS_H
 #define GUTENPRINTUI_TYPE_BUILTINS_H
@@ -7,17 +7,17 @@
 #include <glib-object.h>
 
 G_BEGIN_DECLS
+/* enumerations from "curve.h" */
+GType stpui_curve_type_get_type (void);
+#define STPUI_TYPE_CURVE_TYPE (stpui_curve_type_get_type())
 /* enumerations from "gutenprintui.h" */
 GType orient_t_orient_t_get_type (void);
 #define STPUI_TYPE_ORIENT_T (orient_t_orient_t_get_type())
 GType command_t_command_t_get_type (void);
 #define STPUI_TYPE_COMMAND_T (command_t_command_t_get_type())
-/* enumerations from "curve.h" */
-GType stpui_curve_type_get_type (void);
-#define STPUI_TYPE_CURVE_TYPE (stpui_curve_type_get_type())
 G_END_DECLS
 
 #endif /* GUTENPRINTUI_TYPE_BUILTINS_H */
 
-
+/* Generated data ends here */
author	Didier Raboud <odyx@debian.org>	2018-09-25 08:33:05 +0200
committer	Didier Raboud <odyx@debian.org>	2018-09-25 08:33:05 +0200
commit	e50542121e724e851fc5d6c68bb773f80c0bc12c (patch)
tree	655c3f6331a6e8fd8b09ceb4da8f5896484ae16a /include
parent	9dd97a029bf391c42b1dc76f2f7c5e386bb8f466 (diff)