summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore8
-rw-r--r--backend/Dependencies44
-rw-r--r--berkeley/Dependencies23
-rw-r--r--cgi-bin/Dependencies8
-rw-r--r--config-scripts/cups-libtool.m44
-rw-r--r--config-scripts/cups-sharedlibs.m44
-rwxr-xr-xconfigure4
-rw-r--r--cups/Dependencies251
-rw-r--r--cups/Makefile143
-rw-r--r--cups/api-raster.header (renamed from filter/api-raster.header)0
-rw-r--r--cups/api-raster.shtml (renamed from filter/api-raster.shtml)0
-rw-r--r--cups/error.c (renamed from filter/error.c)0
-rw-r--r--cups/interpret.c (renamed from filter/interpret.c)0
-rw-r--r--cups/libcups2.def27
-rw-r--r--cups/raster.c (renamed from filter/raster.c)0
-rw-r--r--cups/rasterbench.c (renamed from filter/rasterbench.c)0
-rw-r--r--cups/testclient.c (renamed from filter/testclient.c)0
-rw-r--r--cups/testraster.c (renamed from filter/testraster.c)0
-rw-r--r--filter/Dependencies40
-rw-r--r--filter/Makefile171
-rw-r--r--filter/libcupsimage2.def14
-rw-r--r--filter/libcupsimage_s.exp16
-rw-r--r--locale/Dependencies11
-rw-r--r--monitor/Dependencies14
-rw-r--r--notifier/Dependencies11
-rw-r--r--ppdc/Dependencies159
-rw-r--r--scheduler/Dependencies250
-rw-r--r--scheduler/Makefile2
-rw-r--r--systemv/Dependencies73
-rw-r--r--systemv/Makefile8
-rw-r--r--test/Dependencies11
31 files changed, 617 insertions, 679 deletions
diff --git a/.gitignore b/.gitignore
index c67f49bea..694eef450 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,10 +40,13 @@ conf/mime.convs
conf/pam.std
conf/snmp.conf
cups/locale/
+cups/rasterbench
cups/test.pwg
+cups/test.raster
cups/testadmin
cups/testarray
cups/testcache
+cups/testclient
cups/testconflicts
cups/testcreds
cups/testcups
@@ -57,6 +60,7 @@ cups/testlang
cups/testoptions
cups/testppd
cups/testpwg
+cups/testraster
cups/testsnmp
cups/tlscheck
desktop/cups.desktop
@@ -65,14 +69,10 @@ doc/*/index.html
filter/commandtops
filter/gziptoany
filter/pstops
-filter/rasterbench
filter/rastertoepson
filter/rastertohp
filter/rastertolabel
filter/rastertopwg
-filter/test.raster
-filter/testclient
-filter/testraster
locale/checkpo
locale/po2strings
locale/strings2po
diff --git a/backend/Dependencies b/backend/Dependencies
index 2f4f0c195..7d39cebd7 100644
--- a/backend/Dependencies
+++ b/backend/Dependencies
@@ -2,15 +2,15 @@ ipp.o: ipp.c backend-private.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h \
../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h
lpd.o: lpd.c ../cups/http-private.h ../config.h ../cups/language.h \
../cups/array.h ../cups/versioning.h ../cups/http.h \
- ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h \
- backend-private.h ../cups/cups-private.h ../cups/string-private.h \
+ ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
+ ../cups/cups-private.h ../cups/string-private.h \
../cups/debug-private.h ../cups/array-private.h \
../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
@@ -19,22 +19,22 @@ dnssd.o: dnssd.c backend-private.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
snmp.o: snmp.c backend-private.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
socket.o: socket.c ../cups/http-private.h ../config.h ../cups/language.h \
../cups/array.h ../cups/versioning.h ../cups/http.h \
- ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h \
- backend-private.h ../cups/cups-private.h ../cups/string-private.h \
+ ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
+ ../cups/cups-private.h ../cups/string-private.h \
../cups/debug-private.h ../cups/array-private.h \
../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
@@ -43,9 +43,9 @@ test1284.o: test1284.c ../cups/string-private.h ../config.h ieee1284.c \
backend-private.h ../cups/cups-private.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h \
../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h
testbackend.o: testbackend.c ../cups/string-private.h ../config.h \
@@ -56,17 +56,17 @@ testsupplies.o: testsupplies.c backend-private.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h
usb.o: usb.c backend-private.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h \
usb-darwin.c ../cups/file-private.h ../cups/ppd-private.h \
../cups/ppd.h ../cups/raster.h
diff --git a/berkeley/Dependencies b/berkeley/Dependencies
index 8522b242d..fdfb374d8 100644
--- a/berkeley/Dependencies
+++ b/berkeley/Dependencies
@@ -1,25 +1,24 @@
lpc.o: lpc.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
../cups/debug-private.h ../cups/versioning.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
lpq.o: lpq.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
../cups/debug-private.h ../cups/versioning.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
lpr.o: lpr.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
../cups/debug-private.h ../cups/versioning.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
lprm.o: lprm.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
diff --git a/cgi-bin/Dependencies b/cgi-bin/Dependencies
index b006fe193..900d59402 100644
--- a/cgi-bin/Dependencies
+++ b/cgi-bin/Dependencies
@@ -28,16 +28,14 @@ var.o: var.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
../cups/language-private.h ../cups/transcode.h \
- ../cups/string-private.h ../config.h ../cups/ipp-private.h \
- ../cups/md5-private.h
+ ../cups/string-private.h ../config.h ../cups/ipp-private.h
admin.o: admin.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
../cups/language-private.h ../cups/transcode.h \
../cups/string-private.h ../config.h ../cups/ipp-private.h \
- ../cups/http-private.h ../cups/md5-private.h ../cups/ppd-private.h \
- ../cups/ppd.h ../cups/raster.h ../cups/pwg-private.h \
- ../cups/adminutil.h
+ ../cups/http-private.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/raster.h ../cups/pwg-private.h ../cups/adminutil.h
classes.o: classes.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \
../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \
diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4
index bfd25c04a..7dfd360ed 100644
--- a/config-scripts/cups-libtool.m4
+++ b/config-scripts/cups-libtool.m4
@@ -1,7 +1,7 @@
dnl
dnl Libtool stuff for CUPS.
dnl
-dnl Copyright 2007-2017 by Apple Inc.
+dnl Copyright 2007-2018 by Apple Inc.
dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
dnl
dnl Licensed under Apache License v2.0. See the file "LICENSE" for more information.
@@ -40,7 +40,7 @@ if test x$LIBTOOL != x; then
LIBTOOL_INSTALL="\$(LIBTOOL) --mode=install"
LINKCUPS="../cups/\$(LIBCUPS)"
- LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
+ LINKCUPSIMAGE="../cups/\$(LIBCUPSIMAGE)"
else
LD_CC="\$(CC)"
diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index a22b3798f..e81cdc55c 100644
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -1,7 +1,7 @@
dnl
dnl Shared library support for CUPS.
dnl
-dnl Copyright 2007-2017 by Apple Inc.
+dnl Copyright 2007-2018 by Apple Inc.
dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
dnl
dnl Licensed under Apache License v2.0. See the file "LICENSE" for more information.
@@ -85,7 +85,7 @@ AC_SUBST(LIBCUPSSTATIC)
if test x$enable_shared = xno; then
LINKCUPS="../cups/lib$cupsbase.a"
- LINKCUPSIMAGE="../filter/libcupsimage.a"
+ LINKCUPSIMAGE="../cups/libcupsimage.a"
EXTLINKCUPS="-lcups"
EXTLINKCUPSIMAGE="-lcupsimage"
diff --git a/configure b/configure
index dc17c9247..37e6552b0 100755
--- a/configure
+++ b/configure
@@ -6614,7 +6614,7 @@ fi
if test x$enable_shared = xno; then
LINKCUPS="../cups/lib$cupsbase.a"
- LINKCUPSIMAGE="../filter/libcupsimage.a"
+ LINKCUPSIMAGE="../cups/libcupsimage.a"
EXTLINKCUPS="-lcups"
EXTLINKCUPSIMAGE="-lcupsimage"
@@ -6715,7 +6715,7 @@ if test x$LIBTOOL != x; then
LIBTOOL_INSTALL="\$(LIBTOOL) --mode=install"
LINKCUPS="../cups/\$(LIBCUPS)"
- LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
+ LINKCUPSIMAGE="../cups/\$(LIBCUPSIMAGE)"
else
LD_CC="\$(CC)"
diff --git a/cups/Dependencies b/cups/Dependencies
index 11ec748dd..0af02d00e 100644
--- a/cups/Dependencies
+++ b/cups/Dependencies
@@ -1,254 +1,254 @@
adminutil.o: adminutil.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h ppd.h raster.h \
- adminutil.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h ppd.h raster.h adminutil.h
array.o: array.c ../cups/cups.h file.h versioning.h ipp.h http.h array.h \
language.h pwg.h string-private.h ../config.h debug-private.h \
array-private.h
auth.o: auth.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
backchannel.o: backchannel.c cups.h file.h versioning.h ipp.h http.h \
array.h language.h pwg.h
backend.o: backend.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h backend.h ppd.h raster.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h backend.h ppd.h raster.h
debug.o: debug.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
dest.o: dest.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
dest-job.o: dest-job.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
dest-localization.o: dest-localization.c cups-private.h string-private.h \
../config.h debug-private.h ../cups/versioning.h array-private.h \
../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
- ../cups/language.h md5-private.h language-private.h \
- ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
- thread-private.h
+ ../cups/language.h language-private.h ../cups/transcode.h \
+ pwg-private.h ../cups/cups.h file.h pwg.h thread-private.h
dest-options.o: dest-options.c cups-private.h string-private.h \
../config.h debug-private.h ../cups/versioning.h array-private.h \
../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
- ../cups/language.h md5-private.h language-private.h \
- ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
- thread-private.h
+ ../cups/language.h language-private.h ../cups/transcode.h \
+ pwg-private.h ../cups/cups.h file.h pwg.h thread-private.h
dir.o: dir.c string-private.h ../config.h debug-private.h \
../cups/versioning.h dir.h
encode.o: encode.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
file.o: file.c file-private.h cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
getdevices.o: getdevices.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h adminutil.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h adminutil.h
getifaddrs.o: getifaddrs.c http-private.h ../config.h ../cups/language.h \
- array.h versioning.h ../cups/http.h md5-private.h ipp-private.h \
- ../cups/ipp.h
+ array.h versioning.h ../cups/http.h ipp-private.h ../cups/ipp.h
getputfile.o: getputfile.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
globals.o: globals.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
hash.o: hash.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
http.o: http.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
http-addr.o: http-addr.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
http-addrlist.o: http-addrlist.c cups-private.h string-private.h \
../config.h debug-private.h ../cups/versioning.h array-private.h \
../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
- ../cups/language.h md5-private.h language-private.h \
- ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
- thread-private.h
+ ../cups/language.h language-private.h ../cups/transcode.h \
+ pwg-private.h ../cups/cups.h file.h pwg.h thread-private.h
http-support.o: http-support.c cups-private.h string-private.h \
../config.h debug-private.h ../cups/versioning.h array-private.h \
../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
- ../cups/language.h md5-private.h language-private.h \
- ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
- thread-private.h
+ ../cups/language.h language-private.h ../cups/transcode.h \
+ pwg-private.h ../cups/cups.h file.h pwg.h thread-private.h
ipp.o: ipp.c cups-private.h string-private.h ../config.h debug-private.h \
../cups/versioning.h array-private.h ../cups/array.h ipp-private.h \
- ../cups/ipp.h http.h http-private.h ../cups/language.h md5-private.h \
+ ../cups/ipp.h http.h http-private.h ../cups/language.h \
language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
file.h pwg.h thread-private.h
ipp-support.o: ipp-support.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
langprintf.o: langprintf.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
language.o: language.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
md5.o: md5.c md5-private.h string-private.h ../config.h
-md5passwd.o: md5passwd.c http-private.h ../config.h ../cups/language.h \
- array.h versioning.h ../cups/http.h md5-private.h ipp-private.h \
- ../cups/ipp.h string-private.h
+md5passwd.o: md5passwd.c ../cups/cups.h file.h versioning.h ipp.h http.h \
+ array.h language.h pwg.h http-private.h ../config.h ipp-private.h \
+ string-private.h
notify.o: notify.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
options.o: options.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
ppd.o: ppd.c cups-private.h string-private.h ../config.h debug-private.h \
../cups/versioning.h array-private.h ../cups/array.h ipp-private.h \
- ../cups/ipp.h http.h http-private.h ../cups/language.h md5-private.h \
+ ../cups/ipp.h http.h http-private.h ../cups/language.h \
language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
file.h pwg.h thread-private.h ppd-private.h ../cups/ppd.h raster.h
ppd-attr.o: ppd-attr.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
- ../cups/ppd.h raster.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h ppd-private.h ../cups/ppd.h raster.h
ppd-cache.o: ppd-cache.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
- ../cups/ppd.h raster.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h ppd-private.h ../cups/ppd.h raster.h
ppd-conflicts.o: ppd-conflicts.c cups-private.h string-private.h \
../config.h debug-private.h ../cups/versioning.h array-private.h \
../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
- ../cups/language.h md5-private.h language-private.h \
- ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
- thread-private.h ppd-private.h ../cups/ppd.h raster.h
+ ../cups/language.h language-private.h ../cups/transcode.h \
+ pwg-private.h ../cups/cups.h file.h pwg.h thread-private.h \
+ ppd-private.h ../cups/ppd.h raster.h
ppd-custom.o: ppd-custom.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
- ../cups/ppd.h raster.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h ppd-private.h ../cups/ppd.h raster.h
ppd-emit.o: ppd-emit.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h ppd.h raster.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h ppd.h raster.h
ppd-localize.o: ppd-localize.c cups-private.h string-private.h \
../config.h debug-private.h ../cups/versioning.h array-private.h \
../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
- ../cups/language.h md5-private.h language-private.h \
- ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
- thread-private.h ppd-private.h ../cups/ppd.h raster.h
+ ../cups/language.h language-private.h ../cups/transcode.h \
+ pwg-private.h ../cups/cups.h file.h pwg.h thread-private.h \
+ ppd-private.h ../cups/ppd.h raster.h
ppd-mark.o: ppd-mark.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
- ../cups/ppd.h raster.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h ppd-private.h ../cups/ppd.h raster.h
ppd-page.o: ppd-page.c string-private.h ../config.h debug-private.h \
../cups/versioning.h ppd.h cups.h file.h ipp.h http.h array.h \
language.h pwg.h raster.h
ppd-util.o: ppd-util.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
- ../cups/ppd.h raster.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h ppd-private.h ../cups/ppd.h raster.h
pwg-media.o: pwg-media.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
request.o: request.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
sidechannel.o: sidechannel.c sidechannel.h versioning.h cups-private.h \
string-private.h ../config.h debug-private.h array-private.h \
../cups/array.h ipp-private.h ../cups/ipp.h http.h http-private.h \
- ../cups/language.h md5-private.h language-private.h \
- ../cups/transcode.h pwg-private.h ../cups/cups.h file.h pwg.h \
- thread-private.h
+ ../cups/language.h language-private.h ../cups/transcode.h \
+ pwg-private.h ../cups/cups.h file.h pwg.h thread-private.h
snmp.o: snmp.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h snmp-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h snmp-private.h
snprintf.o: snprintf.c string-private.h ../config.h
string.o: string.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
tempfile.o: tempfile.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
thread.o: thread.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
tls.o: tls.c cups-private.h string-private.h ../config.h debug-private.h \
../cups/versioning.h array-private.h ../cups/array.h ipp-private.h \
- ../cups/ipp.h http.h http-private.h ../cups/language.h md5-private.h \
+ ../cups/ipp.h http.h http-private.h ../cups/language.h \
language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
file.h pwg.h thread-private.h tls-darwin.c
transcode.o: transcode.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
usersys.o: usersys.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
util.o: util.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
+error.o: error.c ../cups/raster-private.h raster.h cups.h file.h \
+ versioning.h ipp.h http.h array.h language.h pwg.h \
+ ../cups/debug-private.h ../cups/string-private.h ../config.h
+interpret.o: interpret.c ../cups/raster-private.h raster.h cups.h file.h \
+ versioning.h ipp.h http.h array.h language.h pwg.h \
+ ../cups/debug-private.h ../cups/string-private.h ../config.h \
+ ../cups/ppd.h
+raster.o: raster.c ../cups/raster-private.h raster.h cups.h file.h \
+ versioning.h ipp.h http.h array.h language.h pwg.h \
+ ../cups/debug-private.h ../cups/string-private.h ../config.h
+rasterbench.o: rasterbench.c ../config.h ../cups/raster.h cups.h file.h \
+ versioning.h ipp.h http.h array.h language.h pwg.h
testadmin.o: testadmin.c adminutil.h cups.h file.h versioning.h ipp.h \
http.h array.h language.h pwg.h string-private.h ../config.h
testarray.o: testarray.c string-private.h ../config.h debug-private.h \
@@ -257,26 +257,30 @@ testcache.o: testcache.c ppd-private.h ../cups/cups.h file.h versioning.h \
ipp.h http.h array.h language.h pwg.h ../cups/ppd.h raster.h \
pwg-private.h file-private.h cups-private.h string-private.h \
../config.h debug-private.h array-private.h ipp-private.h \
- http-private.h md5-private.h language-private.h ../cups/transcode.h \
- thread-private.h
+ http-private.h language-private.h ../cups/transcode.h thread-private.h
+testclient.o: testclient.c ../cups/cups.h file.h versioning.h ipp.h \
+ http.h array.h language.h pwg.h ../cups/raster.h \
+ ../cups/string-private.h ../config.h ../cups/thread-private.h
testconflicts.o: testconflicts.c cups.h file.h versioning.h ipp.h http.h \
array.h language.h pwg.h ppd.h raster.h string-private.h ../config.h
testcreds.o: testcreds.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
testcups.o: testcups.c string-private.h ../config.h cups.h file.h \
versioning.h ipp.h http.h array.h language.h pwg.h ppd.h raster.h
testdest.o: testdest.c cups.h file.h versioning.h ipp.h http.h array.h \
language.h pwg.h
testfile.o: testfile.c string-private.h ../config.h debug-private.h \
../cups/versioning.h file.h
+testgetdests.o: testgetdests.c cups.h file.h versioning.h ipp.h http.h \
+ array.h language.h pwg.h
testhttp.o: testhttp.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
testi18n.o: testi18n.c string-private.h ../config.h language-private.h \
../cups/transcode.h language.h array.h versioning.h
testipp.o: testipp.c file.h versioning.h string-private.h ../config.h \
@@ -284,33 +288,34 @@ testipp.o: testipp.c file.h versioning.h string-private.h ../config.h \
testoptions.o: testoptions.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
testlang.o: testlang.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
- ../cups/ppd.h raster.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h ppd-private.h ../cups/ppd.h raster.h
testppd.o: testppd.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h ppd-private.h \
- ../cups/ppd.h raster.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h ppd-private.h ../cups/ppd.h raster.h
testpwg.o: testpwg.c ppd-private.h ../cups/cups.h file.h versioning.h \
ipp.h http.h array.h language.h pwg.h ../cups/ppd.h raster.h \
pwg-private.h file-private.h cups-private.h string-private.h \
../config.h debug-private.h array-private.h ipp-private.h \
- http-private.h md5-private.h language-private.h ../cups/transcode.h \
- thread-private.h
+ http-private.h language-private.h ../cups/transcode.h thread-private.h
+testraster.o: testraster.c ../cups/raster-private.h raster.h cups.h \
+ file.h versioning.h ipp.h http.h array.h language.h pwg.h \
+ ../cups/debug-private.h ../cups/string-private.h ../config.h \
+ ../cups/ppd.h
testsnmp.o: testsnmp.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h snmp-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h snmp-private.h
tlscheck.o: tlscheck.c cups-private.h string-private.h ../config.h \
debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
- md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
- ../cups/cups.h file.h pwg.h thread-private.h
+ language-private.h ../cups/transcode.h pwg-private.h ../cups/cups.h \
+ file.h pwg.h thread-private.h
diff --git a/cups/Makefile b/cups/Makefile
index f39516d3e..0715dba21 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,10 +1,11 @@
#
# Library Makefile for CUPS.
#
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
# Copyright 1997-2006 by Easy Software Products, all rights reserved.
#
-# Licensed under Apache License v2.0. See the file "LICENSE" for more information.
+# Licensed under Apache License v2.0. See the file "LICENSE" for more
+# information.
#
include ../Makedefs
@@ -74,10 +75,16 @@ LIBOBJS = \
transcode.o \
usersys.o \
util.o
+IMAGEOBJS = \
+ error.o \
+ interpret.o \
+ raster.o
TESTOBJS = \
+ rasterbench.o \
testadmin.o \
testarray.o \
testcache.o \
+ testclient.o \
testconflicts.o \
testcreds.o \
testcups.o \
@@ -91,10 +98,12 @@ TESTOBJS = \
testlang.o \
testppd.o \
testpwg.o \
+ testraster.o \
testsnmp.o \
tlscheck.o
OBJS = \
$(LIBOBJS) \
+ $(IMAGEOBJS) \
$(TESTOBJS)
@@ -141,13 +150,17 @@ HEADERSPRIV = \
#
LIBTARGETS = \
+ $(LIBCUPSIMAGE) \
$(LIBCUPSSTATIC) \
- $(LIBCUPS)
+ $(LIBCUPS) \
+ libcupsimage.a
UNITTARGETS = \
+ rasterbench \
testadmin \
testarray \
testcache \
+ testclient \
testconflicts \
testcreds \
testcups \
@@ -161,6 +174,7 @@ UNITTARGETS = \
testoptions \
testppd \
testpwg \
+ testraster \
testsnmp \
tlscheck
@@ -270,10 +284,23 @@ install-libs: $(INSTALLSTATIC)
$(RM) $(LIBDIR)/libcups.dylib; \
$(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
fi
+ $(INSTALL_DIR) -m 755 $(LIBDIR)
+ $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
+ -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
+ $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
+ $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
+ fi
+ -if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
+ $(RM) $(LIBDIR)/libcupsimage.dylib; \
+ $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
+ fi
if test "x$(SYMROOT)" != "x"; then \
$(INSTALL_DIR) $(SYMROOT); \
+ $(INSTALL_DIR) $(SYMROOT); \
cp $(LIBCUPS) $(SYMROOT); \
dsymutil $(SYMROOT)/$(LIBCUPS); \
+ cp $(LIBCUPSIMAGE) $(SYMROOT); \
+ dsymutil $(SYMROOT)/$(LIBCUPSIMAGE); \
fi
installstatic:
@@ -281,6 +308,9 @@ installstatic:
$(INSTALL_LIB) -m 755 $(LIBCUPSSTATIC) $(LIBDIR)
$(RANLIB) $(LIBDIR)/$(LIBCUPSSTATIC)
$(CHMOD) 555 $(LIBDIR)/$(LIBCUPSSTATIC)
+ $(INSTALL_LIB) -m 755 libcupsimage.a $(LIBDIR)
+ $(RANLIB) $(LIBDIR)/libcupsimage.a
+ $(CHMOD) 555 $(LIBDIR)/libcupsimage.a
#
@@ -293,6 +323,11 @@ uninstall:
$(RM) $(LIBDIR)/libcups.dylib
$(RM) $(LIBDIR)/libcups.so
$(RM) $(LIBDIR)/libcups.so.2
+ $(RM) $(LIBDIR)/libcupsimage.2.dylib
+ $(RM) $(LIBDIR)/libcupsimage.a
+ $(RM) $(LIBDIR)/libcupsimage.dylib
+ $(RM) $(LIBDIR)/libcupsimage.so
+ $(RM) $(LIBDIR)/libcupsimage.so.2
-$(RMDIR) $(LIBDIR)
for file in $(HEADERS); do \
$(RM) $(INCLUDEDIR)/cups/$$file; \
@@ -325,7 +360,7 @@ libcups.2.dylib: $(LIBOBJS) $(LIBCUPSORDER)
echo Linking $@...
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
-install_name $(libdir)/$@ \
- -current_version 2.12.0 \
+ -current_version 2.13.0 \
-compatibility_version 2.0.0 \
-exported_symbols_list t.exp \
$(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
@@ -341,7 +376,7 @@ libcups.2.dylib: $(LIBOBJS) $(LIBCUPSORDER)
libcups.la: $(LIBOBJS)
echo Linking $@...
$(LD_CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
- -rpath $(LIBDIR) -version-info 2:12 $(LIBGSSAPI) $(SSLLIBS) \
+ -rpath $(LIBDIR) -version-info 2:13 $(LIBGSSAPI) $(SSLLIBS) \
$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
@@ -360,12 +395,12 @@ libcups.a: $(LIBOBJS)
# libcups2.def (Windows DLL exports file...)
#
-libcups2.def: $(LIBOBJS) Makefile
+libcups2.def: $(LIBOBJS) $(IMAGEOBJS) Makefile
echo Generating $@...
echo "LIBRARY libcups2" >libcups2.def
- echo "VERSION 2.12" >>libcups2.def
+ echo "VERSION 2.13" >>libcups2.def
echo "EXPORTS" >>libcups2.def
- (nm $(LIBOBJS) 2>/dev/null | grep "T _" | awk '{print $$3}'; \
+ (nm $(LIBOBJS) $(IMAGEOBJS) 2>/dev/null | grep "T _" | awk '{print $$3}'; \
echo __cups_strcpy; echo __cups_strlcat; echo __cups_strlcpy) | \
grep -v -E \
-e 'cups_debug|Apple|BackChannel|Backend|FileCheck|Filter|GSSService|SetNegotiate|SideChannel' \
@@ -374,6 +409,64 @@ libcups2.def: $(LIBOBJS) Makefile
#
+# libcupsimage.so.2
+#
+
+libcupsimage.so.2: $(IMAGEOBJS) libcups.so.2
+ echo Linking $@...
+ $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
+ -L../cups $(LINKCUPS)
+ $(RM) `basename $@ .2`
+ $(LN) $@ `basename $@ .2`
+
+
+#
+# libcupsimage.2.dylib
+#
+
+libcupsimage.2.dylib: $(IMAGEOBJS) libcups.2.dylib
+ echo Linking $@...
+ $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
+ -install_name $(libdir)/$@ \
+ -current_version 2.3.0 \
+ -compatibility_version 2.0.0 \
+ $(IMAGEOBJS) $(DSOLIBS) -L../cups $(LINKCUPS)
+ $(RM) libcupsimage.dylib
+ $(LN) $@ libcupsimage.dylib
+
+
+#
+# libcupsimage.la
+#
+
+libcupsimage.la: $(IMAGEOBJS) libcups.la
+ echo Linking $@...
+ $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
+ -L../cups $(LINKCUPS) \
+ -rpath $(LIBDIR) -version-info 2:3
+
+
+#
+# libcupsimage.a
+#
+
+libcupsimage.a: $(IMAGEOBJS)
+ echo Archiving $@...
+ $(RM) $@
+ $(AR) $(ARFLAGS) $@ $(IMAGEOBJS)
+ $(RANLIB) $@
+
+
+#
+# rasterbench
+#
+
+rasterbench: rasterbench.o libcupsimage.a
+ echo Linking $@...
+ $(LD_CC) $(LDFLAGS) -o $@ rasterbench.o libcupsimage.a $(LIBS)
+
+
+#
# testadmin (dependency on static CUPS library is intentional)
#
@@ -406,6 +499,17 @@ testcache: testcache.o $(LIBCUPSSTATIC)
#
+# testclient (dependency on static libraries is intentional)
+#
+
+testclient: testclient.o $(LIBCUPSSTATIC) libcupsimage.a
+ echo Linking $@...
+ $(LD_CC) $(LDFLAGS) -o $@ testclient.o \
+ libcupsimage.a $(LIBCUPSSTATIC) \
+ $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+
+
+#
# testconflicts (dependency on static CUPS library is intentional)
#
@@ -564,6 +668,19 @@ testpwg: testpwg.o $(LIBCUPSSTATIC) test.ppd
#
+# testraster
+#
+
+testraster: testraster.o $(LIBCUPSSTATIC) libcupsimage.a
+ echo Linking $@...
+ $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \
+ $(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
+ $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
+ echo Running raster API tests...
+ ./testraster
+
+
+#
# testsnmp (dependency on static CUPS library is intentional)
#
@@ -610,6 +727,14 @@ apihelp:
--header api-ppd.header --intro api-ppd.shtml \
api-ppd.xml ppd.h ppd-*.c >../doc/help/api-ppd.html
$(RM) api-ppd.xml
+ mxmldoc --section "Programming" --title "Raster API" \
+ --css ../doc/cups-printable.css \
+ --header api-raster.header --intro api-raster.shtml \
+ api-raster.xml \
+ ../cups/raster.h interpret.c raster.c \
+ >../doc/help/api-raster.html
+ mxmldoc --tokens help/api-raster.html api-raster.xml >../doc/help/api-raster.tokens
+ $(RM) api-raster.xml
mxmldoc --section "Programming" \
--title "Filter and Backend Programming" \
--css ../doc/cups-printable.css \
@@ -627,6 +752,8 @@ apihelp:
sloc:
echo "libcups: \c"
sloccount $(LIBOBJS:.o=.c) 2>/dev/null | grep "Total Physical" | awk '{print $$9}'
+ echo "libcupsimage: \c"
+ sloccount $(IMAGEOBJS:.o=.c) 2>/dev/null | grep "Total Physical" | awk '{print $$9}'
#
diff --git a/filter/api-raster.header b/cups/api-raster.header
index 31b87b156..31b87b156 100644
--- a/filter/api-raster.header
+++ b/cups/api-raster.header
diff --git a/filter/api-raster.shtml b/cups/api-raster.shtml
index 6d458a2ed..6d458a2ed 100644
--- a/filter/api-raster.shtml
+++ b/cups/api-raster.shtml
diff --git a/filter/error.c b/cups/error.c
index 0916a15fe..0916a15fe 100644
--- a/filter/error.c
+++ b/cups/error.c
diff --git a/filter/interpret.c b/cups/interpret.c
index bb3de3004..bb3de3004 100644
--- a/filter/interpret.c
+++ b/cups/interpret.c
diff --git a/cups/libcups2.def b/cups/libcups2.def
index a7be679f2..83ea9e9a3 100644
--- a/cups/libcups2.def
+++ b/cups/libcups2.def
@@ -1,5 +1,5 @@
LIBRARY libcups2
-VERSION 2.12
+VERSION 2.13
EXPORTS
_cupsArrayAddStrings
_cupsArrayNewStrings
@@ -12,6 +12,7 @@ _cupsCondWait
_cupsConnect
_cupsConvertOptions
_cupsCreateDest
+_cupsEncodeOption
_cupsEncodingName
_cupsGet1284Values
_cupsGetDestResource
@@ -24,13 +25,11 @@ _cupsLangPrintError
_cupsLangPrintf
_cupsLangPuts
_cupsLangString
-_cupsMD5Append
-_cupsMD5Finish
-_cupsMD5Init
_cupsMessageFree
_cupsMessageLoad
_cupsMessageLookup
_cupsMessageNew
+_cupsMessageSave
_cupsMutexInit
_cupsMutexLock
_cupsMutexUnlock
@@ -39,6 +38,9 @@ _cupsRWInit
_cupsRWLockRead
_cupsRWLockWrite
_cupsRWUnlock
+_cupsRasterAddError
+_cupsRasterClearError
+_cupsRasterExecPS
_cupsSNMPClose
_cupsSNMPCopyOID
_cupsSNMPDefaultCommunity
@@ -65,6 +67,7 @@ _cupsStrScand
_cupsStrStatistics
_cupsThreadCancel
_cupsThreadCreate
+_cupsThreadDetach
_cupsThreadWait
_cupsUserDefault
_cups_safe_vsnprintf
@@ -124,6 +127,8 @@ _pwgMediaTable
_pwgMediaTypeForType
_pwgPageSizeForMedia
cupsAddDest
+cupsAddDestMediaOptions
+cupsAddIntegerOption
cupsAddOption
cupsAdminCreateWindowsPPD
cupsAdminExportSamba
@@ -227,6 +232,7 @@ cupsGetDests2
cupsGetDevices
cupsGetFd
cupsGetFile
+cupsGetIntegerOption
cupsGetJobs
cupsGetJobs2
cupsGetNamedDest
@@ -240,6 +246,7 @@ cupsGetPrinters
cupsGetResponse
cupsGetServerPPD
cupsHashData
+cupsHashString
cupsLangDefault
cupsLangEncoding
cupsLangFlush
@@ -261,6 +268,18 @@ cupsPrintFiles
cupsPrintFiles2
cupsPutFd
cupsPutFile
+cupsRasterClose
+cupsRasterErrorString
+cupsRasterInitPWGHeader
+cupsRasterInterpretPPD
+cupsRasterOpen
+cupsRasterOpenIO
+cupsRasterReadHeader
+cupsRasterReadHeader2
+cupsRasterReadPixels
+cupsRasterWriteHeader
+cupsRasterWriteHeader2
+cupsRasterWritePixels
cupsReadResponseData
cupsRemoveDest
cupsRemoveOption
diff --git a/filter/raster.c b/cups/raster.c
index 4efdc64ab..4efdc64ab 100644
--- a/filter/raster.c
+++ b/cups/raster.c
diff --git a/filter/rasterbench.c b/cups/rasterbench.c
index f7d8c56c5..f7d8c56c5 100644
--- a/filter/rasterbench.c
+++ b/cups/rasterbench.c
diff --git a/filter/testclient.c b/cups/testclient.c
index aa3e3e039..aa3e3e039 100644
--- a/filter/testclient.c
+++ b/cups/testclient.c
diff --git a/filter/testraster.c b/cups/testraster.c
index faf2dd2f9..faf2dd2f9 100644
--- a/filter/testraster.c
+++ b/cups/testraster.c
diff --git a/filter/Dependencies b/filter/Dependencies
index 80a49b606..3c023d868 100644
--- a/filter/Dependencies
+++ b/filter/Dependencies
@@ -1,31 +1,17 @@
-error.o: error.c ../cups/raster-private.h ../cups/raster.h ../cups/cups.h \
- ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
- ../cups/array.h ../cups/language.h ../cups/pwg.h \
- ../cups/debug-private.h ../cups/string-private.h ../config.h
-interpret.o: interpret.c ../cups/raster-private.h ../cups/raster.h \
- ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
- ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
- ../cups/debug-private.h ../cups/string-private.h ../config.h \
- ../cups/ppd.h
-raster.o: raster.c ../cups/raster-private.h ../cups/raster.h \
- ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
- ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
- ../cups/debug-private.h ../cups/string-private.h ../config.h
commandtops.o: commandtops.c ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
- ../cups/ppd.h ../cups/raster.h ../cups/sidechannel.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h ../cups/ppd.h \
+ ../cups/raster.h ../cups/sidechannel.h
gziptoany.o: gziptoany.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
common.o: common.c common.h ../cups/string-private.h ../config.h \
../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
@@ -35,9 +21,6 @@ pstops.o: pstops.c common.h ../cups/string-private.h ../config.h \
../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
../cups/ppd.h ../cups/raster.h ../cups/language-private.h \
../cups/transcode.h
-rasterbench.o: rasterbench.c ../config.h ../cups/raster.h ../cups/cups.h \
- ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \
- ../cups/array.h ../cups/language.h ../cups/pwg.h
rastertoepson.o: rastertoepson.c ../cups/cups.h ../cups/file.h \
../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
../cups/language.h ../cups/pwg.h ../cups/ppd.h ../cups/raster.h \
@@ -57,12 +40,7 @@ rastertopwg.o: rastertopwg.c ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h
-testraster.o: testraster.c ../cups/raster-private.h ../cups/raster.h \
- ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
- ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
- ../cups/debug-private.h ../cups/string-private.h ../config.h \
- ../cups/ppd.h
diff --git a/filter/Makefile b/filter/Makefile
index 9b1680995..4f67e20e9 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,16 +1,17 @@
#
# Filter makefile for CUPS.
#
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
# Copyright 1997-2006 by Easy Software Products.
#
-# Licensed under Apache License v2.0. See the file "LICENSE" for more information.
+# Licensed under Apache License v2.0. See the file "LICENSE" for more
+# information.
#
include ../Makedefs
-FILTERS = \
+TARGETS = \
commandtops \
gziptoany \
pstops \
@@ -18,22 +19,10 @@ FILTERS = \
rastertohp \
rastertolabel \
rastertopwg
-LIBTARGETS = \
- $(LIBCUPSIMAGE) \
- libcupsimage.a
-UNITTARGETS = \
- rasterbench \
- testclient \
- testraster
-TARGETS = \
- $(LIBTARGETS) \
- $(FILTERS)
-IMAGEOBJS = error.o interpret.o raster.o
-OBJS = $(IMAGEOBJS) \
- commandtops.o gziptoany.o common.o pstops.o \
- rasterbench.o rastertoepson.o rastertohp.o rastertolabel.o \
- rastertopwg.o testclient.o testraster.o
+OBJS = commandtops.o gziptoany.o common.o pstops.o \
+ rastertoepson.o rastertohp.o rastertolabel.o \
+ rastertopwg.o
#
@@ -119,28 +108,7 @@ install-headers:
# Install libraries...
#
-install-libs: $(INSTALLSTATIC)
- $(INSTALL_DIR) -m 755 $(LIBDIR)
- $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
- -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
- $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
- $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
- fi
- -if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
- $(RM) $(LIBDIR)/libcupsimage.dylib; \
- $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
- fi
- if test "x$(SYMROOT)" != "x"; then \
- $(INSTALL_DIR) $(SYMROOT); \
- cp $(LIBCUPSIMAGE) $(SYMROOT); \
- dsymutil $(SYMROOT)/$(LIBCUPSIMAGE); \
- fi
-
-installstatic:
- $(INSTALL_DIR) -m 755 $(LIBDIR)
- $(INSTALL_LIB) -m 755 libcupsimage.a $(LIBDIR)
- $(RANLIB) $(LIBDIR)/libcupsimage.a
- $(CHMOD) 555 $(LIBDIR)/libcupsimage.a
+install-libs:
#
@@ -154,15 +122,6 @@ uninstall:
$(RM) $(SERVERBIN)/filter/rastertodymo
-$(RMDIR) $(SERVERBIN)/filter
-$(RMDIR) $(SERVERBIN)
- $(RM) $(LIBDIR)/libcupsimage.2.dylib
- $(RM) $(LIBDIR)/libcupsimage.a
- $(RM) $(LIBDIR)/libcupsimage.dylib
- $(RM) $(LIBDIR)/libcupsimage_s.a
- $(RM) $(LIBDIR)/libcupsimage.sl
- $(RM) $(LIBDIR)/libcupsimage.sl.2
- $(RM) $(LIBDIR)/libcupsimage.so
- $(RM) $(LIBDIR)/libcupsimage.so.2
- -$(RMDIR) $(LIBDIR)
#
@@ -171,14 +130,6 @@ uninstall:
apihelp:
echo Generating CUPS API help files...
- mxmldoc --section "Programming" --title "Raster API" \
- --css ../doc/cups-printable.css \
- --header api-raster.header --intro api-raster.shtml \
- api-raster.xml \
- ../cups/raster.h interpret.c raster.c \
- >../doc/help/api-raster.html
- mxmldoc --tokens help/api-raster.html api-raster.xml >../doc/help/api-raster.tokens
- $(RM) api-raster.xml
mxmldoc --section "Programming" \
--title "Developing PostScript Printer Drivers" \
--css ../doc/cups-printable.css \
@@ -224,67 +175,6 @@ gziptoany: gziptoany.o ../Makedefs ../cups/$(LIBCUPS)
#
-# libcupsimage.so.2, libcupsimage.sl.2
-#
-
-libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS)
- echo Linking $@...
- $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
- -L../cups $(LINKCUPS)
- $(RM) `basename $@ .2`
- $(LN) $@ `basename $@ .2`
-
-
-#
-# libcupsimage.2.dylib
-#
-
-libcupsimage.2.dylib: $(IMAGEOBJS) $(LIBCUPSIMAGEORDER)
- echo Linking $@...
- $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
- -install_name $(libdir)/$@ \
- -current_version 2.3.0 \
- -compatibility_version 2.0.0 \
- $(IMAGEOBJS) $(DSOLIBS) -L../cups $(LINKCUPS)
- $(RM) libcupsimage.dylib
- $(LN) $@ libcupsimage.dylib
-
-
-#
-# libcupsimage_s.a
-#
-
-libcupsimage_s.a: $(IMAGEOBJS) libcupsimage_s.exp
- echo Linking $@...
- $(DSO) $(DSOFLAGS) -Wl,-berok,-bexport:libcupsimage_s.exp \
- -o libcupsimage_s.o $(IMAGEOBJS) $(DSOLIBS)
- $(RM) $@
- $(AR) $(ARFLAGS) $@ libcupsimage_s.o
-
-
-#
-# libcupsimage.la
-#
-
-libcupsimage.la: $(IMAGEOBJS)
- echo Linking $@...
- $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
- -L../cups $(LINKCUPS) \
- -rpath $(LIBDIR) -version-info 2:3
-
-
-#
-# libcupsimage.a
-#
-
-libcupsimage.a: $(IMAGEOBJS)
- echo Archiving $@...
- $(RM) $@
- $(AR) $(ARFLAGS) $@ $(IMAGEOBJS)
- $(RANLIB) $@
-
-
-#
# pstops
#
@@ -297,7 +187,7 @@ pstops: pstops.o common.o ../cups/$(LIBCUPS)
# rastertoepson
#
-rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
+rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
echo Linking $@...
$(LD_CC) $(LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
@@ -306,7 +196,7 @@ rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
# rastertohp
#
-rastertohp: rastertohp.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
+rastertohp: rastertohp.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
echo Linking $@...
$(LD_CC) $(LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
@@ -315,7 +205,7 @@ rastertohp: rastertohp.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
# rastertolabel
#
-rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
+rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
echo Linking $@...
$(LD_CC) $(LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
@@ -324,51 +214,18 @@ rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
# rastertopwg
#
-rastertopwg: rastertopwg.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
+rastertopwg: rastertopwg.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
echo Linking $@...
$(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
-rastertopwg-static: rastertopwg.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
+rastertopwg-static: rastertopwg.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.a
echo Linking $@...
- $(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o libcupsimage.a \
+ $(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o ../cups/libcupsimage.a \
../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
$(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
#
-# testclient (dependency on static libraries is intentional)
-#
-
-testclient: testclient.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
- echo Linking $@...
- $(LD_CC) $(LDFLAGS) -o $@ testclient.o \
- libcupsimage.a ../cups/$(LIBCUPSSTATIC) \
- $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
-
-
-#
-# testraster
-#
-
-testraster: testraster.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
- echo Linking $@...
- $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \
- ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
- $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
- echo Running raster API tests...
- ./testraster
-
-
-#
-# rasterbench
-#
-
-rasterbench: rasterbench.o libcupsimage.a
- echo Linking $@...
- $(LD_CC) $(LDFLAGS) -o $@ rasterbench.o libcupsimage.a $(LIBS)
-
-
-#
# Dependencies...
#
diff --git a/filter/libcupsimage2.def b/filter/libcupsimage2.def
deleted file mode 100644
index 3c20284f5..000000000
--- a/filter/libcupsimage2.def
+++ /dev/null
@@ -1,14 +0,0 @@
-LIBRARY libcupsimage2
-VERSION 2.3
-EXPORTS
-cupsRasterClose
-cupsRasterErrorString
-cupsRasterInterpretPPD
-cupsRasterOpen
-cupsRasterOpenIO
-cupsRasterReadHeader
-cupsRasterReadHeader2
-cupsRasterReadPixels
-cupsRasterWriteHeader
-cupsRasterWriteHeader2
-cupsRasterWritePixels
diff --git a/filter/libcupsimage_s.exp b/filter/libcupsimage_s.exp
deleted file mode 100644
index 57f4259f9..000000000
--- a/filter/libcupsimage_s.exp
+++ /dev/null
@@ -1,16 +0,0 @@
-_cupsImagePutCol
-_cupsImagePutRow
-_cupsImageReadBMP
-_cupsImageReadGIF
-_cupsImageReadJPEG
-_cupsImageReadPIX
-_cupsImageReadPNG
-_cupsImageReadPNM
-_cupsImageReadPhotoCD
-_cupsImageReadSGI
-_cupsImageReadSunRaster
-_cupsImageReadTIFF
-_cupsImageZoomDelete
-_cupsImageZoomFill
-_cupsImageZoomNew
-_cupsRasterExecPS
diff --git a/locale/Dependencies b/locale/Dependencies
index 0aa4636c2..92d2349c2 100644
--- a/locale/Dependencies
+++ b/locale/Dependencies
@@ -2,14 +2,13 @@ checkpo.o: checkpo.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
po2strings.o: po2strings.c ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
strings2po.o: strings2po.c
diff --git a/monitor/Dependencies b/monitor/Dependencies
index ae6d2bf09..1ad3e7af5 100644
--- a/monitor/Dependencies
+++ b/monitor/Dependencies
@@ -1,14 +1,14 @@
bcp.o: bcp.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
../cups/debug-private.h ../cups/versioning.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
- ../cups/ppd.h ../cups/raster.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h ../cups/ppd.h \
+ ../cups/raster.h
tbcp.o: tbcp.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/ppd.h ../cups/raster.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/ppd.h ../cups/raster.h
diff --git a/notifier/Dependencies b/notifier/Dependencies
index a6bc42186..6bb334143 100644
--- a/notifier/Dependencies
+++ b/notifier/Dependencies
@@ -5,9 +5,8 @@ mailto.o: mailto.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
rss.o: rss.c ../cups/cups.h ../cups/file.h ../cups/versioning.h \
../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h \
../cups/pwg.h ../cups/string-private.h ../config.h \
@@ -16,6 +15,6 @@ testnotify.o: testnotify.c ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
diff --git a/ppdc/Dependencies b/ppdc/Dependencies
index 44c4bbdb8..f6080d386 100644
--- a/ppdc/Dependencies
+++ b/ppdc/Dependencies
@@ -2,185 +2,182 @@ ppdc-array.o: ppdc-array.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-attr.o: ppdc-attr.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-catalog.o: ppdc-catalog.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-choice.o: ppdc-choice.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-constraint.o: ppdc-constraint.cxx ppdc-private.h ppdc.h \
../cups/file.h ../cups/versioning.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
- ../cups/thread-private.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
ppdc-driver.o: ppdc-driver.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-file.o: ppdc-file.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-filter.o: ppdc-filter.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-font.o: ppdc-font.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-group.o: ppdc-group.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-import.o: ppdc-import.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h ../cups/ppd.h \
- ../cups/raster.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h ../cups/ppd.h ../cups/raster.h
ppdc-mediasize.o: ppdc-mediasize.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-message.o: ppdc-message.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-option.o: ppdc-option.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-profile.o: ppdc-profile.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-shared.o: ppdc-shared.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-source.o: ppdc-source.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h ../cups/raster.h \
- ../data/epson.h ../data/hp.h ../data/label.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h ../cups/raster.h ../data/epson.h ../data/hp.h \
+ ../data/label.h
ppdc-string.o: ppdc-string.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc-variable.o: ppdc-variable.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
genstrings.o: genstrings.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdc.o: ppdc.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdhtml.o: ppdhtml.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdi.o: ppdi.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
ppdmerge.o: ppdmerge.cxx ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/ppd-private.h ../cups/ppd.h \
- ../cups/raster.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h
ppdpo.o: ppdpo.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
testcatalog.o: testcatalog.cxx ppdc-private.h ppdc.h ../cups/file.h \
../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h ../cups/pwg.h \
+ ../cups/thread-private.h
diff --git a/scheduler/Dependencies b/scheduler/Dependencies
index a6bc87486..49eef9237 100644
--- a/scheduler/Dependencies
+++ b/scheduler/Dependencies
@@ -2,19 +2,19 @@ auth.o: auth.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
- ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
- client.h policy.h printers.h classes.h job.h colorman.h conf.h \
- banners.h dirsvc.h network.h subscriptions.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+ policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+ dirsvc.h network.h subscriptions.h
banners.o: banners.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
@@ -23,19 +23,19 @@ cert.o: cert.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
- ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
- client.h policy.h printers.h classes.h job.h colorman.h conf.h \
- banners.h dirsvc.h network.h subscriptions.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+ policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+ dirsvc.h network.h subscriptions.h
classes.o: classes.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
@@ -44,9 +44,9 @@ client.o: client.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
@@ -55,9 +55,9 @@ colorman.o: colorman.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
@@ -66,19 +66,19 @@ conf.o: conf.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
- ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
- client.h policy.h printers.h classes.h job.h colorman.h conf.h \
- banners.h dirsvc.h network.h subscriptions.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+ policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+ dirsvc.h network.h subscriptions.h
dirsvc.o: dirsvc.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
@@ -87,49 +87,49 @@ env.o: env.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
- ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
- client.h policy.h printers.h classes.h job.h colorman.h conf.h \
- banners.h dirsvc.h network.h subscriptions.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+ policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+ dirsvc.h network.h subscriptions.h
file.o: file.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
- ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
- client.h policy.h printers.h classes.h job.h colorman.h conf.h \
- banners.h dirsvc.h network.h subscriptions.h ../cups/dir.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+ policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+ dirsvc.h network.h subscriptions.h ../cups/dir.h
main.o: main.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
- ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
- client.h policy.h printers.h classes.h job.h colorman.h conf.h \
- banners.h dirsvc.h network.h subscriptions.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+ policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+ dirsvc.h network.h subscriptions.h
ipp.o: ipp.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
- ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
- client.h policy.h printers.h classes.h job.h colorman.h conf.h \
- banners.h dirsvc.h network.h subscriptions.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+ policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+ dirsvc.h network.h subscriptions.h
listen.o: listen.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
@@ -138,41 +138,39 @@ job.o: job.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
- ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
- client.h policy.h printers.h classes.h job.h colorman.h conf.h \
- banners.h dirsvc.h network.h subscriptions.h ../cups/backend.h \
- ../cups/dir.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
+ ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
+ policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
+ dirsvc.h network.h subscriptions.h ../cups/backend.h ../cups/dir.h
log.o: log.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
- ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
- client.h policy.h printers.h classes.h job.h colorman.h conf.h \
- banners.h dirsvc.h network.h subscriptions.h
-network.o: network.c ../cups/http-private.h ../config.h \
- ../cups/language.h ../cups/array.h ../cups/versioning.h ../cups/http.h \
- ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h cupsd.h \
- ../cups/cups-private.h ../cups/string-private.h \
- ../cups/debug-private.h ../cups/array-private.h \
../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
dirsvc.h network.h subscriptions.h
+network.o: network.c ../cups/http-private.h ../config.h \
+ ../cups/language.h ../cups/array.h ../cups/versioning.h ../cups/http.h \
+ ../cups/ipp-private.h ../cups/ipp.h cupsd.h ../cups/cups-private.h \
+ ../cups/string-private.h ../cups/debug-private.h \
+ ../cups/array-private.h ../cups/language-private.h ../cups/transcode.h \
+ ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
+ ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
+ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
+ client.h policy.h printers.h classes.h job.h colorman.h conf.h \
+ banners.h dirsvc.h network.h subscriptions.h
policy.o: policy.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
@@ -181,9 +179,9 @@ printers.o: printers.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
@@ -192,9 +190,9 @@ process.o: process.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
@@ -203,9 +201,9 @@ quotas.o: quotas.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
@@ -214,31 +212,30 @@ select.o: select.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
dirsvc.h network.h subscriptions.h
server.o: server.c ../cups/http-private.h ../config.h ../cups/language.h \
../cups/array.h ../cups/versioning.h ../cups/http.h \
- ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h cupsd.h \
- ../cups/cups-private.h ../cups/string-private.h \
- ../cups/debug-private.h ../cups/array-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
- ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
- ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
- policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
- dirsvc.h network.h subscriptions.h
+ ../cups/ipp-private.h ../cups/ipp.h cupsd.h ../cups/cups-private.h \
+ ../cups/string-private.h ../cups/debug-private.h \
+ ../cups/array-private.h ../cups/language-private.h ../cups/transcode.h \
+ ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
+ ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \
+ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \
+ client.h policy.h printers.h classes.h job.h colorman.h conf.h \
+ banners.h dirsvc.h network.h subscriptions.h
statbuf.o: statbuf.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
@@ -247,9 +244,9 @@ subscriptions.o: subscriptions.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
@@ -258,9 +255,9 @@ sysman.o: sysman.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h client.h \
policy.h printers.h classes.h job.h colorman.h conf.h banners.h \
@@ -279,9 +276,9 @@ cupsfilter.o: cupsfilter.c ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \
../cups/raster.h mime.h
cups-deviced.o: cups-deviced.c util.h ../cups/array-private.h \
@@ -289,18 +286,17 @@ cups-deviced.o: cups-deviced.c util.h ../cups/array-private.h \
../cups/cups-private.h ../cups/string-private.h ../config.h \
../cups/debug-private.h ../cups/ipp-private.h ../cups/ipp.h \
../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/dir.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/dir.h
cups-exec.o: cups-exec.c ../cups/string-private.h ../config.h \
../cups/file.h ../cups/versioning.h
cups-lpd.o: cups-lpd.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
testlpd.o: testlpd.c ../cups/cups.h ../cups/file.h ../cups/versioning.h \
../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h \
../cups/pwg.h ../cups/string-private.h ../config.h
@@ -321,15 +317,15 @@ util.o: util.c util.h ../cups/array-private.h ../cups/array.h \
../cups/versioning.h ../cups/file-private.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
cups-driverd.o: cups-driverd.cxx util.h ../cups/array-private.h \
../cups/array.h ../cups/versioning.h ../cups/file-private.h \
../cups/cups-private.h ../cups/string-private.h ../config.h \
../cups/debug-private.h ../cups/ipp-private.h ../cups/ipp.h \
../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/dir.h ../cups/ppd-private.h \
- ../cups/ppd.h ../cups/raster.h ../ppdc/ppdc.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/dir.h ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h \
+ ../ppdc/ppdc.h
diff --git a/scheduler/Makefile b/scheduler/Makefile
index 76806d999..9327e6120 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -116,7 +116,7 @@ clean:
depend:
$(CC) -MM $(ALL_CFLAGS) $(COBJS:.o=.c) >Dependencies
- $(CXX) -MM $(ALL_CXXFLAGS) $(LD_CXXOBJS:.o=.cxx) >>Dependencies
+ $(CXX) -MM $(ALL_CXXFLAGS) $(CXXOBJS:.o=.cxx) >>Dependencies
#
diff --git a/systemv/Dependencies b/systemv/Dependencies
index a1fc7f619..bf273466e 100644
--- a/systemv/Dependencies
+++ b/systemv/Dependencies
@@ -2,86 +2,81 @@ cancel.o: cancel.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
cupsaccept.o: cupsaccept.c ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
cupsaddsmb.o: cupsaddsmb.c ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
../cups/adminutil.h
cupsctl.o: cupsctl.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/adminutil.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/adminutil.h
cupstestdsc.o: cupstestdsc.c ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
cupstestppd.o: cupstestppd.c ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/debug-private.h \
../cups/versioning.h ../cups/array-private.h ../cups/array.h \
../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
- ../cups/dir.h ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h ../cups/dir.h \
+ ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h
lp.o: lp.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
../cups/debug-private.h ../cups/versioning.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/ipp.h ../cups/http.h \
- ../cups/http-private.h ../cups/language.h ../cups/md5-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
+ ../cups/http-private.h ../cups/language.h ../cups/language-private.h \
+ ../cups/transcode.h ../cups/pwg-private.h ../cups/cups.h \
+ ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
lpadmin.o: lpadmin.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/ppd-private.h ../cups/ppd.h \
- ../cups/raster.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h
lpinfo.o: lpinfo.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/adminutil.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/adminutil.h
lpmove.o: lpmove.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
lpoptions.o: lpoptions.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/ppd-private.h ../cups/ppd.h \
- ../cups/raster.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h
lpstat.o: lpstat.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
diff --git a/systemv/Makefile b/systemv/Makefile
index beab66b40..68eedd0a0 100644
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -1,7 +1,7 @@
#
# System V commands makefile for CUPS.
#
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
# Copyright 1997-2006 by Easy Software Products, all rights reserved.
#
# Licensed under Apache License v2.0. See the file "LICENSE" for more information.
@@ -201,13 +201,13 @@ cupstestdsc: cupstestdsc.o ../cups/$(LIBCUPS)
# cupstestppd
#
-cupstestppd: cupstestppd.o ../cups/$(LIBCUPS) ../filter/$(LIBCUPSIMAGE)
+cupstestppd: cupstestppd.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
echo Linking $@...
$(LD_CC) $(LDFLAGS) -o $@ cupstestppd.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
-cupstestppd-static: cupstestppd.o ../cups/$(LIBCUPSSTATIC) ../filter/libcupsimage.a
+cupstestppd-static: cupstestppd.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.a
echo Linking $@...
- $(LD_CC) $(LDFLAGS) -o $@ cupstestppd.o ../filter/libcupsimage.a \
+ $(LD_CC) $(LDFLAGS) -o $@ cupstestppd.o ../cups/libcupsimage.a \
../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(LIBGSSAPI) $(LIBS) $(LIBZ)
diff --git a/test/Dependencies b/test/Dependencies
index 031b4113c..de6eeb90d 100644
--- a/test/Dependencies
+++ b/test/Dependencies
@@ -2,9 +2,8 @@ ippfind.o: ippfind.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h
ippserver.o: ippserver.c ../config.h ../cups/cups.h ../cups/file.h \
../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
../cups/language.h ../cups/pwg.h ../cups/string-private.h \
@@ -13,6 +12,6 @@ ipptool.o: ipptool.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/debug-private.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
../cups/ipp.h ../cups/http.h ../cups/http-private.h ../cups/language.h \
- ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
- ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
- ../cups/thread-private.h ../cups/file-private.h
+ ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
+ ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \
+ ../cups/file-private.h
View Lorry Controller Status