From 162bb22c0a612c065ea77a88136fcf8ded9159a9 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Sun, 26 Oct 2008 16:13:15 +0000 Subject: Imported Upstream version 4.3.99+cvs20051122.dfsg.1 --- src/cups/Makefile.am | 10 +++------ src/cups/Makefile.in | 58 ++++++++++------------------------------------------ src/cups/genppd.c | 10 ++++----- 3 files changed, 18 insertions(+), 60 deletions(-) (limited to 'src/cups') diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am index 1448f15..f4ffc06 100644 --- a/src/cups/Makefile.am +++ b/src/cups/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.81 2005/02/03 22:00:30 rleigh Exp $ +## $Id: Makefile.am,v 1.83 2005/11/22 14:43:05 rleigh Exp $ ## Copyright (C) 2000 Roger Leigh ## ## This program is free software; you can redistribute it and/or modify @@ -17,12 +17,8 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.4 gnu - @SET_MAKE@ -MAINT_CHARSET = latin1 - include $(top_srcdir)/scripts/global.mk @@ -119,11 +115,11 @@ endif install-data-local: $(INSTALL_DATA_LOCAL_DEPS) if test -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \ - $(mkinstalldirs) $(DESTDIR)$(cups_modeldir); \ + $(mkdir_p) $(DESTDIR)$(cups_modeldir); \ cd ppd ; \ for language in * ; do \ cd ..; \ - $(mkinstalldirs) $(DESTDIR)$(cups_modeldir)/$$language; \ + $(mkdir_p) $(DESTDIR)$(cups_modeldir)/$$language; \ cd ppd/$$language; \ for ppdfile in * ; do \ (cd ../..; $(INSTALL_DATA) ppd/$$language/$$ppdfile $(DESTDIR)$(cups_modeldir)/$$language) ; \ diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in index bb55b9e..f506b11 100644 --- a/src/cups/Makefile.in +++ b/src/cups/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ -SOURCES = $(canon_SOURCES) commandtocanon.c $(commandtoepson_SOURCES) $(cups_calibrate_SOURCES) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) $(epson_SOURCES) $(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -106,8 +104,8 @@ rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDE sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(sbin_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp -am__depfiles_maybe = depfiles +depcomp = +am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ @@ -142,8 +140,6 @@ pkgdatadir = $(cups_conf_datadir) pkglibdir = $(cups_conf_serverbin) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -181,7 +177,6 @@ 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@ CONVERT = @CONVERT@ CPP = @CPP@ @@ -194,14 +189,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@ CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@ CXX = @CXX@ CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DB2HTML = @DB2HTML@ DB2PDF = @DB2PDF@ DB2PS = @DB2PS@ DEFS = @DEFS@ -DEPDIR = @DEPDIR@ DIALOG = @DIALOG@ DOXYGEN = @DOXYGEN@ DVIPDF = @DVIPDF@ @@ -336,13 +329,8 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ -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@ +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @cups_bindir@ @@ -388,8 +376,6 @@ sbindir = @cups_sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -AUTOMAKE_OPTIONS = 1.4 gnu -MAINT_CHARSET = latin1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS) empty = pkgsysconfdir = $(cups_conf_serverroot) @@ -446,9 +432,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/cups/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps src/cups/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/cups/Makefile + $(AUTOMAKE) --gnu --ignore-deps src/cups/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -629,34 +615,14 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canon.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandtocanon.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandtoepson.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cups-calibrate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epson.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genppd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rastertoprinter.Po@am__quote@ - .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< + $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -822,7 +788,6 @@ clean-am: clean-binPROGRAMS clean-cupsexec_backendPROGRAMS \ clean-local clean-sbinPROGRAMS mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-libtool distclean-tags @@ -853,7 +818,6 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -924,11 +888,11 @@ cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@: $(top_b install-data-local: $(INSTALL_DATA_LOCAL_DEPS) if test -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \ - $(mkinstalldirs) $(DESTDIR)$(cups_modeldir); \ + $(mkdir_p) $(DESTDIR)$(cups_modeldir); \ cd ppd ; \ for language in * ; do \ cd ..; \ - $(mkinstalldirs) $(DESTDIR)$(cups_modeldir)/$$language; \ + $(mkdir_p) $(DESTDIR)$(cups_modeldir)/$$language; \ cd ppd/$$language; \ for ppdfile in * ; do \ (cd ../..; $(INSTALL_DATA) ppd/$$language/$$ppdfile $(DESTDIR)$(cups_modeldir)/$$language) ; \ diff --git a/src/cups/genppd.c b/src/cups/genppd.c index f7f6e62..c39d768 100644 --- a/src/cups/genppd.c +++ b/src/cups/genppd.c @@ -1,5 +1,5 @@ /* - * "$Id: genppd.c,v 1.107 2005/04/23 00:26:07 rlk Exp $" + * "$Id: genppd.c,v 1.109 2005/10/18 02:08:16 rlk Exp $" * * PPD file generation program for the CUPS drivers. * @@ -30,8 +30,6 @@ * Contents: * * main() - Process files on the command-line... - * initialize_stp_options() - Initialize the min/max values for - * each STP numeric option. * usage() - Show program usage. * help() - Show detailed program usage. * getlangs() - Get available translations. @@ -510,7 +508,7 @@ dirent_sort(const void *a, char ** getlangs(void) { - struct dirent** langdirs; + struct dirent** langdirs = NULL; int n; char **langs; @@ -1440,7 +1438,7 @@ write_ppd(const stp_printer_t *p, /* I - Printer driver */ } if (!desc.is_mandatory) gzprintf(fp, "*Stp%s None/None: \"\"\n", - desc.name, desc.deflt.dbl); + desc.name); else if (! printed_default_value) gzprintf(fp, "*Stp%s None/%.3f: \"\"\n", desc.name, desc.deflt.dbl); @@ -1709,5 +1707,5 @@ write_ppd(const stp_printer_t *p, /* I - Printer driver */ /* - * End of "$Id: genppd.c,v 1.107 2005/04/23 00:26:07 rlk Exp $". + * End of "$Id: genppd.c,v 1.109 2005/10/18 02:08:16 rlk Exp $". */ -- cgit v1.2.3