diff options
author | Roger Leigh <rleigh@debian.org> | 2008-10-26 16:18:09 +0000 |
---|---|---|
committer | Roger Leigh <rleigh@debian.org> | 2008-10-26 16:18:09 +0000 |
commit | f9238b191d14686b9beba78893dff0a8dff9c087 (patch) | |
tree | f563eacc3307021378e7c50d4c1ee4797a2392dc /include/gutenprint | |
parent | cda0fb3b8a7cb56045b24fd0af0ed36591b5d7eb (diff) |
Imported Upstream version 5.0.2
Diffstat (limited to 'include/gutenprint')
-rw-r--r-- | include/gutenprint/Makefile.in | 138 | ||||
-rw-r--r-- | include/gutenprint/printers.h | 17 | ||||
-rw-r--r-- | include/gutenprint/util.h | 5 |
3 files changed, 67 insertions, 93 deletions
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in index dc8850a..d2a08b8 100644 --- a/include/gutenprint/Makefile.in +++ b/include/gutenprint/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,15 +19,11 @@ #export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main #export STP_DATA_PATH = $(top_srcdir)/src/main -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -79,51 +75,13 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_CUPS_1_2_FALSE = @BUILD_CUPS_1_2_FALSE@ -BUILD_CUPS_1_2_TRUE = @BUILD_CUPS_1_2_TRUE@ -BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@ BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@ -BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@ -BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@ -BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@ -BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@ -BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@ -BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@ -BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@ -BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@ -BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@ -BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@ -BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@ -BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@ -BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@ -BUILD_GIMP2_AS_GUTENPRINT_FALSE = @BUILD_GIMP2_AS_GUTENPRINT_FALSE@ -BUILD_GIMP2_AS_GUTENPRINT_TRUE = @BUILD_GIMP2_AS_GUTENPRINT_TRUE@ -BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@ -BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@ -BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@ -BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@ -BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@ -BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@ -BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@ -BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@ -BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@ -BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@ -BUILD_SIMPLIFIED_CUPS_PPDS_FALSE = @BUILD_SIMPLIFIED_CUPS_PPDS_FALSE@ -BUILD_SIMPLIFIED_CUPS_PPDS_TRUE = @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@ -BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@ -BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@ -BUILD_TEST_FALSE = @BUILD_TEST_FALSE@ -BUILD_TEST_TRUE = @BUILD_TEST_TRUE@ -BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@ -BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -133,8 +91,6 @@ CPPFLAGS = @CPPFLAGS@ CUPS_CFLAGS = @CUPS_CFLAGS@ CUPS_CONFIG = @CUPS_CONFIG@ CUPS_LIBS = @CUPS_LIBS@ -CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@ -CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ CXX = @CXX@ CXXCPP = @CXXCPP@ @@ -215,14 +171,11 @@ GUTENPRINT_VERSION = @GUTENPRINT_VERSION@ IJS_CFLAGS = @IJS_CFLAGS@ IJS_CONFIG = @IJS_CONFIG@ IJS_LIBS = @IJS_LIBS@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@ -INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@ -INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@ INTLLIBS = @INTLLIBS@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ @@ -242,9 +195,8 @@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ @@ -263,27 +215,26 @@ POSUB = @POSUB@ RANLIB = @RANLIB@ RELEASE_DATE = @RELEASE_DATE@ RM = @RM@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TEST = @TEST@ TEXI2HTML = @TEXI2HTML@ -USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@ -USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@ +TRUE = @TRUE@ USE_NLS = @USE_NLS@ -USE_NLS_FALSE = @USE_NLS_FALSE@ -USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ WHICH_PPDS = @WHICH_PPDS@ XGETTEXT = @XGETTEXT@ YACC = @YACC@ YFLAGS = @YFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -295,6 +246,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ cups_bindir = @cups_bindir@ cups_conf_datadir = @cups_conf_datadir@ cups_conf_serverbin = @cups_conf_serverbin@ @@ -340,8 +292,11 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) noinst_HEADERS = gutenprint-intl.h gutenprint-intl-internal.h pkginclude_HEADERS = \ @@ -414,13 +369,9 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-nodist_pkgincludeHEADERS: $(nodist_pkginclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -437,7 +388,7 @@ uninstall-nodist_pkgincludeHEADERS: done install-pkgincludeHEADERS: $(pkginclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" @list='$(pkginclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -502,23 +453,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../scripts - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -534,7 +483,7 @@ check: check-am all-am: Makefile $(HEADERS) installdirs: for dir in "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgincludedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -568,8 +517,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-am @@ -584,12 +532,20 @@ info-am: install-data-am: install-nodist_pkgincludeHEADERS \ install-pkgincludeHEADERS +install-dvi: install-dvi-am + 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 + installcheck-am: maintainer-clean: maintainer-clean-am @@ -608,21 +564,25 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-nodist_pkgincludeHEADERS \ +uninstall-am: uninstall-nodist_pkgincludeHEADERS \ uninstall-pkgincludeHEADERS +.MAKE: install-am install-strip + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool ctags distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ install-info-am install-man install-nodist_pkgincludeHEADERS \ - install-pkgincludeHEADERS install-strip installcheck \ + install-pdf install-pdf-am install-pkgincludeHEADERS \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am \ - uninstall-nodist_pkgincludeHEADERS uninstall-pkgincludeHEADERS + uninstall-am uninstall-nodist_pkgincludeHEADERS \ + uninstall-pkgincludeHEADERS @SET_MAKE@ diff --git a/include/gutenprint/printers.h b/include/gutenprint/printers.h index 18019e9..97aae75 100644 --- a/include/gutenprint/printers.h +++ b/include/gutenprint/printers.h @@ -1,5 +1,5 @@ /* - * "$Id: printers.h,v 1.3 2006/04/17 02:06:18 rlk Exp $" + * "$Id: printers.h,v 1.3.8.1 2007/12/15 20:35:35 rlk Exp $" * * libgimpprint printer functions. * @@ -33,6 +33,7 @@ extern "C" { #endif +#include <gutenprint/string-list.h> #include <gutenprint/list.h> #include <gutenprint/vars.h> @@ -184,6 +185,17 @@ extern int stp_start_job(const stp_vars_t *v, stp_image_t *image); */ extern int stp_end_job(const stp_vars_t *v, stp_image_t *image); +/** + * Retrieve options that need to be passed to the underlying print + * system. + * @param v the vars to use. + * @returns list of options in a string list ('name' is the name + * of the option; 'text' is the value it takes on). NULL return means + * no external options are required. User must stp_string_list_destroy + * the list after use. + */ +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); @@ -202,6 +214,7 @@ typedef struct 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 @@ -234,5 +247,5 @@ const char *stp_describe_output(const stp_vars_t *v); #endif /* GUTENPRINT_PRINTERS_H */ /* - * End of "$Id: printers.h,v 1.3 2006/04/17 02:06:18 rlk Exp $". + * End of "$Id: printers.h,v 1.3.8.1 2007/12/15 20:35:35 rlk Exp $". */ diff --git a/include/gutenprint/util.h b/include/gutenprint/util.h index a146af4..a3089bb 100644 --- a/include/gutenprint/util.h +++ b/include/gutenprint/util.h @@ -1,5 +1,5 @@ /* - * "$Id: util.h,v 1.3.2.1 2007/03/02 12:01:13 rlk Exp $" + * "$Id: util.h,v 1.3.2.2 2007/12/15 20:35:35 rlk Exp $" * * libgimpprint utility and miscellaneous functions. * @@ -128,6 +128,7 @@ extern void stp_catprintf(char **strp, const char *format, ...) #define STP_DBG_OLYMPUS 0x40000 #define STP_DBG_CURVE 0x80000 #define STP_DBG_CURVE_ERRORS 0x100000 +#define STP_DBG_PPD 0x200000 extern unsigned long stp_get_debug_level(void); extern void stp_dprintf(unsigned long level, const stp_vars_t *v, @@ -178,5 +179,5 @@ extern const char *stp_get_release_version(void); #endif /* GUTENPRINT_UTIL_H */ /* - * End of "$Id: util.h,v 1.3.2.1 2007/03/02 12:01:13 rlk Exp $". + * End of "$Id: util.h,v 1.3.2.2 2007/12/15 20:35:35 rlk Exp $". */ |