diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-12-09 16:56:00 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-12-09 16:56:00 +0000 |
commit | f787e1e3ff11339269bdc11e253af91e5961e013 (patch) | |
tree | aa88a0248e61c56dc84696b544a455005cfddfff /backend | |
parent | 7f2dc952e01cc1b063b2b46b4a6966659e1dc092 (diff) | |
download | cups-f787e1e3ff11339269bdc11e253af91e5961e013.tar.gz |
Do some code reorganization so that all of the PPD code is separate from the rest.
Note: cupsGetPPD* and friends are now in cups/ppd.h now - should not be an issue
but was necessary to leave a clean break for future code.
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@13007 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend')
-rw-r--r-- | backend/Dependencies | 45 | ||||
-rw-r--r-- | backend/ieee1284.c | 3 | ||||
-rw-r--r-- | backend/ipp.c | 1 | ||||
-rw-r--r-- | backend/snmp-supplies.c | 3 | ||||
-rw-r--r-- | backend/usb-darwin.c | 1 |
5 files changed, 26 insertions, 27 deletions
diff --git a/backend/Dependencies b/backend/Dependencies index 2d6e7eb03..66b2de564 100644 --- a/backend/Dependencies +++ b/backend/Dependencies @@ -4,54 +4,50 @@ ipp.o: ipp.c backend-private.h ../cups/cups-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/ppd-private.h \ - ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \ - ../cups/backend.h ../cups/sidechannel.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 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/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/ppd-private.h \ - ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \ - ../cups/backend.h ../cups/sidechannel.h + ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \ + ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h 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/ppd-private.h \ - ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \ - ../cups/backend.h ../cups/sidechannel.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/ppd-private.h \ - ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \ - ../cups/backend.h ../cups/sidechannel.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/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/ppd-private.h \ - ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \ - ../cups/backend.h ../cups/sidechannel.h + ../cups/cups.h ../cups/file.h ../cups/pwg.h ../cups/thread-private.h \ + ../cups/snmp-private.h ../cups/backend.h ../cups/sidechannel.h 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/ppd-private.h \ - ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \ - ../cups/backend.h ../cups/sidechannel.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 testbackend.o: testbackend.c ../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 \ @@ -62,16 +58,15 @@ testsupplies.o: testsupplies.c backend-private.h ../cups/cups-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/ppd-private.h \ - ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \ - ../cups/backend.h ../cups/sidechannel.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/ppd-private.h \ - ../cups/ppd.h ../cups/thread-private.h ../cups/snmp-private.h \ - ../cups/backend.h ../cups/sidechannel.h usb-darwin.c \ - ../cups/file-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 diff --git a/backend/ieee1284.c b/backend/ieee1284.c index b4ded43ee..6ffa31af7 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -3,7 +3,7 @@ * * IEEE-1284 support functions for CUPS. * - * Copyright 2007-2014 by Apple Inc. + * Copyright 2007-2015 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -20,6 +20,7 @@ */ #include "backend-private.h" +#include <cups/ppd-private.h> /* diff --git a/backend/ipp.c b/backend/ipp.c index 5d0fc662d..44bbd0c9e 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -20,6 +20,7 @@ */ #include "backend-private.h" +#include <cups/ppd-private.h> #include <cups/array-private.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c index 3f2869d6b..129f70026 100644 --- a/backend/snmp-supplies.c +++ b/backend/snmp-supplies.c @@ -3,7 +3,7 @@ * * SNMP supplies functions for CUPS. * - * Copyright 2008-2014 by Apple Inc. + * Copyright 2008-2015 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -19,6 +19,7 @@ */ #include "backend-private.h" +#include <cups/ppd-private.h> #include <cups/array.h> diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index 2df79f4fe..17d62902b 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -63,6 +63,7 @@ #include <cups/file-private.h> #include <cups/sidechannel.h> #include <cups/language-private.h> +#include <cups/ppd-private.h> #include "backend-private.h" #include <CoreFoundation/CoreFoundation.h> #include <IOKit/usb/IOUSBLib.h> |