Update dependencies and fix a compile issue.

Also fix a restart bug associated with STR #1976.

cups/md5passwd.c:
    - Include http-private.h for md5.h.

scheduler/printers.c:
    - cupsdUpdatePrinters(): Update the policy pointer before
      setting the attributes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@5966 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/backend/Dependencies b/backend/Dependencies
index 0683438215fa3c6d726017c3911864132fce4f32..230eaf91a517215d31aa5bafcf39663c5927e7c2 100644 (file)
--- a/backend/Dependencies
+++ b/backend/Dependencies
@@ -9,18 +9,16 @@ lpd.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
 lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
 lpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 lpd.o: ../cups/string.h
-pap.o: ../cups/http.h ../cups/md5.h
+pap.o: ../cups/http.h
 parallel.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
-parallel.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h
-parallel.o: ../cups/string.h ../config.h
+parallel.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+parallel.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 scsi.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-scsi.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-scsi.o: ../cups/language.h ../cups/string.h ../config.h
+scsi.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+scsi.o: ../cups/string.h ../config.h
 serial.o: backend-private.h ../cups/backend.h ../cups/cups.h ../cups/ipp.h
-serial.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
-serial.o: ../config.h
+serial.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+serial.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 snmp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
 snmp.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
 snmp.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
@@ -32,8 +30,8 @@ socket.o: ../cups/backend.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
 socket.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
 test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h
 test1284.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-test1284.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-test1284.o: ../cups/language.h ../cups/debug.h
+test1284.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+test1284.o: ../cups/debug.h
 usb.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-usb.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-usb.o: ../cups/language.h ../cups/string.h ../config.h
+usb.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+usb.o: ../cups/string.h ../config.h

diff --git a/berkeley/Dependencies b/berkeley/Dependencies
index 767d33e1c4b8af7ca7165ccbabd92463af23ed04..2c5dd988d7d669018a621574291973ecaa169ddd 100644 (file)
--- a/berkeley/Dependencies
+++ b/berkeley/Dependencies
@@ -1,16 +1,14 @@
 # DO NOT DELETE
 
-lpc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-lpc.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-lpc.o: ../cups/i18n.h ../cups/transcode.h ../cups/debug.h ../cups/string.h
-lpc.o: ../config.h
+lpc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+lpc.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h
+lpc.o: ../cups/transcode.h ../cups/debug.h ../cups/string.h ../config.h
 lpq.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpq.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-lpq.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h
-lpq.o: ../cups/debug.h
+lpq.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lpq.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h
 lpr.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpr.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-lpr.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h
-lprm.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-lprm.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-lprm.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+lpr.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lpr.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
+lprm.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+lprm.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h
+lprm.o: ../cups/transcode.h ../cups/string.h ../config.h

diff --git a/cgi-bin/Dependencies b/cgi-bin/Dependencies
index 7e976859d166872c8eaf3ff9e0100f7a38c797df..e87f276b8e7730286f6d30644398c2a8f0f3bfdc 100644 (file)
--- a/cgi-bin/Dependencies
+++ b/cgi-bin/Dependencies
@@ -1,57 +1,56 @@
 # DO NOT DELETE
 
 help-index.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-help-index.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-help-index.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-help-index.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-help-index.o: ../cups/dir.h
+help-index.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+help-index.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
+help-index.o: ../cups/transcode.h ../cups/string.h ../config.h ../cups/dir.h
 html.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-html.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-html.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-html.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+html.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+html.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
+html.o: ../cups/transcode.h ../cups/string.h ../config.h
 ipp-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-ipp-var.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-ipp-var.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-ipp-var.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+ipp-var.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+ipp-var.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
+ipp-var.o: ../cups/transcode.h ../cups/string.h ../config.h
 search.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-search.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-search.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-search.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+search.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+search.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
+search.o: ../cups/transcode.h ../cups/string.h ../config.h
 template.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-template.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-template.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-template.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+template.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+template.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
+template.o: ../cups/transcode.h ../cups/string.h ../config.h
 var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-var.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-var.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-var.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+var.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+var.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
+var.o: ../cups/transcode.h ../cups/string.h ../config.h
 admin.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-admin.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-admin.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-admin.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-admin.o: ../cups/adminutil.h ../cups/cups.h ../cups/file.h
+admin.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+admin.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
+admin.o: ../cups/transcode.h ../cups/string.h ../config.h ../cups/adminutil.h
+admin.o: ../cups/cups.h ../cups/file.h
 classes.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-classes.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-classes.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-classes.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+classes.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+classes.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
+classes.o: ../cups/transcode.h ../cups/string.h ../config.h
 help.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-help.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-help.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-help.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+help.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+help.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
+help.o: ../cups/transcode.h ../cups/string.h ../config.h
 jobs.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-jobs.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-jobs.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-jobs.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+jobs.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+jobs.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
+jobs.o: ../cups/transcode.h ../cups/string.h ../config.h
 printers.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-printers.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-printers.o: ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
-printers.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-testcgi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-testcgi.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-testcgi.o: ../cups/array.h help-index.h
-testhi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-testhi.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-testhi.o: ../cups/array.h help-index.h
+printers.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+printers.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
+printers.o: ../cups/transcode.h ../cups/string.h ../config.h
+testcgi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+testcgi.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/array.h
+testcgi.o: help-index.h
+testhi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+testhi.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/array.h
+testhi.o: help-index.h
 testtemplate.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testtemplate.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+testtemplate.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
 testtemplate.o: ../cups/language.h ../cups/array.h help-index.h

diff --git a/cups/Dependencies b/cups/Dependencies
index fed499957e3cf06c485f8d421ecaab6badd6ff8f..4121f5a21d966016895f8dc440c14d15418a6139 100644 (file)
--- a/cups/Dependencies
+++ b/cups/Dependencies
@@ -1,14 +1,14 @@
 # DO NOT DELETE
 
-adminutil.o: adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
-adminutil.o: language.h globals.h string.h ../config.h http-private.h
+adminutil.o: adminutil.h cups.h ipp.h http.h ppd.h array.h file.h language.h
+adminutil.o: globals.h string.h ../config.h http-private.h md5.h
 adminutil.o: ipp-private.h i18n.h transcode.h debug.h
 array.o: array.h string.h ../config.h debug.h
 attr.o: ppd.h array.h file.h debug.h string.h ../config.h
 auth.o: globals.h string.h ../config.h http-private.h http.h md5.h
 auth.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
 auth.o: transcode.h debug.h
-backchannel.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
+backchannel.o: cups.h ipp.h http.h ppd.h array.h file.h language.h
 backend.o: backend.h string.h ../config.h
 custom.o: globals.h string.h ../config.h http-private.h http.h md5.h
 custom.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
@@ -18,8 +18,8 @@ dest.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
 dest.o: transcode.h
 dir.o: dir.h string.h ../config.h debug.h
 emit.o: ppd.h array.h file.h string.h ../config.h debug.h
-encode.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
-encode.o: ipp-private.h string.h ../config.h debug.h
+encode.o: cups.h ipp.h http.h ppd.h array.h file.h language.h ipp-private.h
+encode.o: string.h ../config.h debug.h
 file.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
 file.o: string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
 file.o: debug.h
@@ -56,14 +56,15 @@ language.o: transcode.h debug.h
 localize.o: globals.h string.h ../config.h http-private.h http.h md5.h
 localize.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
 localize.o: transcode.h debug.h
-mark.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
+mark.o: cups.h ipp.h http.h ppd.h array.h file.h language.h string.h
 mark.o: ../config.h debug.h
 md5.o: md5.h string.h ../config.h
-md5passwd.o: http.h md5.h string.h ../config.h
+md5passwd.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
+md5passwd.o: string.h
 notify.o: globals.h string.h ../config.h http-private.h http.h md5.h
 notify.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
 notify.o: transcode.h
-options.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
+options.o: cups.h ipp.h http.h ppd.h array.h file.h language.h string.h
 options.o: ../config.h debug.h
 page.o: ppd.h array.h file.h string.h ../config.h
 ppd.o: globals.h string.h ../config.h http-private.h http.h md5.h
@@ -86,27 +87,26 @@ usersys.o: transcode.h debug.h
 util.o: globals.h string.h ../config.h http-private.h http.h md5.h
 util.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
 util.o: transcode.h debug.h
-testadmin.o: adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
-testadmin.o: language.h string.h ../config.h
+testadmin.o: adminutil.h cups.h ipp.h http.h ppd.h array.h file.h language.h
+testadmin.o: string.h ../config.h
 testarray.o: ../cups/string.h ../config.h string.h array.h dir.h debug.h
 testfile.o: string.h ../config.h file.h debug.h
-testhttp.o: http.h md5.h string.h ../config.h
+testhttp.o: http.h string.h ../config.h
 testi18n.o: i18n.h transcode.h language.h array.h string.h ../config.h
 testipp.o: ../cups/string.h ../config.h string.h ipp-private.h ipp.h http.h
-testipp.o: md5.h
 testlang.o: i18n.h transcode.h language.h array.h
 testppd.o: ../cups/string.h ../config.h string.h ppd.h array.h file.h
 # DO NOT DELETE
 
-adminutil.32.o: adminutil.c  adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
-adminutil.32.o: adminutil.c  language.h globals.h string.h ../config.h http-private.h
+adminutil.32.o: adminutil.c  adminutil.h cups.h ipp.h http.h ppd.h array.h file.h language.h
+adminutil.32.o: adminutil.c  globals.h string.h ../config.h http-private.h md5.h
 adminutil.32.o: adminutil.c  ipp-private.h i18n.h transcode.h debug.h
 array.32.o: array.c  array.h string.h ../config.h debug.h
 attr.32.o: attr.c  ppd.h array.h file.h debug.h string.h ../config.h
 auth.32.o: auth.c  globals.h string.h ../config.h http-private.h http.h md5.h
 auth.32.o: auth.c  ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
 auth.32.o: auth.c  transcode.h debug.h
-backchannel.32.o: backchannel.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
+backchannel.32.o: backchannel.c  cups.h ipp.h http.h ppd.h array.h file.h language.h
 backend.32.o: backend.c  backend.h string.h ../config.h
 custom.32.o: custom.c  globals.h string.h ../config.h http-private.h http.h md5.h
 custom.32.o: custom.c  ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
@@ -116,8 +116,8 @@ dest.32.o: dest.c  ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i1
 dest.32.o: dest.c  transcode.h
 dir.32.o: dir.c  dir.h string.h ../config.h debug.h
 emit.32.o: emit.c  ppd.h array.h file.h string.h ../config.h debug.h
-encode.32.o: encode.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
-encode.32.o: encode.c  ipp-private.h string.h ../config.h debug.h
+encode.32.o: encode.c  cups.h ipp.h http.h ppd.h array.h file.h language.h ipp-private.h
+encode.32.o: encode.c  string.h ../config.h debug.h
 file.32.o: file.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
 file.32.o: file.c  string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
 file.32.o: file.c  debug.h
@@ -154,14 +154,15 @@ language.32.o: language.c  transcode.h debug.h
 localize.32.o: localize.c  globals.h string.h ../config.h http-private.h http.h md5.h
 localize.32.o: localize.c  ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
 localize.32.o: localize.c  transcode.h debug.h
-mark.32.o: mark.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
+mark.32.o: mark.c  cups.h ipp.h http.h ppd.h array.h file.h language.h string.h
 mark.32.o: mark.c  ../config.h debug.h
 md5.32.o: md5.c  md5.h string.h ../config.h
-md5passwd.32.o: md5passwd.c  http.h md5.h string.h ../config.h
+md5passwd.32.o: md5passwd.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
+md5passwd.32.o: md5passwd.c  string.h
 notify.32.o: notify.c  globals.h string.h ../config.h http-private.h http.h md5.h
 notify.32.o: notify.c  ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
 notify.32.o: notify.c  transcode.h
-options.32.o: options.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
+options.32.o: options.c  cups.h ipp.h http.h ppd.h array.h file.h language.h string.h
 options.32.o: options.c  ../config.h debug.h
 page.32.o: page.c  ppd.h array.h file.h string.h ../config.h
 ppd.32.o: ppd.c  globals.h string.h ../config.h http-private.h http.h md5.h
@@ -184,27 +185,26 @@ usersys.32.o: usersys.c  transcode.h debug.h
 util.32.o: util.c  globals.h string.h ../config.h http-private.h http.h md5.h
 util.32.o: util.c  ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
 util.32.o: util.c  transcode.h debug.h
-testadmin.32.o: testadmin.c  adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
-testadmin.32.o: testadmin.c  language.h string.h ../config.h
+testadmin.32.o: testadmin.c  adminutil.h cups.h ipp.h http.h ppd.h array.h file.h language.h
+testadmin.32.o: testadmin.c  string.h ../config.h
 testarray.32.o: testarray.c  ../cups/string.h ../config.h string.h array.h dir.h debug.h
 testfile.32.o: testfile.c  string.h ../config.h file.h debug.h
-testhttp.32.o: testhttp.c  http.h md5.h string.h ../config.h
+testhttp.32.o: testhttp.c  http.h string.h ../config.h
 testi18n.32.o: testi18n.c  i18n.h transcode.h language.h array.h string.h ../config.h
 testipp.32.o: testipp.c  ../cups/string.h ../config.h string.h ipp-private.h ipp.h http.h
-testipp.32.o: testipp.c  md5.h
 testlang.32.o: testlang.c  i18n.h transcode.h language.h array.h
 testppd.32.o: testppd.c  ../cups/string.h ../config.h string.h ppd.h array.h file.h
 # DO NOT DELETE
 
-adminutil.64.o: adminutil.c  adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
-adminutil.64.o: adminutil.c  language.h globals.h string.h ../config.h http-private.h
+adminutil.64.o: adminutil.c  adminutil.h cups.h ipp.h http.h ppd.h array.h file.h language.h
+adminutil.64.o: adminutil.c  globals.h string.h ../config.h http-private.h md5.h
 adminutil.64.o: adminutil.c  ipp-private.h i18n.h transcode.h debug.h
 array.64.o: array.c  array.h string.h ../config.h debug.h
 attr.64.o: attr.c  ppd.h array.h file.h debug.h string.h ../config.h
 auth.64.o: auth.c  globals.h string.h ../config.h http-private.h http.h md5.h
 auth.64.o: auth.c  ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
 auth.64.o: auth.c  transcode.h debug.h
-backchannel.64.o: backchannel.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
+backchannel.64.o: backchannel.c  cups.h ipp.h http.h ppd.h array.h file.h language.h
 backend.64.o: backend.c  backend.h string.h ../config.h
 custom.64.o: custom.c  globals.h string.h ../config.h http-private.h http.h md5.h
 custom.64.o: custom.c  ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
@@ -214,8 +214,8 @@ dest.64.o: dest.c  ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i1
 dest.64.o: dest.c  transcode.h
 dir.64.o: dir.c  dir.h string.h ../config.h debug.h
 emit.64.o: emit.c  ppd.h array.h file.h string.h ../config.h debug.h
-encode.64.o: encode.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
-encode.64.o: encode.c  ipp-private.h string.h ../config.h debug.h
+encode.64.o: encode.c  cups.h ipp.h http.h ppd.h array.h file.h language.h ipp-private.h
+encode.64.o: encode.c  string.h ../config.h debug.h
 file.64.o: file.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
 file.64.o: file.c  string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
 file.64.o: file.c  debug.h
@@ -252,14 +252,15 @@ language.64.o: language.c  transcode.h debug.h
 localize.64.o: localize.c  globals.h string.h ../config.h http-private.h http.h md5.h
 localize.64.o: localize.c  ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
 localize.64.o: localize.c  transcode.h debug.h
-mark.64.o: mark.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
+mark.64.o: mark.c  cups.h ipp.h http.h ppd.h array.h file.h language.h string.h
 mark.64.o: mark.c  ../config.h debug.h
 md5.64.o: md5.c  md5.h string.h ../config.h
-md5passwd.64.o: md5passwd.c  http.h md5.h string.h ../config.h
+md5passwd.64.o: md5passwd.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
+md5passwd.64.o: md5passwd.c  string.h
 notify.64.o: notify.c  globals.h string.h ../config.h http-private.h http.h md5.h
 notify.64.o: notify.c  ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
 notify.64.o: notify.c  transcode.h
-options.64.o: options.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
+options.64.o: options.c  cups.h ipp.h http.h ppd.h array.h file.h language.h string.h
 options.64.o: options.c  ../config.h debug.h
 page.64.o: page.c  ppd.h array.h file.h string.h ../config.h
 ppd.64.o: ppd.c  globals.h string.h ../config.h http-private.h http.h md5.h
@@ -282,13 +283,12 @@ usersys.64.o: usersys.c  transcode.h debug.h
 util.64.o: util.c  globals.h string.h ../config.h http-private.h http.h md5.h
 util.64.o: util.c  ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
 util.64.o: util.c  transcode.h debug.h
-testadmin.64.o: testadmin.c  adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
-testadmin.64.o: testadmin.c  language.h string.h ../config.h
+testadmin.64.o: testadmin.c  adminutil.h cups.h ipp.h http.h ppd.h array.h file.h language.h
+testadmin.64.o: testadmin.c  string.h ../config.h
 testarray.64.o: testarray.c  ../cups/string.h ../config.h string.h array.h dir.h debug.h
 testfile.64.o: testfile.c  string.h ../config.h file.h debug.h
-testhttp.64.o: testhttp.c  http.h md5.h string.h ../config.h
+testhttp.64.o: testhttp.c  http.h string.h ../config.h
 testi18n.64.o: testi18n.c  i18n.h transcode.h language.h array.h string.h ../config.h
 testipp.64.o: testipp.c  ../cups/string.h ../config.h string.h ipp-private.h ipp.h http.h
-testipp.64.o: testipp.c  md5.h
 testlang.64.o: testlang.c  i18n.h transcode.h language.h array.h
 testppd.64.o: testppd.c  ../cups/string.h ../config.h string.h ppd.h array.h file.h

diff --git a/cups/md5passwd.c b/cups/md5passwd.c
index 1c903a9d639e25cd5c05aa350921dfbff611aa3e..b349a53b1b4bf2d311ac985c335b03b97d3a343b 100644 (file)
--- a/cups/md5passwd.c
+++ b/cups/md5passwd.c
@@ -35,7 +35,7 @@
  * Include necessary headers...
  */
 
-#include "http.h"
+#include "http-private.h"
 #include "string.h"
 
 

diff --git a/filter/Dependencies b/filter/Dependencies
index fa2b859a35e460984fab7b0ec7cf0d90c7d4a1a3..e48805b0925dcd9898936abe9ee77710e6782a0e 100644 (file)
--- a/filter/Dependencies
+++ b/filter/Dependencies
@@ -1,441 +1,381 @@
 # DO NOT DELETE
 
 hpgl-attr.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-attr.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-attr.o: ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-attr.o: ../config.h
+hpgl-attr.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-attr.o: ../cups/language.h ../cups/string.h ../config.h
 hpgl-config.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-config.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-config.o: ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-config.o: ../cups/string.h ../config.h
+hpgl-config.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-config.o: ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-config.o: ../config.h
 hpgl-main.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-main.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-main.o: ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-main.o: ../config.h
+hpgl-main.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-main.o: ../cups/language.h ../cups/string.h ../config.h
 hpgl-prolog.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-prolog.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-prolog.o: ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-prolog.o: ../cups/string.h ../config.h
+hpgl-prolog.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-prolog.o: ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-prolog.o: ../config.h
 hpgl-char.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-char.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-char.o: ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-char.o: ../config.h
+hpgl-char.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-char.o: ../cups/language.h ../cups/string.h ../config.h
 hpgl-input.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-input.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-input.o: ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-input.o: ../config.h
+hpgl-input.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-input.o: ../cups/language.h ../cups/string.h ../config.h
 hpgl-polygon.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-polygon.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-polygon.o: ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-polygon.o: ../cups/string.h ../config.h
+hpgl-polygon.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-polygon.o: ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-polygon.o: ../config.h
 hpgl-vector.o: hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-vector.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-vector.o: ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-vector.o: ../cups/string.h ../config.h
+hpgl-vector.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-vector.o: ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-vector.o: ../config.h
 image-bmp.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-bmp.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-bmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h
-image-bmp.o: ../cups/string.h ../config.h
+image-bmp.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-bmp.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-colorspace.o: image-private.h image.h raster.h ../cups/cups.h
-image-colorspace.o: ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
+image-colorspace.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h
 image-colorspace.o: ../cups/array.h ../cups/file.h ../cups/language.h
 image-colorspace.o: ../cups/debug.h ../cups/string.h ../config.h
 image-gif.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-gif.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-gif.o: ../cups/file.h ../cups/language.h ../cups/debug.h
-image-gif.o: ../cups/string.h ../config.h
+image-gif.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-gif.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-jpeg.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-jpeg.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-jpeg.o: ../cups/file.h ../cups/language.h ../cups/debug.h
-image-jpeg.o: ../cups/string.h ../config.h
+image-jpeg.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-jpeg.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-photocd.o: image-private.h image.h raster.h ../cups/cups.h
-image-photocd.o: ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
-image-photocd.o: ../cups/array.h ../cups/file.h ../cups/language.h
-image-photocd.o: ../cups/debug.h ../cups/string.h ../config.h
+image-photocd.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+image-photocd.o: ../cups/file.h ../cups/language.h ../cups/debug.h
+image-photocd.o: ../cups/string.h ../config.h
 image-pix.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-pix.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-pix.o: ../cups/file.h ../cups/language.h ../cups/debug.h
-image-pix.o: ../cups/string.h ../config.h
+image-pix.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-pix.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-png.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-png.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-png.o: ../cups/file.h ../cups/language.h ../cups/debug.h
-image-png.o: ../cups/string.h ../config.h
+image-png.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-png.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-pnm.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-pnm.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-pnm.o: ../cups/file.h ../cups/language.h ../cups/debug.h
-image-pnm.o: ../cups/string.h ../config.h
+image-pnm.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-pnm.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-sgi.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-sgi.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-sgi.o: ../cups/file.h ../cups/language.h ../cups/debug.h
-image-sgi.o: ../cups/string.h ../config.h image-sgi.h
+image-sgi.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-sgi.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-sgi.o: image-sgi.h
 image-sgilib.o: image-sgi.h
 image-sun.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-sun.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-sun.o: ../cups/file.h ../cups/language.h ../cups/debug.h
-image-sun.o: ../cups/string.h ../config.h
+image-sun.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-sun.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-tiff.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-tiff.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-tiff.o: ../cups/file.h ../cups/language.h ../cups/debug.h
-image-tiff.o: ../cups/string.h ../config.h
+image-tiff.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-tiff.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-zoom.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-zoom.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-zoom.o: ../cups/file.h ../cups/language.h ../cups/debug.h
-image-zoom.o: ../cups/string.h ../config.h
+image-zoom.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-zoom.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image.o: image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
-image.o: ../config.h
+image.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image.o: ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 interpret.o: ../cups/string.h ../config.h raster.h ../cups/cups.h
-interpret.o: ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
-interpret.o: ../cups/array.h ../cups/file.h ../cups/language.h
-raster.o: raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-raster.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-raster.o: ../cups/debug.h ../cups/string.h ../config.h
+interpret.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+interpret.o: ../cups/file.h ../cups/language.h
+raster.o: raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+raster.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
+raster.o: ../cups/string.h ../config.h
 form-main.o: form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-main.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-main.o: ../cups/language.h ../cups/language.h ../cups/string.h
-form-main.o: ../config.h
+form-main.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-main.o: ../cups/language.h ../cups/string.h ../config.h
 form-ps.o: form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-ps.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-ps.o: ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
+form-ps.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-ps.o: ../cups/language.h ../cups/string.h ../config.h
 form-tree.o: form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-tree.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-tree.o: ../cups/language.h ../cups/language.h ../cups/string.h
-form-tree.o: ../config.h
+form-tree.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-tree.o: ../cups/language.h ../cups/string.h ../config.h
 gziptoany.o: ../cups/string.h ../config.h
 imagetops.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetops.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-imagetops.o: ../cups/language.h ../cups/language.h ../cups/string.h
-imagetops.o: ../config.h image.h raster.h
+imagetops.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+imagetops.o: ../cups/language.h ../cups/string.h ../config.h image.h raster.h
 imagetoraster.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetoraster.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+imagetoraster.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
 imagetoraster.o: ../cups/language.h ../cups/language.h ../cups/string.h
 imagetoraster.o: ../config.h image-private.h image.h raster.h ../cups/debug.h
-common.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-common.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+common.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+common.o: ../cups/array.h ../cups/file.h ../cups/language.h
 common.o: ../cups/language.h ../cups/string.h ../config.h
-pstops.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-pstops.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+pstops.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+pstops.o: ../cups/array.h ../cups/file.h ../cups/language.h
 pstops.o: ../cups/language.h ../cups/string.h ../config.h ../cups/file.h
 pstops.o: ../cups/array.h
 rasterbench.o: raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-rasterbench.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+rasterbench.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
 rasterbench.o: ../cups/language.h
-rastertoepson.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertoepson.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
-rastertoepson.o: ../cups/language.h ../cups/ppd.h ../cups/string.h
-rastertoepson.o: ../config.h raster.h
-rastertohp.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertohp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+rastertoepson.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertoepson.o: ../cups/array.h ../cups/file.h ../cups/language.h
+rastertoepson.o: ../cups/ppd.h ../cups/string.h ../config.h raster.h
+rastertohp.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertohp.o: ../cups/array.h ../cups/file.h ../cups/language.h
 rastertohp.o: ../cups/string.h ../config.h raster.h
-rastertolabel.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertolabel.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
-rastertolabel.o: ../cups/language.h ../cups/string.h ../config.h raster.h
+rastertolabel.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertolabel.o: ../cups/array.h ../cups/file.h ../cups/language.h
+rastertolabel.o: ../cups/string.h ../config.h raster.h
 testimage.o: image.h raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testimage.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testimage.o: ../cups/language.h
+testimage.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 testraster.o: raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testraster.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testraster.o: ../cups/language.h ../cups/string.h ../config.h
+testraster.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testraster.o: ../cups/string.h ../config.h
 textcommon.o: textcommon.h common.h ../cups/cups.h ../cups/ipp.h
-textcommon.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-textcommon.o: ../cups/file.h ../cups/language.h ../cups/language.h
-textcommon.o: ../cups/string.h ../config.h
+textcommon.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+textcommon.o: ../cups/language.h ../cups/language.h ../cups/string.h
+textcommon.o: ../config.h
 texttops.o: textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-texttops.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-texttops.o: ../cups/language.h ../cups/language.h ../cups/string.h
-texttops.o: ../config.h
+texttops.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+texttops.o: ../cups/language.h ../cups/string.h ../config.h
 # DO NOT DELETE
 
 hpgl-attr.32.o: hpgl-attr.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-attr.32.o: hpgl-attr.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-attr.32.o: hpgl-attr.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-attr.32.o: hpgl-attr.c  ../config.h
+hpgl-attr.32.o: hpgl-attr.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-attr.32.o: hpgl-attr.c  ../cups/language.h ../cups/string.h ../config.h
 hpgl-config.32.o: hpgl-config.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-config.32.o: hpgl-config.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-config.32.o: hpgl-config.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-config.32.o: hpgl-config.c  ../cups/string.h ../config.h
+hpgl-config.32.o: hpgl-config.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-config.32.o: hpgl-config.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-config.32.o: hpgl-config.c  ../config.h
 hpgl-main.32.o: hpgl-main.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-main.32.o: hpgl-main.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-main.32.o: hpgl-main.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-main.32.o: hpgl-main.c  ../config.h
+hpgl-main.32.o: hpgl-main.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-main.32.o: hpgl-main.c  ../cups/language.h ../cups/string.h ../config.h
 hpgl-prolog.32.o: hpgl-prolog.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-prolog.32.o: hpgl-prolog.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-prolog.32.o: hpgl-prolog.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-prolog.32.o: hpgl-prolog.c  ../cups/string.h ../config.h
+hpgl-prolog.32.o: hpgl-prolog.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-prolog.32.o: hpgl-prolog.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-prolog.32.o: hpgl-prolog.c  ../config.h
 hpgl-char.32.o: hpgl-char.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-char.32.o: hpgl-char.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-char.32.o: hpgl-char.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-char.32.o: hpgl-char.c  ../config.h
+hpgl-char.32.o: hpgl-char.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-char.32.o: hpgl-char.c  ../cups/language.h ../cups/string.h ../config.h
 hpgl-input.32.o: hpgl-input.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-input.32.o: hpgl-input.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-input.32.o: hpgl-input.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-input.32.o: hpgl-input.c  ../config.h
+hpgl-input.32.o: hpgl-input.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-input.32.o: hpgl-input.c  ../cups/language.h ../cups/string.h ../config.h
 hpgl-polygon.32.o: hpgl-polygon.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-polygon.32.o: hpgl-polygon.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-polygon.32.o: hpgl-polygon.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-polygon.32.o: hpgl-polygon.c  ../cups/string.h ../config.h
+hpgl-polygon.32.o: hpgl-polygon.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-polygon.32.o: hpgl-polygon.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-polygon.32.o: hpgl-polygon.c  ../config.h
 hpgl-vector.32.o: hpgl-vector.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-vector.32.o: hpgl-vector.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-vector.32.o: hpgl-vector.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-vector.32.o: hpgl-vector.c  ../cups/string.h ../config.h
+hpgl-vector.32.o: hpgl-vector.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-vector.32.o: hpgl-vector.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-vector.32.o: hpgl-vector.c  ../config.h
 image-bmp.32.o: image-bmp.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-bmp.32.o: image-bmp.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-bmp.32.o: image-bmp.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-bmp.32.o: image-bmp.c  ../cups/string.h ../config.h
+image-bmp.32.o: image-bmp.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-bmp.32.o: image-bmp.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-colorspace.32.o: image-colorspace.c  image-private.h image.h raster.h ../cups/cups.h
-image-colorspace.32.o: image-colorspace.c  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
+image-colorspace.32.o: image-colorspace.c  ../cups/ipp.h ../cups/http.h ../cups/ppd.h
 image-colorspace.32.o: image-colorspace.c  ../cups/array.h ../cups/file.h ../cups/language.h
 image-colorspace.32.o: image-colorspace.c  ../cups/debug.h ../cups/string.h ../config.h
 image-gif.32.o: image-gif.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-gif.32.o: image-gif.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-gif.32.o: image-gif.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-gif.32.o: image-gif.c  ../cups/string.h ../config.h
+image-gif.32.o: image-gif.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-gif.32.o: image-gif.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-jpeg.32.o: image-jpeg.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-jpeg.32.o: image-jpeg.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-jpeg.32.o: image-jpeg.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-jpeg.32.o: image-jpeg.c  ../cups/string.h ../config.h
+image-jpeg.32.o: image-jpeg.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-jpeg.32.o: image-jpeg.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-photocd.32.o: image-photocd.c  image-private.h image.h raster.h ../cups/cups.h
-image-photocd.32.o: image-photocd.c  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
-image-photocd.32.o: image-photocd.c  ../cups/array.h ../cups/file.h ../cups/language.h
-image-photocd.32.o: image-photocd.c  ../cups/debug.h ../cups/string.h ../config.h
+image-photocd.32.o: image-photocd.c  ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+image-photocd.32.o: image-photocd.c  ../cups/file.h ../cups/language.h ../cups/debug.h
+image-photocd.32.o: image-photocd.c  ../cups/string.h ../config.h
 image-pix.32.o: image-pix.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-pix.32.o: image-pix.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-pix.32.o: image-pix.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-pix.32.o: image-pix.c  ../cups/string.h ../config.h
+image-pix.32.o: image-pix.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-pix.32.o: image-pix.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-png.32.o: image-png.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-png.32.o: image-png.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-png.32.o: image-png.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-png.32.o: image-png.c  ../cups/string.h ../config.h
+image-png.32.o: image-png.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-png.32.o: image-png.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-pnm.32.o: image-pnm.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-pnm.32.o: image-pnm.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-pnm.32.o: image-pnm.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-pnm.32.o: image-pnm.c  ../cups/string.h ../config.h
+image-pnm.32.o: image-pnm.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-pnm.32.o: image-pnm.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-sgi.32.o: image-sgi.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-sgi.32.o: image-sgi.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-sgi.32.o: image-sgi.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-sgi.32.o: image-sgi.c  ../cups/string.h ../config.h image-sgi.h
+image-sgi.32.o: image-sgi.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-sgi.32.o: image-sgi.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-sgi.32.o: image-sgi.c  image-sgi.h
 image-sgilib.32.o: image-sgilib.c  image-sgi.h
 image-sun.32.o: image-sun.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-sun.32.o: image-sun.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-sun.32.o: image-sun.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-sun.32.o: image-sun.c  ../cups/string.h ../config.h
+image-sun.32.o: image-sun.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-sun.32.o: image-sun.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-tiff.32.o: image-tiff.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-tiff.32.o: image-tiff.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-tiff.32.o: image-tiff.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-tiff.32.o: image-tiff.c  ../cups/string.h ../config.h
+image-tiff.32.o: image-tiff.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-tiff.32.o: image-tiff.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-zoom.32.o: image-zoom.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-zoom.32.o: image-zoom.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-zoom.32.o: image-zoom.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-zoom.32.o: image-zoom.c  ../cups/string.h ../config.h
+image-zoom.32.o: image-zoom.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-zoom.32.o: image-zoom.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image.32.o: image.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image.32.o: image.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image.32.o: image.c  ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
-image.32.o: image.c  ../config.h
+image.32.o: image.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image.32.o: image.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 interpret.32.o: interpret.c  ../cups/string.h ../config.h raster.h ../cups/cups.h
-interpret.32.o: interpret.c  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
-interpret.32.o: interpret.c  ../cups/array.h ../cups/file.h ../cups/language.h
-raster.32.o: raster.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-raster.32.o: raster.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-raster.32.o: raster.c  ../cups/debug.h ../cups/string.h ../config.h
+interpret.32.o: interpret.c  ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+interpret.32.o: interpret.c  ../cups/file.h ../cups/language.h
+raster.32.o: raster.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+raster.32.o: raster.c  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
+raster.32.o: raster.c  ../cups/string.h ../config.h
 form-main.32.o: form-main.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-main.32.o: form-main.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-main.32.o: form-main.c  ../cups/language.h ../cups/language.h ../cups/string.h
-form-main.32.o: form-main.c  ../config.h
+form-main.32.o: form-main.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-main.32.o: form-main.c  ../cups/language.h ../cups/string.h ../config.h
 form-ps.32.o: form-ps.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-ps.32.o: form-ps.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-ps.32.o: form-ps.c  ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
+form-ps.32.o: form-ps.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-ps.32.o: form-ps.c  ../cups/language.h ../cups/string.h ../config.h
 form-tree.32.o: form-tree.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-tree.32.o: form-tree.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-tree.32.o: form-tree.c  ../cups/language.h ../cups/language.h ../cups/string.h
-form-tree.32.o: form-tree.c  ../config.h
+form-tree.32.o: form-tree.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-tree.32.o: form-tree.c  ../cups/language.h ../cups/string.h ../config.h
 gziptoany.32.o: gziptoany.c  ../cups/string.h ../config.h
 imagetops.32.o: imagetops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetops.32.o: imagetops.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-imagetops.32.o: imagetops.c  ../cups/language.h ../cups/language.h ../cups/string.h
-imagetops.32.o: imagetops.c  ../config.h image.h raster.h
+imagetops.32.o: imagetops.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+imagetops.32.o: imagetops.c  ../cups/language.h ../cups/string.h ../config.h image.h raster.h
 imagetoraster.32.o: imagetoraster.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetoraster.32.o: imagetoraster.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+imagetoraster.32.o: imagetoraster.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
 imagetoraster.32.o: imagetoraster.c  ../cups/language.h ../cups/language.h ../cups/string.h
 imagetoraster.32.o: imagetoraster.c  ../config.h image-private.h image.h raster.h ../cups/debug.h
-common.32.o: common.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-common.32.o: common.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+common.32.o: common.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+common.32.o: common.c  ../cups/array.h ../cups/file.h ../cups/language.h
 common.32.o: common.c  ../cups/language.h ../cups/string.h ../config.h
-pstops.32.o: pstops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-pstops.32.o: pstops.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+pstops.32.o: pstops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+pstops.32.o: pstops.c  ../cups/array.h ../cups/file.h ../cups/language.h
 pstops.32.o: pstops.c  ../cups/language.h ../cups/string.h ../config.h ../cups/file.h
 pstops.32.o: pstops.c  ../cups/array.h
 rasterbench.32.o: rasterbench.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-rasterbench.32.o: rasterbench.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+rasterbench.32.o: rasterbench.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
 rasterbench.32.o: rasterbench.c  ../cups/language.h
-rastertoepson.32.o: rastertoepson.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertoepson.32.o: rastertoepson.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
-rastertoepson.32.o: rastertoepson.c  ../cups/language.h ../cups/ppd.h ../cups/string.h
-rastertoepson.32.o: rastertoepson.c  ../config.h raster.h
-rastertohp.32.o: rastertohp.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertohp.32.o: rastertohp.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+rastertoepson.32.o: rastertoepson.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertoepson.32.o: rastertoepson.c  ../cups/array.h ../cups/file.h ../cups/language.h
+rastertoepson.32.o: rastertoepson.c  ../cups/ppd.h ../cups/string.h ../config.h raster.h
+rastertohp.32.o: rastertohp.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertohp.32.o: rastertohp.c  ../cups/array.h ../cups/file.h ../cups/language.h
 rastertohp.32.o: rastertohp.c  ../cups/string.h ../config.h raster.h
-rastertolabel.32.o: rastertolabel.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertolabel.32.o: rastertolabel.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
-rastertolabel.32.o: rastertolabel.c  ../cups/language.h ../cups/string.h ../config.h raster.h
+rastertolabel.32.o: rastertolabel.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertolabel.32.o: rastertolabel.c  ../cups/array.h ../cups/file.h ../cups/language.h
+rastertolabel.32.o: rastertolabel.c  ../cups/string.h ../config.h raster.h
 testimage.32.o: testimage.c  image.h raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testimage.32.o: testimage.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testimage.32.o: testimage.c  ../cups/language.h
+testimage.32.o: testimage.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 testraster.32.o: testraster.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testraster.32.o: testraster.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testraster.32.o: testraster.c  ../cups/language.h ../cups/string.h ../config.h
+testraster.32.o: testraster.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testraster.32.o: testraster.c  ../cups/string.h ../config.h
 textcommon.32.o: textcommon.c  textcommon.h common.h ../cups/cups.h ../cups/ipp.h
-textcommon.32.o: textcommon.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-textcommon.32.o: textcommon.c  ../cups/file.h ../cups/language.h ../cups/language.h
-textcommon.32.o: textcommon.c  ../cups/string.h ../config.h
+textcommon.32.o: textcommon.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+textcommon.32.o: textcommon.c  ../cups/language.h ../cups/language.h ../cups/string.h
+textcommon.32.o: textcommon.c  ../config.h
 texttops.32.o: texttops.c  textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-texttops.32.o: texttops.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-texttops.32.o: texttops.c  ../cups/language.h ../cups/language.h ../cups/string.h
-texttops.32.o: texttops.c  ../config.h
+texttops.32.o: texttops.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+texttops.32.o: texttops.c  ../cups/language.h ../cups/string.h ../config.h
 # DO NOT DELETE
 
 hpgl-attr.64.o: hpgl-attr.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-attr.64.o: hpgl-attr.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-attr.64.o: hpgl-attr.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-attr.64.o: hpgl-attr.c  ../config.h
+hpgl-attr.64.o: hpgl-attr.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-attr.64.o: hpgl-attr.c  ../cups/language.h ../cups/string.h ../config.h
 hpgl-config.64.o: hpgl-config.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-config.64.o: hpgl-config.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-config.64.o: hpgl-config.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-config.64.o: hpgl-config.c  ../cups/string.h ../config.h
+hpgl-config.64.o: hpgl-config.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-config.64.o: hpgl-config.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-config.64.o: hpgl-config.c  ../config.h
 hpgl-main.64.o: hpgl-main.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-main.64.o: hpgl-main.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-main.64.o: hpgl-main.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-main.64.o: hpgl-main.c  ../config.h
+hpgl-main.64.o: hpgl-main.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-main.64.o: hpgl-main.c  ../cups/language.h ../cups/string.h ../config.h
 hpgl-prolog.64.o: hpgl-prolog.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-prolog.64.o: hpgl-prolog.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-prolog.64.o: hpgl-prolog.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-prolog.64.o: hpgl-prolog.c  ../cups/string.h ../config.h
+hpgl-prolog.64.o: hpgl-prolog.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-prolog.64.o: hpgl-prolog.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-prolog.64.o: hpgl-prolog.c  ../config.h
 hpgl-char.64.o: hpgl-char.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-char.64.o: hpgl-char.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-char.64.o: hpgl-char.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-char.64.o: hpgl-char.c  ../config.h
+hpgl-char.64.o: hpgl-char.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-char.64.o: hpgl-char.c  ../cups/language.h ../cups/string.h ../config.h
 hpgl-input.64.o: hpgl-input.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-hpgl-input.64.o: hpgl-input.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-hpgl-input.64.o: hpgl-input.c  ../cups/language.h ../cups/language.h ../cups/string.h
-hpgl-input.64.o: hpgl-input.c  ../config.h
+hpgl-input.64.o: hpgl-input.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+hpgl-input.64.o: hpgl-input.c  ../cups/language.h ../cups/string.h ../config.h
 hpgl-polygon.64.o: hpgl-polygon.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-polygon.64.o: hpgl-polygon.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-polygon.64.o: hpgl-polygon.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-polygon.64.o: hpgl-polygon.c  ../cups/string.h ../config.h
+hpgl-polygon.64.o: hpgl-polygon.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-polygon.64.o: hpgl-polygon.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-polygon.64.o: hpgl-polygon.c  ../config.h
 hpgl-vector.64.o: hpgl-vector.c  hpgltops.h common.h ../cups/cups.h ../cups/ipp.h
-hpgl-vector.64.o: hpgl-vector.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-hpgl-vector.64.o: hpgl-vector.c  ../cups/file.h ../cups/language.h ../cups/language.h
-hpgl-vector.64.o: hpgl-vector.c  ../cups/string.h ../config.h
+hpgl-vector.64.o: hpgl-vector.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+hpgl-vector.64.o: hpgl-vector.c  ../cups/language.h ../cups/language.h ../cups/string.h
+hpgl-vector.64.o: hpgl-vector.c  ../config.h
 image-bmp.64.o: image-bmp.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-bmp.64.o: image-bmp.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-bmp.64.o: image-bmp.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-bmp.64.o: image-bmp.c  ../cups/string.h ../config.h
+image-bmp.64.o: image-bmp.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-bmp.64.o: image-bmp.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-colorspace.64.o: image-colorspace.c  image-private.h image.h raster.h ../cups/cups.h
-image-colorspace.64.o: image-colorspace.c  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
+image-colorspace.64.o: image-colorspace.c  ../cups/ipp.h ../cups/http.h ../cups/ppd.h
 image-colorspace.64.o: image-colorspace.c  ../cups/array.h ../cups/file.h ../cups/language.h
 image-colorspace.64.o: image-colorspace.c  ../cups/debug.h ../cups/string.h ../config.h
 image-gif.64.o: image-gif.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-gif.64.o: image-gif.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-gif.64.o: image-gif.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-gif.64.o: image-gif.c  ../cups/string.h ../config.h
+image-gif.64.o: image-gif.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-gif.64.o: image-gif.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-jpeg.64.o: image-jpeg.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-jpeg.64.o: image-jpeg.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-jpeg.64.o: image-jpeg.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-jpeg.64.o: image-jpeg.c  ../cups/string.h ../config.h
+image-jpeg.64.o: image-jpeg.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-jpeg.64.o: image-jpeg.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-photocd.64.o: image-photocd.c  image-private.h image.h raster.h ../cups/cups.h
-image-photocd.64.o: image-photocd.c  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
-image-photocd.64.o: image-photocd.c  ../cups/array.h ../cups/file.h ../cups/language.h
-image-photocd.64.o: image-photocd.c  ../cups/debug.h ../cups/string.h ../config.h
+image-photocd.64.o: image-photocd.c  ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+image-photocd.64.o: image-photocd.c  ../cups/file.h ../cups/language.h ../cups/debug.h
+image-photocd.64.o: image-photocd.c  ../cups/string.h ../config.h
 image-pix.64.o: image-pix.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-pix.64.o: image-pix.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-pix.64.o: image-pix.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-pix.64.o: image-pix.c  ../cups/string.h ../config.h
+image-pix.64.o: image-pix.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-pix.64.o: image-pix.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-png.64.o: image-png.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-png.64.o: image-png.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-png.64.o: image-png.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-png.64.o: image-png.c  ../cups/string.h ../config.h
+image-png.64.o: image-png.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-png.64.o: image-png.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-pnm.64.o: image-pnm.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-pnm.64.o: image-pnm.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-pnm.64.o: image-pnm.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-pnm.64.o: image-pnm.c  ../cups/string.h ../config.h
+image-pnm.64.o: image-pnm.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-pnm.64.o: image-pnm.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-sgi.64.o: image-sgi.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-sgi.64.o: image-sgi.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-sgi.64.o: image-sgi.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-sgi.64.o: image-sgi.c  ../cups/string.h ../config.h image-sgi.h
+image-sgi.64.o: image-sgi.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-sgi.64.o: image-sgi.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
+image-sgi.64.o: image-sgi.c  image-sgi.h
 image-sgilib.64.o: image-sgilib.c  image-sgi.h
 image-sun.64.o: image-sun.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-sun.64.o: image-sun.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-sun.64.o: image-sun.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-sun.64.o: image-sun.c  ../cups/string.h ../config.h
+image-sun.64.o: image-sun.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-sun.64.o: image-sun.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-tiff.64.o: image-tiff.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-tiff.64.o: image-tiff.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-tiff.64.o: image-tiff.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-tiff.64.o: image-tiff.c  ../cups/string.h ../config.h
+image-tiff.64.o: image-tiff.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-tiff.64.o: image-tiff.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image-zoom.64.o: image-zoom.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image-zoom.64.o: image-zoom.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image-zoom.64.o: image-zoom.c  ../cups/file.h ../cups/language.h ../cups/debug.h
-image-zoom.64.o: image-zoom.c  ../cups/string.h ../config.h
+image-zoom.64.o: image-zoom.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image-zoom.64.o: image-zoom.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 image.64.o: image.c  image-private.h image.h raster.h ../cups/cups.h ../cups/ipp.h
-image.64.o: image.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-image.64.o: image.c  ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/string.h
-image.64.o: image.c  ../config.h
+image.64.o: image.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+image.64.o: image.c  ../cups/language.h ../cups/debug.h ../cups/string.h ../config.h
 interpret.64.o: interpret.c  ../cups/string.h ../config.h raster.h ../cups/cups.h
-interpret.64.o: interpret.c  ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
-interpret.64.o: interpret.c  ../cups/array.h ../cups/file.h ../cups/language.h
-raster.64.o: raster.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-raster.64.o: raster.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-raster.64.o: raster.c  ../cups/debug.h ../cups/string.h ../config.h
+interpret.64.o: interpret.c  ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+interpret.64.o: interpret.c  ../cups/file.h ../cups/language.h
+raster.64.o: raster.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+raster.64.o: raster.c  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
+raster.64.o: raster.c  ../cups/string.h ../config.h
 form-main.64.o: form-main.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-main.64.o: form-main.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-main.64.o: form-main.c  ../cups/language.h ../cups/language.h ../cups/string.h
-form-main.64.o: form-main.c  ../config.h
+form-main.64.o: form-main.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-main.64.o: form-main.c  ../cups/language.h ../cups/string.h ../config.h
 form-ps.64.o: form-ps.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-ps.64.o: form-ps.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-ps.64.o: form-ps.c  ../cups/language.h ../cups/language.h ../cups/string.h ../config.h
+form-ps.64.o: form-ps.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-ps.64.o: form-ps.c  ../cups/language.h ../cups/string.h ../config.h
 form-tree.64.o: form-tree.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-form-tree.64.o: form-tree.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-form-tree.64.o: form-tree.c  ../cups/language.h ../cups/language.h ../cups/string.h
-form-tree.64.o: form-tree.c  ../config.h
+form-tree.64.o: form-tree.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+form-tree.64.o: form-tree.c  ../cups/language.h ../cups/string.h ../config.h
 gziptoany.64.o: gziptoany.c  ../cups/string.h ../config.h
 imagetops.64.o: imagetops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetops.64.o: imagetops.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-imagetops.64.o: imagetops.c  ../cups/language.h ../cups/language.h ../cups/string.h
-imagetops.64.o: imagetops.c  ../config.h image.h raster.h
+imagetops.64.o: imagetops.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+imagetops.64.o: imagetops.c  ../cups/language.h ../cups/string.h ../config.h image.h raster.h
 imagetoraster.64.o: imagetoraster.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-imagetoraster.64.o: imagetoraster.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+imagetoraster.64.o: imagetoraster.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
 imagetoraster.64.o: imagetoraster.c  ../cups/language.h ../cups/language.h ../cups/string.h
 imagetoraster.64.o: imagetoraster.c  ../config.h image-private.h image.h raster.h ../cups/debug.h
-common.64.o: common.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-common.64.o: common.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+common.64.o: common.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+common.64.o: common.c  ../cups/array.h ../cups/file.h ../cups/language.h
 common.64.o: common.c  ../cups/language.h ../cups/string.h ../config.h
-pstops.64.o: pstops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-pstops.64.o: pstops.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+pstops.64.o: pstops.c  common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+pstops.64.o: pstops.c  ../cups/array.h ../cups/file.h ../cups/language.h
 pstops.64.o: pstops.c  ../cups/language.h ../cups/string.h ../config.h ../cups/file.h
 pstops.64.o: pstops.c  ../cups/array.h
 rasterbench.64.o: rasterbench.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-rasterbench.64.o: rasterbench.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+rasterbench.64.o: rasterbench.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
 rasterbench.64.o: rasterbench.c  ../cups/language.h
-rastertoepson.64.o: rastertoepson.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertoepson.64.o: rastertoepson.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
-rastertoepson.64.o: rastertoepson.c  ../cups/language.h ../cups/ppd.h ../cups/string.h
-rastertoepson.64.o: rastertoepson.c  ../config.h raster.h
-rastertohp.64.o: rastertohp.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertohp.64.o: rastertohp.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+rastertoepson.64.o: rastertoepson.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertoepson.64.o: rastertoepson.c  ../cups/array.h ../cups/file.h ../cups/language.h
+rastertoepson.64.o: rastertoepson.c  ../cups/ppd.h ../cups/string.h ../config.h raster.h
+rastertohp.64.o: rastertohp.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertohp.64.o: rastertohp.c  ../cups/array.h ../cups/file.h ../cups/language.h
 rastertohp.64.o: rastertohp.c  ../cups/string.h ../config.h raster.h
-rastertolabel.64.o: rastertolabel.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-rastertolabel.64.o: rastertolabel.c  ../cups/ppd.h ../cups/array.h ../cups/file.h
-rastertolabel.64.o: rastertolabel.c  ../cups/language.h ../cups/string.h ../config.h raster.h
+rastertolabel.64.o: rastertolabel.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+rastertolabel.64.o: rastertolabel.c  ../cups/array.h ../cups/file.h ../cups/language.h
+rastertolabel.64.o: rastertolabel.c  ../cups/string.h ../config.h raster.h
 testimage.64.o: testimage.c  image.h raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testimage.64.o: testimage.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testimage.64.o: testimage.c  ../cups/language.h
+testimage.64.o: testimage.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 testraster.64.o: testraster.c  raster.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testraster.64.o: testraster.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testraster.64.o: testraster.c  ../cups/language.h ../cups/string.h ../config.h
+testraster.64.o: testraster.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testraster.64.o: testraster.c  ../cups/string.h ../config.h
 textcommon.64.o: textcommon.c  textcommon.h common.h ../cups/cups.h ../cups/ipp.h
-textcommon.64.o: textcommon.c  ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-textcommon.64.o: textcommon.c  ../cups/file.h ../cups/language.h ../cups/language.h
-textcommon.64.o: textcommon.c  ../cups/string.h ../config.h
+textcommon.64.o: textcommon.c  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+textcommon.64.o: textcommon.c  ../cups/language.h ../cups/language.h ../cups/string.h
+textcommon.64.o: textcommon.c  ../config.h
 texttops.64.o: texttops.c  textcommon.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-texttops.64.o: texttops.c  ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-texttops.64.o: texttops.c  ../cups/language.h ../cups/language.h ../cups/string.h
-texttops.64.o: texttops.c  ../config.h
+texttops.64.o: texttops.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+texttops.64.o: texttops.c  ../cups/language.h ../cups/string.h ../config.h

diff --git a/monitor/Dependencies b/monitor/Dependencies
index 52599cfa1443629c235903823aa5de261575bd73..251caa2e7f9cd29d7a920e5f5c80370f594fc5dc 100644 (file)
--- a/monitor/Dependencies
+++ b/monitor/Dependencies
@@ -1,8 +1,8 @@
 # DO NOT DELETE
 
 bcp.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-bcp.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-bcp.o: ../cups/file.h ../cups/language.h
+bcp.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+bcp.o: ../cups/language.h
 tbcp.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-tbcp.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-tbcp.o: ../cups/file.h ../cups/language.h
+tbcp.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+tbcp.o: ../cups/language.h

diff --git a/notifier/Dependencies b/notifier/Dependencies
index 4ee88b7767d96046e7b15bb4b853859d87205150..fb1754ab4f3ea8875d0da16cc0d3bca302901b79 100644 (file)
--- a/notifier/Dependencies
+++ b/notifier/Dependencies
@@ -1,8 +1,8 @@
 # DO NOT DELETE
 
-mailto.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-mailto.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-mailto.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-testnotify.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-testnotify.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+mailto.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+mailto.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h
+mailto.o: ../cups/transcode.h ../cups/string.h ../config.h
+testnotify.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+testnotify.o: ../cups/array.h ../cups/file.h ../cups/language.h
 testnotify.o: ../cups/language.h ../cups/string.h ../config.h

diff --git a/pdftops/Dependencies b/pdftops/Dependencies
index a36824a85a95ab1f02c88f2a966d30e236cc81c6..70b1e0acdd7e67ed2681faf5b808fe1b90028c6a 100644 (file)
--- a/pdftops/Dependencies
+++ b/pdftops/Dependencies
@@ -3,8 +3,8 @@
 pdftops.o: ../cups/string.h ../config.h parseargs.h gtypes.h GString.h gmem.h
 pdftops.o: Object.h Array.h Dict.h Stream.h XRef.h Catalog.h Page.h PDFDoc.h
 pdftops.o: PSOutputDev.h GlobalParams.h CharTypes.h OutputDev.h Error.h
-pdftops.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-pdftops.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+pdftops.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+pdftops.o: ../cups/array.h ../cups/file.h ../cups/language.h
 Annot.o: ../config.h gmem.h Object.h gtypes.h GString.h Array.h Dict.h
 Annot.o: Stream.h Catalog.h Gfx.h Lexer.h Annot.h
 Array.o: ../config.h gmem.h Object.h gtypes.h GString.h Array.h Dict.h

diff --git a/scheduler/Dependencies b/scheduler/Dependencies
index d54993e2a74c526daf4596fb63abd0b0bbcf48fa..46199952fc2bbdef64b7d43385e9a549feae486d 100644 (file)
--- a/scheduler/Dependencies
+++ b/scheduler/Dependencies
@@ -178,11 +178,11 @@ mime.o: ../cups/array.h ../cups/ipp.h ../cups/file.h
 type.o: ../cups/string.h ../config.h mime.h ../cups/array.h ../cups/ipp.h
 type.o: ../cups/file.h ../cups/debug.h
 cups-deviced.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-cups-deviced.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+cups-deviced.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
 cups-deviced.o: ../cups/language.h ../cups/file.h ../cups/string.h
 cups-deviced.o: ../config.h ../cups/array.h ../cups/dir.h
 cups-driverd.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-cups-driverd.o: ../cups/md5.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+cups-driverd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
 cups-driverd.o: ../cups/language.h ../cups/file.h ../cups/string.h
 cups-driverd.o: ../config.h ../cups/dir.h ../cups/transcode.h
 cups-lpd.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
@@ -193,17 +193,20 @@ cups-polld.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
 cups-polld.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
 cups-polld.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
 cups-polld.o: ../cups/language.h ../cups/string.h
-testdirsvc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-testdirsvc.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testdirsvc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+testdirsvc.o: ../cups/array.h ../cups/file.h ../cups/language.h
 testdirsvc.o: ../cups/string.h ../config.h
-testlpd.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-testlpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-testlpd.o: ../cups/string.h ../config.h
+testlpd.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+testlpd.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/string.h
+testlpd.o: ../config.h
 testmime.o: ../cups/string.h ../config.h mime.h ../cups/array.h ../cups/ipp.h
 testmime.o: ../cups/file.h ../cups/dir.h
-testspeed.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-testspeed.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testspeed.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+testspeed.o: ../cups/array.h ../cups/file.h ../cups/language.h
 testspeed.o: ../cups/language.h ../cups/debug.h
-util.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-util.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-util.o: ../cups/file.h ../cups/string.h ../config.h
+testsub.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+testsub.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
+testsub.o: ../cups/string.h ../config.h
+util.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
+util.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/file.h
+util.o: ../cups/string.h ../config.h

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 8b60eb1d0f6b9dd1691c893ce8f22cc98b5b4c02..8cc1af30bd3527fb8d1dccec8b4415d234b6281e 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -2407,6 +2407,10 @@ cupsdUpdatePrinters(void)
        p;
        p = (cupsd_printer_t *)cupsArrayNext(Printers))
   {
+   /*
+    * Remove remote printers if we are no longer browsing...
+    */
+
     if (!Browsing && (p->type & (CUPS_PRINTER_IMPLICIT | CUPS_PRINTER_REMOTE)))
     {
       if (p->type & CUPS_PRINTER_IMPLICIT)
@@ -2417,8 +2421,6 @@ cupsdUpdatePrinters(void)
       cupsArrayRestore(Printers);
       continue;
     }
-    else if (!(p->type & CUPS_PRINTER_REMOTE))
-      cupsdSetPrinterAttrs(p);
 
    /*
     * Update the operation policy pointer...
@@ -2426,6 +2428,13 @@ cupsdUpdatePrinters(void)
 
     if ((p->op_policy_ptr = cupsdFindPolicy(p->op_policy)) == NULL)
       p->op_policy_ptr = DefaultPolicyPtr;
+
+   /*
+    * Update printer attributes as needed...
+    */
+
+    if (!(p->type & CUPS_PRINTER_REMOTE))
+      cupsdSetPrinterAttrs(p);
   }
 }
 

diff --git a/scripting/php/Dependencies b/scripting/php/Dependencies
index d17772edc4ad68015528b0c8042696f3421e1a69..81f5921f162d3423743eafb467f53ac9fc2f859e 100644 (file)
--- a/scripting/php/Dependencies
+++ b/scripting/php/Dependencies
@@ -1,6 +1,6 @@
 # DO NOT DELETE
 
 phpcups.o: ../../cups/string.h ../../config.h phpcups.h ../../cups/cups.h
-phpcups.o: ../../cups/ipp.h ../../cups/http.h ../../cups/md5.h
-phpcups.o: ../../cups/ppd.h ../../cups/array.h ../../cups/file.h
-phpcups.o: ../../cups/language.h ../../cups/language.h ../../cups/debug.h
+phpcups.o: ../../cups/ipp.h ../../cups/http.h ../../cups/ppd.h
+phpcups.o: ../../cups/array.h ../../cups/file.h ../../cups/language.h
+phpcups.o: ../../cups/language.h ../../cups/debug.h

diff --git a/systemv/Dependencies b/systemv/Dependencies
index 676444a01facc547c3b90061adae54e2016a9135..e48da544c42b37efae1e16ffeaf491b61ad4e79f 100644 (file)
--- a/systemv/Dependencies
+++ b/systemv/Dependencies
@@ -1,48 +1,44 @@
 # DO NOT DELETE
 
 accept.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-accept.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-accept.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
-accept.o: ../cups/transcode.h
+accept.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+accept.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
 cancel.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-cancel.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-cancel.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
-cancel.o: ../cups/transcode.h
+cancel.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+cancel.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
 cupsaddsmb.o: ../cups/string.h ../config.h ../cups/adminutil.h ../cups/cups.h
-cupsaddsmb.o: ../cups/ipp.h ../cups/http.h ../cups/md5.h ../cups/ppd.h
-cupsaddsmb.o: ../cups/array.h ../cups/file.h ../cups/language.h
-cupsaddsmb.o: ../cups/i18n.h ../cups/transcode.h ../cups/debug.h
+cupsaddsmb.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+cupsaddsmb.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
+cupsaddsmb.o: ../cups/transcode.h ../cups/debug.h
 cupstestdsc.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-cupstestdsc.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-cupstestdsc.o: ../cups/file.h ../cups/language.h ../cups/file.h
-cupstestdsc.o: ../cups/i18n.h ../cups/transcode.h
+cupstestdsc.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+cupstestdsc.o: ../cups/language.h ../cups/file.h ../cups/i18n.h
+cupstestdsc.o: ../cups/transcode.h
 cupstestppd.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-cupstestppd.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-cupstestppd.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
-cupstestppd.o: ../cups/transcode.h
+cupstestppd.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+cupstestppd.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
 lp.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lp.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-lp.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h
+lp.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lp.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
 lpadmin.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpadmin.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-lpadmin.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
-lpadmin.o: ../cups/transcode.h ../cups/debug.h
+lpadmin.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lpadmin.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
+lpadmin.o: ../cups/debug.h
 lpinfo.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpinfo.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-lpinfo.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
-lpinfo.o: ../cups/transcode.h ../cups/debug.h
+lpinfo.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lpinfo.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
+lpinfo.o: ../cups/debug.h
 lpmove.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpmove.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-lpmove.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
-lpmove.o: ../cups/transcode.h ../cups/debug.h
+lpmove.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lpmove.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
+lpmove.o: ../cups/debug.h
 lpoptions.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpoptions.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-lpoptions.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
-lpoptions.o: ../cups/transcode.h
+lpoptions.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lpoptions.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
 lppasswd.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lppasswd.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-lppasswd.o: ../cups/file.h ../cups/language.h ../cups/i18n.h
-lppasswd.o: ../cups/transcode.h ../cups/md5.h
+lppasswd.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lppasswd.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
+lppasswd.o: ../cups/md5.h
 lpstat.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
 lpstat.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/string.h ../cups/cups.h
 lpstat.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h

diff --git a/test/Dependencies b/test/Dependencies
index 15b3056c8d62db6e1674bf11f4bb706bf08ee30c..8f5d16b17167e9d5bd12e2fa2c38b46b450c4fc9 100644 (file)
--- a/test/Dependencies
+++ b/test/Dependencies
@@ -1,5 +1,5 @@
 # DO NOT DELETE
 
 ipptest.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-ipptest.o: ../cups/http.h ../cups/md5.h ../cups/ppd.h ../cups/array.h
-ipptest.o: ../cups/file.h ../cups/language.h ../cups/language.h
+ipptest.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+ipptest.o: ../cups/language.h ../cups/language.h