<rdar://problem/5792631> dependency cycle in cups-144 / PrintingCore-250 / ApplicationServices

Merge build system changes to use shared support libraries.

Merge build system changes to separate installation of data, program, header,
and library files.


git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@668 a1ca3aef-8c08-0410-bb20-df032aa958be

43 files changed, 2629 insertions, 294 deletions

diff --git a/CHANGES-1.3.txt b/CHANGES-1.3.txt
index 4f2a9d6ab..0da640d7b 100644
--- a/CHANGES-1.3.txt
+++ b/CHANGES-1.3.txt
@@ -3,6 +3,8 @@ CHANGES-1.3.txt
 
 CHANGES IN CUPS V1.3.7
 
+	- The scheduler sent notify_post() messages too often on
+	  Mac OS X.
 	- Kerberos access to the web interface did not work
 	  (STR #2748)
 	- The scheduler did not support "AuthType Default" in IPP
diff --git a/CHANGES.txt b/CHANGES.txt
index 0490562f1..5d4c25186 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,12 @@
-CHANGES.txt - 2008-02-26
+CHANGES.txt - 2008-03-21
 ------------------------
 
 CHANGES IN CUPS V1.4b1
 
+	- The build system has been updated to support separate
+	  installation of data, program, header, and library files.
+	- All support libraries are now built as shared libraries
+	  by default.
 	- The scheduler now manages ICC color profiles on Mac OS X.
 	- The network backends (ipp, lpd, socket) now support
 	  SNMP-based supply and page count monitoring (STR #1655)
diff --git a/Makedefs.in b/Makedefs.in
index 1868ee861..cb771a0fa 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -22,6 +22,7 @@ AWK		=	@AWK@
 CC		=	@LIBTOOL@ @CC@
 CXX		=	@LIBTOOL@ @CXX@
 DSO		=	@DSO@
+DSOXX		=	@DSOXX@
 HTMLDOC		=	@HTMLDOC@
 INSTALL		=	@INSTALL@
 LD		=	@LD@
@@ -40,11 +41,11 @@ STRIP		=	@STRIP@
 # Installation programs...
 #
 
-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755
+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
 INSTALL_CONFIG	=	$(INSTALL) -m @CUPS_CONFIG_FILE_PERM@
 INSTALL_DATA	=	$(INSTALL) -m 644
 INSTALL_DIR	=	$(INSTALL) -d
-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
 INSTALL_MAN	=	$(INSTALL) -m 644
 INSTALL_SCRIPT	=	$(INSTALL) -m 755
 
@@ -77,7 +78,11 @@ UNINSTALL_LANGUAGES =	@UNINSTALL_LANGUAGES@
 #
 
 LIBCUPS		=	@LIBCUPS@
+LIBCUPSCGI	=	@LIBCUPSCGI@
+LIBCUPSDRIVER	=	@LIBCUPSDRIVER@
 LIBCUPSIMAGE	=	@LIBCUPSIMAGE@
+LIBCUPSMIME	=	@LIBCUPSMIME@
+LIBCUPSPPDC	=	@LIBCUPSPPDC@
 LIBJPEG		=	@LIBJPEG@
 LIBLDAP		=	@LIBLDAP@
 LIBMALLOC	=	@LIBMALLOC@
@@ -120,7 +125,7 @@ COMMONLIBS	=	@LIBS@
 CUPSDLIBS	=	@CUPSDLIBS@
 CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
 CXXLIBS		=	@CXXLIBS@
-DSOFLAGS	=	@DSOFLAGS@
+DSOFLAGS	=	-L../cups @DSOFLAGS@
 DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
 DNSSDLIBS	=	@DNSSDLIBS@
 FONTS		=	@FONTS@
diff --git a/Makefile b/Makefile
index 18b871f58..2a6d27b9f 100644
--- a/Makefile
+++ b/Makefile
@@ -93,13 +93,20 @@ ctags:
 
 
 #
-# Install object and target files...
+# Install everything...
 #
 
-install:	installhdrs
+install:	install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
 	for dir in $(DIRS); do\
-		echo Installing in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
+		echo Installing data files in $$dir... ;\
+		(cd $$dir; $(MAKE) $(MFLAGS) install-data) || exit 1;\
 	done
 	echo Installing cups-config script...
 	$(INSTALL_DIR) -m 755 $(BINDIR)
@@ -167,17 +174,37 @@ install:	installhdrs
 		$(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps/cups.png; \
 	fi
 
+#
+# Install header files...
+#
+
+install-headers:
+	for dir in $(DIRS); do\
+		echo Installing header files in $$dir... ;\
+		(cd $$dir; $(MAKE) $(MFLAGS) install-headers) || exit 1;\
+	done
+
 
 #
-# Install source and header files...
+# Install programs...
 #
 
-installsrc:
-	gnutar --dereference --exclude=.svn -cf - . | gnutar -C $(SRCROOT) -xf -
+install-exec:
+	for dir in $(DIRS); do\
+		echo Installing programs in $$dir... ;\
+		(cd $$dir; $(MAKE) $(MFLAGS) all install-exec) || exit 1;\
+	done
 
-installhdrs:
-	(cd cups ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;\
-	(cd filter ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;
+
+#
+# Install libraries...
+#
+
+install-libs:
+	for dir in $(DIRS); do\
+		echo Installing libraries in $$dir... ;\
+		(cd $$dir; $(MAKE) $(MFLAGS) all install-libs) || exit 1;\
+	done
 
 
 #
diff --git a/backend/Makefile b/backend/Makefile
index a2bb1621f..ff3cdcf3a 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -53,7 +53,21 @@ depend:
 # Install all targets...
 #
 
-install:	all
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
 	for file in $(RBACKENDS); do \
 		$(LIBTOOL) $(INSTALL) -m 700 $$file $(SERVERBIN)/backend; \
@@ -72,6 +86,20 @@ install:	all
 
 
 #
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
 # Uninstall all targets...
 #
 
diff --git a/berkeley/Makefile b/berkeley/Makefile
index 1023c1a33..504796ce5 100644
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -3,7 +3,7 @@
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -46,7 +46,21 @@ depend:
 # Install all targets...
 #
 
-install:	all
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
 	$(INSTALL_DIR) -m 755 $(BINDIR)
 	$(INSTALL_BIN) lpq $(BINDIR)
 	$(INSTALL_BIN) lpr $(BINDIR)
@@ -62,6 +76,20 @@ install:	all
 
 
 #
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
 # Uninstall all targets...
 #
 
diff --git a/cgi-bin/Dependencies b/cgi-bin/Dependencies
index 63395ad5e..1d4cb9791 100644
--- a/cgi-bin/Dependencies
+++ b/cgi-bin/Dependencies
@@ -1,4 +1,4 @@
-# DO NOT DELETE THIS LINE -- make depend depends on it.
+# DO NOT DELETE
 
 help-index.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 help-index.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
@@ -56,3 +56,119 @@ testtemplate.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 testtemplate.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 testtemplate.o: ../cups/file.h ../cups/language.h ../cups/array.h
 testtemplate.o: help-index.h
+# DO NOT DELETE
+
+help-index.32.o: help-index.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+help-index.32.o: help-index.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+help-index.32.o: help-index.c  ../cups/file.h ../cups/language.h ../cups/array.h help-index.h
+help-index.32.o: help-index.c  ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
+help-index.32.o: help-index.c  ../cups/string.h ../config.h ../cups/dir.h
+html.32.o: html.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+html.32.o: html.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+html.32.o: html.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+html.32.o: html.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+ipp-var.32.o: ipp-var.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+ipp-var.32.o: ipp-var.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+ipp-var.32.o: ipp-var.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+ipp-var.32.o: ipp-var.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+search.32.o: search.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+search.32.o: search.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+search.32.o: search.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+search.32.o: search.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+template.32.o: template.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+template.32.o: template.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+template.32.o: template.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+template.32.o: template.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+var.32.o: var.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+var.32.o: var.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+var.32.o: var.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+var.32.o: var.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+admin.32.o: admin.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+admin.32.o: admin.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+admin.32.o: admin.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+admin.32.o: admin.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+admin.32.o: admin.c  ../cups/adminutil.h ../cups/cups.h ../cups/file.h
+classes.32.o: classes.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+classes.32.o: classes.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+classes.32.o: classes.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+classes.32.o: classes.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+help.32.o: help.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+help.32.o: help.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+help.32.o: help.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+help.32.o: help.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+jobs.32.o: jobs.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+jobs.32.o: jobs.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+jobs.32.o: jobs.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+jobs.32.o: jobs.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+printers.32.o: printers.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+printers.32.o: printers.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+printers.32.o: printers.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+printers.32.o: printers.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+testcgi.32.o: testcgi.c  cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testcgi.32.o: testcgi.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+testcgi.32.o: testcgi.c  ../cups/language.h ../cups/array.h help-index.h
+testhi.32.o: testhi.c  cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testhi.32.o: testhi.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+testhi.32.o: testhi.c  ../cups/language.h ../cups/array.h help-index.h
+testtemplate.32.o: testtemplate.c  cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testtemplate.32.o: testtemplate.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+testtemplate.32.o: testtemplate.c  ../cups/file.h ../cups/language.h ../cups/array.h
+testtemplate.32.o: testtemplate.c  help-index.h
+# DO NOT DELETE
+
+help-index.64.o: help-index.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+help-index.64.o: help-index.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+help-index.64.o: help-index.c  ../cups/file.h ../cups/language.h ../cups/array.h help-index.h
+help-index.64.o: help-index.c  ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
+help-index.64.o: help-index.c  ../cups/string.h ../config.h ../cups/dir.h
+html.64.o: html.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+html.64.o: html.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+html.64.o: html.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+html.64.o: html.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+ipp-var.64.o: ipp-var.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+ipp-var.64.o: ipp-var.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+ipp-var.64.o: ipp-var.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+ipp-var.64.o: ipp-var.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+search.64.o: search.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+search.64.o: search.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+search.64.o: search.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+search.64.o: search.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+template.64.o: template.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+template.64.o: template.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+template.64.o: template.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+template.64.o: template.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+var.64.o: var.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+var.64.o: var.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+var.64.o: var.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+var.64.o: var.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+admin.64.o: admin.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+admin.64.o: admin.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+admin.64.o: admin.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+admin.64.o: admin.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+admin.64.o: admin.c  ../cups/adminutil.h ../cups/cups.h ../cups/file.h
+classes.64.o: classes.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+classes.64.o: classes.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+classes.64.o: classes.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+classes.64.o: classes.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+help.64.o: help.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+help.64.o: help.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+help.64.o: help.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+help.64.o: help.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+jobs.64.o: jobs.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+jobs.64.o: jobs.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+jobs.64.o: jobs.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+jobs.64.o: jobs.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+printers.64.o: printers.c  cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+printers.64.o: printers.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+printers.64.o: printers.c  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h
+printers.64.o: printers.c  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+testcgi.64.o: testcgi.c  cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testcgi.64.o: testcgi.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+testcgi.64.o: testcgi.c  ../cups/language.h ../cups/array.h help-index.h
+testhi.64.o: testhi.c  cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testhi.64.o: testhi.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+testhi.64.o: testhi.c  ../cups/language.h ../cups/array.h help-index.h
+testtemplate.64.o: testtemplate.c  cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testtemplate.64.o: testtemplate.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+testtemplate.64.o: testtemplate.c  ../cups/file.h ../cups/language.h ../cups/array.h
+testtemplate.64.o: testtemplate.c  help-index.h
diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 5637c900f..4122d37ee 100644
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -3,7 +3,7 @@
 #
 #   CGI makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -15,11 +15,42 @@
 
 include ../Makedefs
 
-CGIS	=	admin.cgi classes.cgi help.cgi jobs.cgi printers.cgi
-TARGETS	=	libcgi.a $(CGIS) testcgi testhi testtemplate
-LIBOBJS	=	help-index.o html.o ipp-var.o search.o template.o var.o
-OBJS	=	$(LIBOBJS) admin.o classes.o help.o \
-		jobs.o printers.o testcgi.o testhi.o testtemplate.o
+LIBOBJS	=	\
+		help-index.o \
+		html.o \
+		ipp-var.o \
+		search.o \
+		template.o \
+		var.o
+LIB32OBJS	= $(LIBOBJS:.o=.32.o)
+LIB64OBJS	= $(LIBOBJS:.o=.64.o)
+OBJS	=	\
+		$(LIBOBJS) \
+		$(LIB32OBJS) \
+		$(LIB64OBJS) \
+		admin.o \
+		classes.o \
+		help.o \
+		jobs.o \
+		printers.o \
+		testcgi.o \
+		testhi.o \
+		testtemplate.o
+CGIS	=	\
+		admin.cgi \
+		classes.cgi \
+		help.cgi \
+		jobs.cgi \
+		printers.cgi
+TARGETS	=	\
+		libcupscgi.a \
+		$(LIBCUPSCGI) \
+		$(LIB32CUPSCGI) \
+		$(LIB32CUPSCGI) \
+		$(CGIS) \
+		testcgi \
+		testhi \
+		testtemplate
 
 
 #
@@ -35,6 +66,8 @@ all:	$(TARGETS)
 
 clean:
 	$(RM) $(OBJS) $(TARGETS)
+	$(RM) libcupscgi.so libcupscgi.sl libcupscgi.dylib
+	$(RM) -r 32bit 64bit
 
 
 #
@@ -42,14 +75,34 @@ clean:
 #
 
 depend:
-	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
+	touch Dependencies.tmp
+	makedepend -Y -I.. -fDependencies.tmp $(OBJS:.o=.c) >/dev/null 2>&1
+	$(RM) Dependencies
+	cp Dependencies.tmp Dependencies
+	sed -E -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' Dependencies.tmp >>Dependencies
+	sed -E -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies
+	$(RM) Dependencies.tmp
 
 
 #
 # Install all targets...
 #
 
-install:	all
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/cgi-bin
 	for file in $(CGIS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
@@ -63,21 +116,186 @@ install:	all
 
 
 #
+# Install headers...
+#
+
+install-headers:
+	echo Installing header files in $(INCLUDEDIR)/cups...
+	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
+	$(INSTALL_DATA) cgi.h $(INCLUDEDIR)/cups
+	$(INSTALL_DATA) help-index.h $(INCLUDEDIR)/cups
+
+
+#
+# Install libraries...
+#
+
+install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+	echo Installing libraries in $(LIBDIR)...
+	$(INSTALL_DIR) -m 755 $(LIBDIR)
+	$(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR)
+	if test $(LIBCUPSCGI) = "libcupscgi.so.1" -o $(LIBCUPSCGI) = "libcupscgi.sl.1"; then \
+		$(RM) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
+		$(LN) $(LIBCUPSCGI) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
+	fi
+	if test $(LIBCUPSCGI) = "libcupscgi.1.dylib"; then \
+		$(STRIP) -x $(LIBDIR)/$(LIBCUPSCGI); \
+		$(RM) $(LIBDIR)/libcupscgi.dylib; \
+		$(LN) $(LIBCUPSCGI) $(LIBDIR)/libcupscgi.dylib; \
+	fi
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		cp $(LIBCUPSCGI) $(SYMROOT); \
+	fi
+
+installstatic:
+	$(INSTALL_DIR) -m 755 $(LIBDIR)
+	$(INSTALL_LIB) libcupscgi.a $(LIBDIR)
+	$(RANLIB) $(LIBDIR)/libcupscgi.a
+
+install32bit:
+	echo Installing libraries in $(LIB32DIR)...
+	$(INSTALL_DIR) -m 755 $(LIB32DIR)
+	$(INSTALL_LIB) 32bit/libcupscgi.so.1 $(LIB32DIR)/libcupscgi.so.1
+	$(LN) libcupscgi.so.1 $(LIB32DIR)/libcupscgi.so
+
+install64bit:
+	echo Installing libraries in $(LIB64DIR)...
+	$(INSTALL_DIR) -m 755 $(LIB64DIR)
+	$(INSTALL_LIB) 64bit/libcupscgi.so.1 $(LIB64DIR)/libcupscgi.so.1
+	$(LN) libcupscgi.so.1 $(LIB64DIR)/libcupscgi.so
+
+
+#
 # Uninstall all targets...
 #
 
-uninstall:
+uninstall: $(UNINSTALL32) $(UNINSTALL64)
 	for file in $(CGIS); do \
 		$(RM) $(SERVERBIN)/cgi-bin/$$file; \
 	done
 	-$(RMDIR) $(SERVERBIN)/cgi-bin
+	$(RM) $(LIBDIR)/libcupscgi.1.dylib
+	$(RM) $(LIBDIR)/libcupscgi.a
+	$(RM) $(LIBDIR)/libcupscgi.dylib
+	$(RM) $(LIBDIR)/libcupscgi_s.a
+	$(RM) $(LIBDIR)/libcupscgi.sl
+	$(RM) $(LIBDIR)/libcupscgi.sl.1
+	$(RM) $(LIBDIR)/libcupscgi.so
+	$(RM) $(LIBDIR)/libcupscgi.so.1
+	-$(RMDIR) $(LIBDIR)
+	$(RM) $(INCLUDEDIR)/cups/cgi.h
+	$(RM) $(INCLUDEDIR)/cups/help-index.h
+	-$(RMDIR) $(INCLUDEDIR)/cups
+
+uninstall32bit:
+	$(RM) $(LIB32DIR)/libcupscgi.so
+	$(RM) $(LIB32DIR)/libcupscgi.so.1
+	-$(RMDIR) $(LIB32DIR)
+
+uninstall64bit:
+	$(RM) $(LIB64DIR)/libcupscgi.so
+	$(RM) $(LIB64DIR)/libcupscgi.so.1
+	-$(RMDIR) $(LIB64DIR)
+
+
+#
+# Automatic API help files...
+#
+
+apihelp:
+	mxmldoc --section "Programming" \
+		--title "CGI API" \
+		--css ../doc/cups-printable.css \
+		--header api-cgi.header --intro api-cgi.shtml \
+		cgi.h help-index.h $(LIBOBJS:.o=.c) >../doc/help/api-cgi.html
+
+framedhelp:
+	mxmldoc --framed api-cgi \
+		--section "Programming" \
+		--title "CGI API" \
+		--css ../doc/cups-printable.css \
+		--header api-cgi.header --intro api-cgi.shtml \
+		cgi.h help-index.h $(LIBOBJS:.o=.c)
+
+
+#
+# libcupscgi.so.1, libcupscgi.sl.1
+#
+
+libcupscgi.so.1 libcupscgi.sl.1:	$(LIBOBJS)
+	echo Linking $@...
+	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
+	$(RM) `basename $@ .1`
+	$(LN) $@ `basename $@ .1`
+
+
+#
+# 32bit/libcupscgi.so.1
+#
+
+32bit/libcupscgi.so.1:	$(LIB32OBJS)
+	echo Linking 32-bit $@...
+	-mkdir 32bit
+	$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(LIBS)
+	$(RM) 32bit/libcupscgi.so
+	$(LN) libcupscgi.so.1 32bit/libcupscgi.so
+
+
+#
+# 64bit/libcupscgi.so.1
+#
+
+64bit/libcupscgi.so.1:	$(LIB64OBJS)
+	echo Linking 64-bit $@...
+	-mkdir 64bit
+	$(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(LIBS)
+	$(RM) 64bit/libcupscgi.so
+	$(LN) libcupscgi.so.1 64bit/libcupscgi.so
+
+
+#
+# libcupscgi.1.dylib
+#
+
+libcupscgi.1.dylib:	$(LIBOBJS) libcupscgi.exp
+	echo Linking $@...
+	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
+		-install_name $(libdir)/$@ \
+		-current_version 1.0.0 \
+		-compatibility_version 1.0.0 \
+		-exported_symbols_list libcupscgi.exp \
+		$(LIBOBJS) $(LIBS)
+	$(RM) libcupscgi.dylib
+	$(LN) $@ libcupscgi.dylib
+
+
+#
+# libcupscgi_s.a
+#
+
+libcupscgi_s.a:	$(LIBOBJS)
+	echo Creating $@...
+	$(DSO) $(DSOFLAGS) -o libcupscgi_s.o $(LIBOBJS) $(LIBS)
+	$(RM) $@
+	$(AR) $(ARFLAGS) $@ libcupscgi_s.o
+
+
+#
+# libcupscgi.la
+#
+
+libcupscgi.la:    $(LIBOBJS)
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+		-version-info 1:0 $(LIBS)
 
 
 #
-# libcgi.a
+# libcupscgi.a
 #
 
-libcgi.a:	$(LIBOBJS)
+libcupscgi.a:	$(LIBOBJS)
 	echo Archiving $@...
 	$(RM) $@
 	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
@@ -88,54 +306,54 @@ libcgi.a:	$(LIBOBJS)
 # admin.cgi
 #
 
-admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
+admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ admin.o libcgi.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ admin.o -L. -lcupscgi $(LIBS)
 
 
 #
 # classes.cgi
 #
 
-classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
+classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ classes.o libcgi.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ classes.o -L. -lcupscgi $(LIBS)
 
 
 #
 # help.cgi
 #
 
-help.cgi:	help.o ../Makedefs libcgi.a
+help.cgi:	help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ help.o libcgi.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ help.o -L. -lcupscgi $(LIBS)
 
 
 #
 # jobs.cgi
 #
 
-jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
+jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ jobs.o libcgi.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ jobs.o -L. -lcupscgi $(LIBS)
 
 
 #
 # printers.cgi
 #
 
-printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
+printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ printers.o libcgi.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ printers.o -L. -lcupscgi $(LIBS)
 
 
 #
 # testcgi
 #
 
-testcgi:	testcgi.o ../Makedefs libcgi.a ../cups/libcups.a
+testcgi:	testcgi.o ../Makedefs libcupscgi.a ../cups/libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testcgi.o libcgi.a ../cups/libcups.a \
+	$(CC) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a ../cups/libcups.a \
 		$(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
@@ -143,9 +361,9 @@ testcgi:	testcgi.o ../Makedefs libcgi.a ../cups/libcups.a
 # testhi
 #
 
-testhi:	testhi.o ../Makedefs libcgi.a ../cups/libcups.a
+testhi:	testhi.o ../Makedefs libcupscgi.a ../cups/libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testhi.o libcgi.a ../cups/libcups.a \
+	$(CC) $(LDFLAGS) -o $@ testhi.o libcupscgi.a ../cups/libcups.a \
 		$(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
@@ -153,9 +371,9 @@ testhi:	testhi.o ../Makedefs libcgi.a ../cups/libcups.a
 # testtemplate
 #
 
-testtemplate:	testtemplate.o ../Makedefs libcgi.a ../cups/libcups.a
+testtemplate:	testtemplate.o ../Makedefs libcupscgi.a ../cups/libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testtemplate.o libcgi.a ../cups/libcups.a \
+	$(CC) $(LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/libcups.a \
 		$(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
diff --git a/cgi-bin/libcupscgi.exp b/cgi-bin/libcupscgi.exp
new file mode 100644
index 000000000..42373d7ff
--- /dev/null
+++ b/cgi-bin/libcupscgi.exp
@@ -0,0 +1,35 @@
+_cgiCheckVariables
+_cgiCompileSearch
+_cgiCopyTemplateFile
+_cgiCopyTemplateLang
+_cgiDoSearch
+_cgiEndHTML
+_cgiFormEncode
+_cgiFreeSearch
+_cgiGetArray
+_cgiGetAttributes
+_cgiGetFile
+_cgiGetIPPObjects
+_cgiGetSize
+_cgiGetTemplateDir
+_cgiGetVariable
+_cgiInitialize
+_cgiIsPOST
+_cgiMoveJobs
+_cgiPrintTestPage
+_cgiRewriteURL
+_cgiSetArray
+_cgiSetIPPObjectVars
+_cgiSetIPPVars
+_cgiSetServerVersion
+_cgiSetSize
+_cgiSetVariable
+_cgiShowIPPError
+_cgiShowJobs
+_cgiStartHTML
+_cgiText
+_helpDeleteIndex
+_helpFindNode
+_helpLoadIndex
+_helpSaveIndex
+_helpSearchIndex
diff --git a/conf/Makefile b/conf/Makefile
index 4cac3841f..60154aa0e 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -3,7 +3,7 @@
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -45,10 +45,17 @@ depend:
 
 
 #
-# Install files...
+# Install all targets...
 #
 
-install:	all
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
 	$(INSTALL_DIR) -m 755 $(SERVERROOT)
 	for file in $(KEEP); do \
 		if test -r $(SERVERROOT)/$$file ; then \
@@ -78,6 +85,27 @@ install:	all
 
 
 #
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
 # Uninstall files...
 #
 
diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index f39f30982..07faa0c4b 100644
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -15,13 +15,17 @@ dnl
 
 dnl Clear the debugging and non-shared library options unless the user asks
 dnl for them...
+INSTALL_STRIP=""
 OPTIM=""
+AC_SUBST(INSTALL_STRIP)
 AC_SUBST(OPTIM)
 
 AC_ARG_WITH(optim, [  --with-optim="flags"    set optimization flags ])
 AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no],
 	[if test x$enable_debug = xyes; then
 		OPTIM="-g"
+	else
+		INSTALL_STRIP="-s"
 	fi])
 
 dnl Setup general architecture flags...
diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index 5eeface00..41897d62e 100644
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -3,7 +3,7 @@ dnl "$Id: cups-sharedlibs.m4 6649 2007-07-11 21:46:42Z mike $"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 2007 by Apple Inc.
+dnl   Copyright 2007-2008 by Apple Inc.
 dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -22,64 +22,109 @@ if test x$enable_shared != xno; then
 	case "$uname" in
 		SunOS* | UNIX_S*)
 			LIBCUPS="libcups.so.2"
+			LIBCUPSCGI="libcupscgi.so.1"
+			LIBCUPSDRIVER="libcupsdriver.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
+			LIBCUPSMIME="libcupsmime.so.1"
+			LIBCUPSPPDC="libcupsppdc.so.1"
 			DSO="\$(CC)"
+			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-h,\`basename \$@\` -G \$(OPTIM)"
 			;;
 		HP-UX*)
 			case "$uarch" in
 				ia64)
 					LIBCUPS="libcups.so.2"
+					LIBCUPSCGI="libcupscgi.so.1"
+					LIBCUPSDRIVER="libcupsdriver.so.1"
 					LIBCUPSIMAGE="libcupsimage.so.2"
+					LIBCUPSMIME="libcupsmime.so.1"
+					LIBCUPSPPDC="libcupsppdc.so.1"
 					DSO="\$(CC)"
+					DSOXX="\$(CXX)"
 					DSOFLAGS="$DSOFLAGS -Wl,-b,-z,+h,\`basename \$@\`"
 					;;
 				*)
 					LIBCUPS="libcups.sl.2"
+					LIBCUPSCGI="libcupscgi.sl.1"
+					LIBCUPSDRIVER="libcupsdriver.sl.1"
 					LIBCUPSIMAGE="libcupsimage.sl.2"
+					LIBCUPSMIME="libcupsmime.sl.1"
+					LIBCUPSPPDC="libcupsppdc.sl.1"
 					DSO="\$(LD)"
+					DSOXX="\$(LD)"
 					DSOFLAGS="$DSOFLAGS -b -z +h \`basename \$@\`"
 					;;
 			esac
 			;;
 		IRIX)
 			LIBCUPS="libcups.so.2"
+			LIBCUPSCGI="libcupscgi.so.1"
+			LIBCUPSDRIVER="libcupsdriver.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
+			LIBCUPSMIME="libcupsmime.so.1"
+			LIBCUPSPPDC="libcupsppdc.so.1"
 			DSO="\$(CC)"
+			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)"
 			;;
 		OSF1* | Linux | GNU | *BSD*)
 			LIBCUPS="libcups.so.2"
+			LIBCUPSCGI="libcupscgi.so.1"
+			LIBCUPSDRIVER="libcupsdriver.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
+			LIBCUPSMIME="libcupsmime.so.1"
+			LIBCUPSPPDC="libcupsppdc.so.1"
 			DSO="\$(CC)"
+			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
 			;;
 		Darwin*)
 			LIBCUPS="libcups.2.dylib"
+			LIBCUPSCGI="libcupscgi.1.dylib"
+			LIBCUPSDRIVER="libcupsdriver.1.dylib"
 			LIBCUPSIMAGE="libcupsimage.2.dylib"
+			LIBCUPSMIME="libcupsmime.1.dylib"
+			LIBCUPSPPDC="libcupsppdc.1.dylib"
 			DSO="\$(CC)"
+			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc"
 			;;
 		AIX*)
 			LIBCUPS="libcups_s.a"
+			LIBCUPSCGI="libcupscgi_s.a"
+			LIBCUPSDRIVER="libcupsdriver_s.a"
 			LIBCUPSIMAGE="libcupsimage_s.a"
+			LIBCUPSMIME="libcupsmime_s.a"
+			LIBCUPSPPDC="libcupsppdc_s.a"
 			DSO="\$(CC)"
+			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry,-blibpath:\$(libdir)"
 			;;
 		*)
 			echo "Warning: shared libraries may not be supported.  Trying -shared"
 			echo "         option with compiler."
 			LIBCUPS="libcups.so.2"
+			LIBCUPSCGI="libcupscgi.so.1"
+			LIBCUPSDRIVER="libcupsdriver.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
+			LIBCUPSMIME="libcupsmime.so.1"
+			LIBCUPSPPDC="libcupsppdc.so.1"
 			DSO="\$(CC)"
+			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
 			;;
 	esac
 else
 	PICFLAG=0
 	LIBCUPS="libcups.a"
+	LIBCUPSCGI="libcupscgi.a"
+	LIBCUPSDRIVER="libcupsdriver.a"
 	LIBCUPSIMAGE="libcupsimage.a"
+	LIBCUPSMIME="libcupsmime.a"
+	LIBCUPSPPDC="libcupsppdc.a"
 	DSO=":"
+	DSOXX=":"
 fi
 
 # 32-bit and 64-bit libraries need variations of the standard
@@ -88,11 +133,16 @@ DSO32FLAGS="$DSOFLAGS"
 DSO64FLAGS="$DSOFLAGS"
 
 AC_SUBST(DSO)
+AC_SUBST(DSOXX)
 AC_SUBST(DSOFLAGS)
 AC_SUBST(DSO32FLAGS)
 AC_SUBST(DSO64FLAGS)
 AC_SUBST(LIBCUPS)
+AC_SUBST(LIBCUPSCGI)
+AC_SUBST(LIBCUPSDRIVER)
 AC_SUBST(LIBCUPSIMAGE)
+AC_SUBST(LIBCUPSMIME)
+AC_SUBST(LIBCUPSPPDC)
 
 if test x$enable_shared = xno; then
 	LINKCUPS="../cups/libcups.a"
diff --git a/cups-config.in b/cups-config.in
index 66bf14997..7f53c60ba 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -15,7 +15,7 @@
 #
 
 VERSION="@CUPS_VERSION@"
-APIVERSION="1.3"
+APIVERSION="1.4"
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -66,7 +66,7 @@ usage ()
     echo "       cups-config --datadir"
     echo "       cups-config --help"
     echo "       cups-config --ldflags"
-    echo "       cups-config [--image] [--static] --libs"
+    echo "       cups-config [--driver] [--image] [--static] --libs"
     echo "       cups-config --serverbin"
     echo "       cups-config --serverroot"
     echo "       cups-config --version"
@@ -81,6 +81,7 @@ fi
 # Parse command line options
 static=no
 image=no
+driver=no
 
 while test $# -gt 0; do
     case $1 in
@@ -93,6 +94,9 @@ while test $# -gt 0; do
 	--datadir)
 	    echo $cups_datadir
 	    ;;
+	--driver)
+	    driver=yes
+	    ;;
 	--help)
 	    usage 0
 	    ;;
@@ -104,18 +108,23 @@ while test $# -gt 0; do
 	    ;;
 	--libs)
 	    if test $static = no; then
- 	        if test $image = no; then
- 	            echo -lcups $LIBS
- 		else
- 	            echo -lcupsimage -lcups $IMGLIBS $LIBS
- 		fi
+	        libs="-lcups $LIBS";
+ 	        if test $image = yes; then
+ 	            libs="-lcupsimage $libs"
+		fi
+ 	        if test $driver = yes; then
+ 	            libs="-lcupsdriver $libs"
+		fi
 	    else
-	        if test $image = no; then
-	            echo $libdir/libcups.a $LIBS
-		else
-	            echo $imagelibdir/libcupsimage.a $libdir/libcups.a $IMGLIBS $LIBS
+	        libs="$libdir/libcups.a $LIBS";
+ 	        if test $image = yes; then
+ 	            libs="$libdir/libcupsimage.a $IMGLIBS $libs"
+		fi
+ 	        if test $driver = yes; then
+ 	            libs="$libdir/libcupsdriver.a $libs"
 		fi
 	    fi
+	    echo $libs
 	    ;;
 	--serverbin)
 	    echo $cups_serverbin
diff --git a/cups/Makefile b/cups/Makefile
index e7a7a8123..2c8bdbdb9 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -156,10 +156,44 @@ depend:
 
 
 #
-# Install object and target files...
+# Install all targets...
 #
 
-install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+	echo Installing header files into $(INCLUDEDIR)/cups...
+	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
+	for file in $(HEADERS); do \
+		$(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
+	done
+
+
+#
+# Install libraries...
+#
+
+install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+	echo Installing libraries in $(LIBDIR)...
 	$(INSTALL_DIR) -m 755 $(LIBDIR)
 	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
 	if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
@@ -173,9 +207,7 @@ install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
 	fi
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(TARGETS); do \
-			cp $$file $(SYMROOT); \
-		done \
+		cp $(LIBCUPS) $(SYMROOT); \
 	fi
 
 installstatic:
@@ -183,18 +215,14 @@ installstatic:
 	$(INSTALL_LIB) libcups.a $(LIBDIR)
 	$(RANLIB) $(LIBDIR)/libcups.a
 
-installhdrs:
-	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
-	for file in $(HEADERS); do \
-		$(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
-	done
-
 install32bit:
+	echo Installing libraries in $(LIB32DIR)...
 	$(INSTALL_DIR) -m 755 $(LIB32DIR)
 	$(INSTALL_LIB) 32bit/libcups.so.2 $(LIB32DIR)/libcups.so.2
 	$(LN) libcups.so.2 $(LIB32DIR)/libcups.so
 
 install64bit:
+	echo Installing libraries in $(LIB64DIR)...
 	$(INSTALL_DIR) -m 755 $(LIB64DIR)
 	$(INSTALL_LIB) 64bit/libcups.so.2 $(LIB64DIR)/libcups.so.2
 	$(LN) libcups.so.2 $(LIB64DIR)/libcups.so
diff --git a/data/Makefile b/data/Makefile
index 85fb590af..a6047a9c6 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -107,10 +107,17 @@ depend:
 
 
 #
-# Install files...
+# Install all targets...
 #
 
-install:	all
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
 	$(INSTALL_DIR) -m 755 $(DATADIR)/banners
 	for file in $(BANNERS); do \
 		$(INSTALL_DATA) $$file $(DATADIR)/banners; \
@@ -135,6 +142,27 @@ install:	all
 
 
 #
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
 # Uninstall files...
 #
 
diff --git a/doc/Makefile b/doc/Makefile
index 08c5d8cc6..122d91561 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,7 +3,7 @@
 #
 #   Documentation makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -140,10 +140,17 @@ depend:
 
 
 #
-# Install all documentation files...
+# Install all targets...
 #
 
-install:	all $(INSTALL_LANGUAGES)
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
 	$(INSTALL_DIR) -m 755 $(DOCDIR)
 	for file in $(WEBPAGES); do \
 		$(INSTALL_MAN) $$file $(DOCDIR); \
@@ -161,13 +168,38 @@ install-languages:
 	for lang in $(LANGUAGES); do \
 		if test -d $$lang; then \
 			$(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang/images; \
-			$(INSTALL_MAN) $$lang/index.html $(DOCDIR)/$$lang 2>/dev/null || true; \
+			$(INSTALL_MAN) $$lang/index.html $(DOCDIR)/$$lang; \
 			$(INSTALL_MAN) $$lang/cups.css $(DOCDIR)/$$lang 2>/dev/null || true; \
+			$(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang/images; \
+			for file in $(WEBIMAGES); do \
+				$(INSTALL_MAN) $$lang/$$file $(DOCDIR)/$$lang/images 2>/dev/null || true; \
+			done; \
 		fi; \
 	done
 
 
 #
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
 # Unnstall all documentation files...
 #
 
@@ -176,10 +208,10 @@ uninstall: $(UNINSTALL_LANGUAGES)
 		$(RM) $(DOCDIR)/$$file; \
 	done
 	for file in $(HELPFILES); do \
-		$(INSTALL_MAN) $(DOCDIR)/help/$$file; \
+		$(RM) $(DOCDIR)/$$file; \
 	done
 	for file in $(WEBIMAGES); do \
-		$(INSTALL_MAN) $(DOCDIR)/images/$$file; \
+		$(RM) $(DOCDIR)/$$file; \
 	done
 	-$(RMDIR) $(DOCDIR)/images
 	-$(RMDIR) $(DOCDIR)/help
@@ -189,6 +221,9 @@ uninstall-languages:
 	-for lang in $(LANGUAGES); do \
 		$(RM) $(DOCDIR)/$$lang/index.html; \
 		$(RM) $(DOCDIR)/$$lang/cups.css; \
+		for file in $(WEBIMAGES); do \
+			$(RM) $(DOCDIR)/$$lang/$$file; \
+		done; \
 		$(RMDIR) $(DOCDIR)/$$lang/images; \
 		$(RMDIR) $(DOCDIR)/$$lang; \
 	done
diff --git a/driver/Dependencies b/driver/Dependencies
index 70eb28e27..f067c2092 100644
--- a/driver/Dependencies
+++ b/driver/Dependencies
@@ -55,3 +55,117 @@ rgb.o: ../cups/language.h ../cups/raster.h
 srgb.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 srgb.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 srgb.o: ../cups/language.h ../cups/raster.h
+# DO NOT DELETE
+
+commandtoescpx.32.o: commandtoescpx.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h
+commandtoescpx.32.o: commandtoescpx.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+commandtoescpx.32.o: commandtoescpx.c  ../cups/file.h ../cups/language.h driver.h ../cups/raster.h
+commandtoescpx.32.o: commandtoescpx.c  ../cups/string.h ../config.h ../data/escp.h
+commandtopclx.32.o: commandtopclx.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h
+commandtopclx.32.o: commandtopclx.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+commandtopclx.32.o: commandtopclx.c  ../cups/file.h ../cups/language.h driver.h ../cups/raster.h
+commandtopclx.32.o: commandtopclx.c  ../cups/string.h ../config.h ../data/pcl.h
+rastertoescpx.32.o: rastertoescpx.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+rastertoescpx.32.o: rastertoescpx.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+rastertoescpx.32.o: rastertoescpx.c  ../cups/file.h ../cups/language.h ../cups/raster.h
+rastertoescpx.32.o: rastertoescpx.c  ../cups/string.h ../config.h ../data/escp.h
+rastertopclx.32.o: rastertopclx.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+rastertopclx.32.o: rastertopclx.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+rastertopclx.32.o: rastertopclx.c  ../cups/file.h ../cups/language.h ../cups/raster.h
+rastertopclx.32.o: rastertopclx.c  pcl-common.h ../data/pcl.h
+pcl-common.32.o: pcl-common.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+pcl-common.32.o: pcl-common.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+pcl-common.32.o: pcl-common.c  ../cups/file.h ../cups/language.h ../cups/raster.h pcl-common.h
+pcl-common.32.o: pcl-common.c  ../data/pcl.h
+testcmyk.32.o: testcmyk.c  ../cups/string.h ../config.h driver.h ../cups/cups.h
+testcmyk.32.o: testcmyk.c  ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+testcmyk.32.o: testcmyk.c  ../cups/array.h ../cups/file.h ../cups/language.h
+testcmyk.32.o: testcmyk.c  ../cups/raster.h
+testdither.32.o: testdither.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testdither.32.o: testdither.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+testdither.32.o: testdither.c  ../cups/file.h ../cups/language.h ../cups/raster.h
+testdither.32.o: testdither.c  ../cups/string.h ../config.h
+testrgb.32.o: testrgb.c  ../cups/string.h ../config.h driver.h ../cups/cups.h ../cups/ipp.h
+testrgb.32.o: testrgb.c  ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+testrgb.32.o: testrgb.c  ../cups/file.h ../cups/language.h ../cups/raster.h
+attr.32.o: attr.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+attr.32.o: attr.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+attr.32.o: attr.c  ../cups/language.h ../cups/raster.h ../cups/string.h ../config.h
+check.32.o: check.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+check.32.o: check.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+check.32.o: check.c  ../cups/language.h ../cups/raster.h
+cmyk.32.o: cmyk.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+cmyk.32.o: cmyk.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+cmyk.32.o: cmyk.c  ../cups/language.h ../cups/raster.h ../cups/string.h ../config.h
+dither.32.o: dither.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+dither.32.o: dither.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+dither.32.o: dither.c  ../cups/language.h ../cups/raster.h
+lut.32.o: lut.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+lut.32.o: lut.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lut.32.o: lut.c  ../cups/language.h ../cups/raster.h
+pack.32.o: pack.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+pack.32.o: pack.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+pack.32.o: pack.c  ../cups/language.h ../cups/raster.h
+rgb.32.o: rgb.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+rgb.32.o: rgb.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+rgb.32.o: rgb.c  ../cups/language.h ../cups/raster.h
+srgb.32.o: srgb.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+srgb.32.o: srgb.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+srgb.32.o: srgb.c  ../cups/language.h ../cups/raster.h
+# DO NOT DELETE
+
+commandtoescpx.64.o: commandtoescpx.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h
+commandtoescpx.64.o: commandtoescpx.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+commandtoescpx.64.o: commandtoescpx.c  ../cups/file.h ../cups/language.h driver.h ../cups/raster.h
+commandtoescpx.64.o: commandtoescpx.c  ../cups/string.h ../config.h ../data/escp.h
+commandtopclx.64.o: commandtopclx.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h
+commandtopclx.64.o: commandtopclx.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+commandtopclx.64.o: commandtopclx.c  ../cups/file.h ../cups/language.h driver.h ../cups/raster.h
+commandtopclx.64.o: commandtopclx.c  ../cups/string.h ../config.h ../data/pcl.h
+rastertoescpx.64.o: rastertoescpx.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+rastertoescpx.64.o: rastertoescpx.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+rastertoescpx.64.o: rastertoescpx.c  ../cups/file.h ../cups/language.h ../cups/raster.h
+rastertoescpx.64.o: rastertoescpx.c  ../cups/string.h ../config.h ../data/escp.h
+rastertopclx.64.o: rastertopclx.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+rastertopclx.64.o: rastertopclx.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+rastertopclx.64.o: rastertopclx.c  ../cups/file.h ../cups/language.h ../cups/raster.h
+rastertopclx.64.o: rastertopclx.c  pcl-common.h ../data/pcl.h
+pcl-common.64.o: pcl-common.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+pcl-common.64.o: pcl-common.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+pcl-common.64.o: pcl-common.c  ../cups/file.h ../cups/language.h ../cups/raster.h pcl-common.h
+pcl-common.64.o: pcl-common.c  ../data/pcl.h
+testcmyk.64.o: testcmyk.c  ../cups/string.h ../config.h driver.h ../cups/cups.h
+testcmyk.64.o: testcmyk.c  ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
+testcmyk.64.o: testcmyk.c  ../cups/array.h ../cups/file.h ../cups/language.h
+testcmyk.64.o: testcmyk.c  ../cups/raster.h
+testdither.64.o: testdither.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testdither.64.o: testdither.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+testdither.64.o: testdither.c  ../cups/file.h ../cups/language.h ../cups/raster.h
+testdither.64.o: testdither.c  ../cups/string.h ../config.h
+testrgb.64.o: testrgb.c  ../cups/string.h ../config.h driver.h ../cups/cups.h ../cups/ipp.h
+testrgb.64.o: testrgb.c  ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+testrgb.64.o: testrgb.c  ../cups/file.h ../cups/language.h ../cups/raster.h
+attr.64.o: attr.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+attr.64.o: attr.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+attr.64.o: attr.c  ../cups/language.h ../cups/raster.h ../cups/string.h ../config.h
+check.64.o: check.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+check.64.o: check.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+check.64.o: check.c  ../cups/language.h ../cups/raster.h
+cmyk.64.o: cmyk.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+cmyk.64.o: cmyk.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+cmyk.64.o: cmyk.c  ../cups/language.h ../cups/raster.h ../cups/string.h ../config.h
+dither.64.o: dither.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+dither.64.o: dither.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+dither.64.o: dither.c  ../cups/language.h ../cups/raster.h
+lut.64.o: lut.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+lut.64.o: lut.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lut.64.o: lut.c  ../cups/language.h ../cups/raster.h
+pack.64.o: pack.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+pack.64.o: pack.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+pack.64.o: pack.c  ../cups/language.h ../cups/raster.h
+rgb.64.o: rgb.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+rgb.64.o: rgb.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+rgb.64.o: rgb.c  ../cups/language.h ../cups/raster.h
+srgb.64.o: srgb.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+srgb.64.o: srgb.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+srgb.64.o: srgb.c  ../cups/language.h ../cups/raster.h
diff --git a/driver/Makefile b/driver/Makefile
index 11796fe6f..30715f805 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -33,6 +33,8 @@ LIBOBJS	= \
 		pack.o \
 		rgb.o \
 		srgb.o
+LIB32OBJS	= $(LIBOBJS:.o=.32.o)
+LIB64OBJS	= $(LIBOBJS:.o=.64.o)
 
 OBJS		= \
 		commandtoescpx.o \
@@ -43,9 +45,14 @@ OBJS		= \
 		testcmyk.o \
 		testdither.o \
 		testrgb.o \
-		$(LIBOBJS)
+		$(LIBOBJS) \
+		$(LIB32OBJS) \
+		$(LIB64OBJS)
 
 TARGETS		= \
+		$(LIBCUPSDRIVER) \
+		$(LIB32CUPSDRIVER) \
+		$(LIB64CUPSDRIVER) \
 		libcupsdriver.a \
 		commandtoescpx \
 		commandtopclx \
@@ -72,6 +79,8 @@ clean:
 	$(RM) *.bck core.*
 	$(RM) $(TARGETS)
 	$(RM) -r images
+	$(RM) libcupsdriver.so libcupsdriver.sl libcupsdriver.dylib
+	$(RM) -r 32bit 64bit
 
 
 #
@@ -79,31 +88,125 @@ clean:
 #
 
 depend:
-	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
+	touch Dependencies.tmp
+	makedepend -Y -I.. -fDependencies.tmp $(OBJS:.o=.c) >/dev/null 2>&1
+	$(RM) Dependencies
+	cp Dependencies.tmp Dependencies
+	sed -E -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' Dependencies.tmp >>Dependencies
+	sed -E -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies
+	$(RM) Dependencies.tmp
 
 
 #
-# Install...
+# Install all targets...
 #
 
-install:
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
 	$(INSTALL_DIR) $(SERVERBIN)/filter
 	for file in commandtoescpx commandtopclx rastertoescpx rastertopclx; do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
 	done
-	$(INSTALL_DIR) $(INCLUDEDIR)/cups
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		for file in commandtoescpx commandtopclx rastertoescpx rastertopclx; do \
+			cp $$file $(SYMROOT); \
+		done \
+	fi
+
+
+#
+# Install headers...
+#
+
+install-headers:
+	echo Installing header files in $(INCLUDEDIR)/cups...
+	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
 	$(INSTALL_DATA) driver.h $(INCLUDEDIR)/cups
 
 
 #
+# Install libraries...
+#
+
+install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+	echo Installing libraries in $(LIBDIR)...
+	$(INSTALL_DIR) -m 755 $(LIBDIR)
+	$(INSTALL_LIB) $(LIBCUPSDRIVER) $(LIBDIR)
+	if test $(LIBCUPSDRIVER) = "libcupsdriver.so.1" -o $(LIBCUPSDRIVER) = "libcupsdriver.sl.1"; then \
+		$(RM) $(LIBDIR)/`basename $(LIBCUPSDRIVER) .1`; \
+		$(LN) $(LIBCUPSDRIVER) $(LIBDIR)/`basename $(LIBCUPSDRIVER) .1`; \
+	fi
+	if test $(LIBCUPSDRIVER) = "libcupsdriver.1.dylib"; then \
+		$(STRIP) -x $(LIBDIR)/$(LIBCUPSDRIVER); \
+		$(RM) $(LIBDIR)/libcupsdriver.dylib; \
+		$(LN) $(LIBCUPSDRIVER) $(LIBDIR)/libcupsdriver.dylib; \
+	fi
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		cp $(LIBCUPSDRIVER) $(SYMROOT); \
+	fi
+
+installstatic:
+	$(INSTALL_DIR) -m 755 $(LIBDIR)
+	$(INSTALL_LIB) libcupsdriver.a $(LIBDIR)
+	$(RANLIB) $(LIBDIR)/libcupsdriver.a
+
+install32bit:
+	echo Installing libraries in $(LIB32DIR)...
+	$(INSTALL_DIR) -m 755 $(LIB32DIR)
+	$(INSTALL_LIB) 32bit/libcupsdriver.so.1 $(LIB32DIR)/libcupsdriver.so.1
+	$(LN) libcupsdriver.so.1 $(LIB32DIR)/libcupsdriver.so
+
+install64bit:
+	echo Installing libraries in $(LIB64DIR)...
+	$(INSTALL_DIR) -m 755 $(LIB64DIR)
+	$(INSTALL_LIB) 64bit/libcupsdriver.so.1 $(LIB64DIR)/libcupsdriver.so.1
+	$(LN) libcupsdriver.so.1 $(LIB64DIR)/libcupsdriver.so
+
+
+#
 # Uninstall...
 #
 
-uninstall:
+uninstall: $(UNINSTALL32) $(UNINSTALL64)
 	for file in commandtoescpx commandtopclx rastertoescpx rastertopclx; do \
 		$(RM) $(SERVERBIN)/filter/$$file; \
 	done
+	$(RM) $(LIBDIR)/libcupsdriver.1.dylib
+	$(RM) $(LIBDIR)/libcupsdriver.a
+	$(RM) $(LIBDIR)/libcupsdriver.dylib
+	$(RM) $(LIBDIR)/libcupsdriver_s.a
+	$(RM) $(LIBDIR)/libcupsdriver.sl
+	$(RM) $(LIBDIR)/libcupsdriver.sl.1
+	$(RM) $(LIBDIR)/libcupsdriver.so
+	$(RM) $(LIBDIR)/libcupsdriver.so.1
+	-$(RMDIR) $(LIBDIR)
 	$(RM) $(INCLUDEDIR)/cups/driver.h
+	-$(RMDIR) $(INCLUDEDIR)/cups
+
+uninstall32bit:
+	$(RM) $(LIB32DIR)/libcupsdriver.so
+	$(RM) $(LIB32DIR)/libcupsdriver.so.1
+	-$(RMDIR) $(LIB32DIR)
+
+uninstall64bit:
+	$(RM) $(LIB64DIR)/libcupsdriver.so
+	$(RM) $(LIB64DIR)/libcupsdriver.so.1
+	-$(RMDIR) $(LIB64DIR)
 
 
 #
@@ -130,27 +233,27 @@ framedhelp:
 # commandtopclx, the PCL command printer driver.
 #
 
-commandtopclx:		commandtopclx.o libcupsdriver.a ../cups/$(LIBCUPS)
+commandtopclx:		commandtopclx.o $(LIBCUPSDRIVER) ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ commandtopclx.o libcupsdriver.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ commandtopclx.o -L. -lcupsdriver $(LIBS)
 
 
 #
 # commandtoescpx, the ESC/P command printer driver.
 #
 
-commandtoescpx:		commandtoescpx.o libcupsdriver.a ../cups/$(LIBCUPS)
+commandtoescpx:		commandtoescpx.o $(LIBCUPSDRIVER) ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ commandtoescpx.o libcupsdriver.a $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ commandtoescpx.o -L. -lcupsdriver $(LIBS)
 
 
 #
 # rastertoescpx, the ESC/P raster printer driver.
 #
 
-rastertoescpx:		rastertoescpx.o libcupsdriver.a ../cups/$(LIBCUPS)
+rastertoescpx:		rastertoescpx.o $(LIBCUPSDRIVER) ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ rastertoescpx.o libcupsdriver.a \
+	$(CC) $(LDFLAGS) -o $@ rastertoescpx.o -L. -lcupsdriver \
 		$(LINKCUPSIMAGE) $(LIBS)
 
 
@@ -158,10 +261,10 @@ rastertoescpx:		rastertoescpx.o libcupsdriver.a ../cups/$(LIBCUPS)
 # rastertopclx, the ESC/P raster printer driver.
 #
 
-rastertopclx:		rastertopclx.o pcl-common.o libcupsdriver.a \
+rastertopclx:		rastertopclx.o pcl-common.o $(LIBCUPSDRIVER) \
 			../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ rastertopclx.o pcl-common.o libcupsdriver.a \
+	$(CC) $(LDFLAGS) -o $@ rastertopclx.o pcl-common.o -L. -lcupsdriver \
 		$(LINKCUPSIMAGE) $(LIBS)
 
 
@@ -215,7 +318,79 @@ testrgb:		testrgb.o libcupsdriver.a ../cups/libcups.a
 
 
 #
-# libcupsdriver.a, the CUPS driver library...
+# libcupsdriver.so.1, libcupsdriver.sl.1
+#
+
+libcupsdriver.so.1 libcupsdriver.sl.1:	$(LIBOBJS)
+	echo Linking $@...
+	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
+	$(RM) `basename $@ .1`
+	$(LN) $@ `basename $@ .1`
+
+
+#
+# 32bit/libcupsdriver.so.1
+#
+
+32bit/libcupsdriver.so.1:	$(LIB32OBJS)
+	echo Linking 32-bit $@...
+	-mkdir 32bit
+	$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(LIBS)
+	$(RM) 32bit/libcupsdriver.so
+	$(LN) libcupsdriver.so.1 32bit/libcupsdriver.so
+
+
+#
+# 64bit/libcupsdriver.so.1
+#
+
+64bit/libcupsdriver.so.1:	$(LIB64OBJS)
+	echo Linking 64-bit $@...
+	-mkdir 64bit
+	$(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(LIBS)
+	$(RM) 64bit/libcupsdriver.so
+	$(LN) libcupsdriver.so.1 64bit/libcupsdriver.so
+
+
+#
+# libcupsdriver.1.dylib
+#
+
+libcupsdriver.1.dylib:	$(LIBOBJS) libcupsdriver.exp
+	echo Linking $@...
+	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
+		-install_name $(libdir)/$@ \
+		-current_version 1.0.0 \
+		-compatibility_version 1.0.0 \
+		-exported_symbols_list libcupsdriver.exp \
+		$(LIBOBJS) $(LIBS)
+	$(RM) libcupsdriver.dylib
+	$(LN) $@ libcupsdriver.dylib
+
+
+#
+# libcupsdriver_s.a
+#
+
+libcupsdriver_s.a:	$(LIBOBJS)
+	echo Creating $@...
+	$(DSO) $(DSOFLAGS) -o libcupsdriver_s.o $(LIBOBJS) $(LIBS)
+	$(RM) $@
+	$(AR) $(ARFLAGS) $@ libcupsdriver_s.o
+
+
+#
+# libcupsdriver.la
+#
+
+libcupsdriver.la:    $(LIBOBJS)
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+		-version-info 1:0 $(LIBS)
+
+
+#
+# libcupsdriver.a
 #
 
 libcupsdriver.a:	$(LIBOBJS)
diff --git a/driver/libcupsdriver.exp b/driver/libcupsdriver.exp
new file mode 100644
index 000000000..fff6506fe
--- /dev/null
+++ b/driver/libcupsdriver.exp
@@ -0,0 +1,30 @@
+_cupsCMYKDelete
+_cupsCMYKDoBlack
+_cupsCMYKDoCMYK
+_cupsCMYKDoGray
+_cupsCMYKDoRGB
+_cupsCMYKLoad
+_cupsCMYKNew
+_cupsCMYKSetBlack
+_cupsCMYKSetCurve
+_cupsCMYKSetGamma
+_cupsCMYKSetInkLimit
+_cupsCMYKSetLtDk
+_cupsCheckBytes
+_cupsCheckValue
+_cupsDitherDelete
+_cupsDitherLine
+_cupsDitherNew
+_cupsFindAttr
+_cupsLutDelete
+_cupsLutLoad
+_cupsLutNew
+_cupsPackHorizontal
+_cupsPackHorizontal2
+_cupsPackHorizontalBit
+_cupsPackVertical
+_cupsRGBDelete
+_cupsRGBDoGray
+_cupsRGBDoRGB
+_cupsRGBLoad
+_cupsRGBNew
diff --git a/filter/Makefile b/filter/Makefile
index 068fb7760..c0990f8dc 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -80,13 +80,49 @@ depend:
 # Install all targets...
 #
 
-install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/filter
 	for file in $(FILTERS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
 	done
 	$(RM) $(SERVERBIN)/filter/rastertodymo
 	$(LN) rastertolabel $(SERVERBIN)/filter/rastertodymo
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		for file in $(TARGETS); do \
+			cp $$file $(SYMROOT); \
+		done \
+	fi
+
+
+#
+# Install headers...
+#
+
+install-headers:
+	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
+	$(INSTALL_DATA) image.h $(INCLUDEDIR)/cups
+
+
+#
+# Install libraries...
+#
+
+install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
 	$(INSTALL_DIR) -m 755 $(LIBDIR)
 	$(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
 	-if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
@@ -98,22 +134,12 @@ install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
 		$(RM) $(LIBDIR)/libcupsimage.dylib; \
 		$(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
 	fi
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(TARGETS); do \
-			cp $$file $(SYMROOT); \
-		done \
-	fi
 
 installstatic:
 	$(INSTALL_DIR) -m 755 $(LIBDIR)
 	$(INSTALL_LIB) libcupsimage.a $(LIBDIR);
 	$(RANLIB) $(LIBDIR)/libcupsimage.a;
 
-installhdrs:
-	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
-	$(INSTALL_DATA) image.h $(INCLUDEDIR)/cups
-
 install32bit:
 	$(INSTALL_DIR) -m 755 $(LIB32DIR)
 	$(INSTALL_LIB) 32bit/libcupsimage.so.2 $(LIB32DIR)/libcupsimage.so.2
diff --git a/filter/pdftops.c b/filter/pdftops.c
index 7db2532f0..9db1e9168 100644
--- a/filter/pdftops.c
+++ b/filter/pdftops.c
@@ -211,13 +211,13 @@ main(int  argc,				/* I - Number of command-line args */
 
       if (orientation & 1)
       {
-	snprintf(pdfwidth, sizeof(pdfwidth), "%.1f", size->length);
-	snprintf(pdfheight, sizeof(pdfheight), "%.1f", size->width);
+	snprintf(pdfwidth, sizeof(pdfwidth), "%.0f", size->length);
+	snprintf(pdfheight, sizeof(pdfheight), "%.0f", size->width);
       }
       else
       {
-	snprintf(pdfwidth, sizeof(pdfwidth), "%.1f", size->width);
-	snprintf(pdfheight, sizeof(pdfheight), "%.1f", size->length);
+	snprintf(pdfwidth, sizeof(pdfwidth), "%.0f", size->width);
+	snprintf(pdfheight, sizeof(pdfheight), "%.0f", size->length);
       }
 
       pdfargv[pdfargc++] = (char *)"-paperw";
@@ -242,7 +242,7 @@ main(int  argc,				/* I - Number of command-line args */
     * Child comes here...
     */
 
-    execv(CUPS_PDFTOPS, argv);
+    execv(CUPS_PDFTOPS, pdfargv);
     _cupsLangPrintError(_("ERROR: Unable to execute pdftops filter"));
     exit(1);
   }
@@ -273,7 +273,7 @@ main(int  argc,				/* I - Number of command-line args */
         pdfstatus = WEXITSTATUS(pdfstatus);
 
         _cupsLangPrintf(stderr,
-	                _("ERROR: pdftops filter exited with status %d!"),
+	                _("ERROR: pdftops filter exited with status %d!\n"),
 			pdfstatus);
       }
       else
@@ -281,7 +281,7 @@ main(int  argc,				/* I - Number of command-line args */
         pdfstatus = WTERMSIG(pdfstatus);
 
         _cupsLangPrintf(stderr,
-	                _("ERROR: pdftops filter crashed on signal %d!"),
+	                _("ERROR: pdftops filter crashed on signal %d!\n"),
 			pdfstatus);
       }
     }
diff --git a/fonts/Makefile b/fonts/Makefile
index c8cac7760..dedf74ef2 100644
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -3,7 +3,7 @@
 #
 #   Fonts makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -45,10 +45,17 @@ depend:
 
 
 #
-# Install files...
+# Install all targets...
 #
 
-install:	all
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
 	$(INSTALL_DIR) -m 755 $(DATADIR)/fonts
 	for file in $(FONTS); do \
 		$(INSTALL_DATA) $$file $(DATADIR)/fonts; \
@@ -56,6 +63,27 @@ install:	all
 
 
 #
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
 # Uninstall files...
 #
 
diff --git a/locale/Makefile b/locale/Makefile
index b6d9fe8cb..1eba2b2e7 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -44,10 +44,17 @@ depend:
 
 
 #
-# Install files...
+# Install all targets...
 #
 
-install:	all $(INSTALL_LANGUAGES)
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data: $(INSTALL_LANGUAGES)
 
 install-languages:
 	$(INSTALL_DIR) -m 755 $(LOCALEDIR)
@@ -61,6 +68,27 @@ install-languages:
 
 
 #
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
 # Uninstall files...
 #
 
diff --git a/man/Makefile b/man/Makefile
index de0870cd9..8588d346a 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -104,10 +104,17 @@ depend:
 
 
 #
-# Install files...
+# Install all targets...
 #
 
-install:	all
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
 	$(INSTALL_DIR) -m 755 $(MANDIR)/man1
 	for file in $(MAN1); do \
 		echo Installing $$file in $(MANDIR)/man1...; \
@@ -135,6 +142,27 @@ install:	all
 
 
 #
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
 # Uninstall files...
 #
 
diff --git a/monitor/Makefile b/monitor/Makefile
index 1b3def600..a1c75b65d 100644
--- a/monitor/Makefile
+++ b/monitor/Makefile
@@ -3,7 +3,7 @@
 #
 #   Port monitor makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -49,7 +49,21 @@ depend:
 # Install all targets...
 #
 
-install:	all
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/monitor
 	for file in $(TARGETS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/monitor; \
@@ -63,6 +77,20 @@ install:	all
 
 
 #
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
 # Uninstall all targets...
 #
 
diff --git a/notifier/Makefile b/notifier/Makefile
index 49e05ac0b..812fcbd69 100644
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -39,11 +39,14 @@ clean:
 # Install all targets...
 #
 
-install:	all
-	$(INSTALL_DIR) -m 755 $(SERVERBIN)/notifier
-	for file in $(TARGETS); do \
-		$(INSTALL_BIN) $$file $(SERVERBIN)/notifier; \
-	done
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
 	$(INSTALL_DIR) -m 775 $(CACHEDIR)/rss
 	-chgrp $(CUPS_GROUP) $(CACHEDIR)/rss
 	if test "x$(SYMROOT)" != "x"; then \
@@ -55,6 +58,31 @@ install:	all
 
 
 #
+# Install programs...
+#
+
+install-exec:
+	$(INSTALL_DIR) -m 755 $(SERVERBIN)/notifier
+	for file in $(TARGETS); do \
+		$(INSTALL_BIN) $$file $(SERVERBIN)/notifier; \
+	done
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
 # Uninstall all targets...
 #
 
diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index 6030ee634..45e70c9ef 100644
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -336,21 +336,49 @@ l 0755 root sys /usr/bsd/lprm $BINDIR/lprm
 %system hpux
 f 0755 root sys $LIBDIR/libcups.sl.2 cups/libcups.sl.2 nostrip()
 l 0755 root sys $LIBDIR/libcups.sl libcups.sl.2
+f 0755 root sys $LIBDIR/libcupscgi.sl.1 cgi-bin/libcupscgi.sl.1 nostrip()
+l 0755 root sys $LIBDIR/libcupscgi.sl libcupscgi.sl.1
+f 0755 root sys $LIBDIR/libcupsdriver.sl.1 driver/libcupsdriver.sl.1 nostrip()
+l 0755 root sys $LIBDIR/libcupsdriver.sl libcupsdriver.sl.1
 f 0755 root sys $LIBDIR/libcupsimage.sl.2 filter/libcupsimage.sl.2 nostrip()
 l 0755 root sys $LIBDIR/libcupsimage.sl libcupsimage.sl.2
+f 0755 root sys $LIBDIR/libcupsmime.sl.1 scheduler/libcupsmime.sl.1 nostrip()
+l 0755 root sys $LIBDIR/libcupsmime.sl libcupsmime.sl.1
+f 0755 root sys $LIBDIR/libcupsppdc.sl.1 ppdc/libcupsppdc.sl.1 nostrip()
+l 0755 root sys $LIBDIR/libcupsppdc.sl libcupsppdc.sl.1
 %system aix
 f 0755 root sys $LIBDIR/libcups_s.a cups/libcups_s.a nostrip()
+f 0755 root sys $LIBDIR/libcupscgi_s.a cgi-bin/libcupscgi_s.a nostrip()
+f 0755 root sys $LIBDIR/libcupsdriver_s.a driver/libcupsdriver_s.a nostrip()
 f 0755 root sys $LIBDIR/libcupsimage_s.a filter/libcupsimage_s.a nostrip()
+f 0755 root sys $LIBDIR/libcupsmime_s.a scheduler/libcupsmime_s.a nostrip()
+f 0755 root sys $LIBDIR/libcupsppdc_s.a ppdc/libcupsppdc_s.a nostrip()
 %system darwin
 f 0755 root sys $LIBDIR/libcups.2.dylib cups/libcups.2.dylib nostrip()
 l 0755 root sys $LIBDIR/libcups.dylib libcups.2.dylib
+f 0755 root sys $LIBDIR/libcupscgi.1.dylib cgi-bin/libcupscgi.1.dylib nostrip()
+l 0755 root sys $LIBDIR/libcupscgi.dylib libcupscgi.1.dylib
+f 0755 root sys $LIBDIR/libcupsdriver.1.dylib driver/libcupsdriver.1.dylib nostrip()
+l 0755 root sys $LIBDIR/libcupsdriver.dylib libcupsdriver.1.dylib
 f 0755 root sys $LIBDIR/libcupsimage.2.dylib filter/libcupsimage.2.dylib nostrip()
 l 0755 root sys $LIBDIR/libcupsimage.dylib libcupsimage.2.dylib
+f 0755 root sys $LIBDIR/libcupsmime.1.dylib scheduler/libcupsmime.1.dylib nostrip()
+l 0755 root sys $LIBDIR/libcupsmime.dylib libcupsmime.1.dylib
+f 0755 root sys $LIBDIR/libcupsppdc.1.dylib ppdc/libcupsppdc.1.dylib nostrip()
+l 0755 root sys $LIBDIR/libcupsppdc.dylib libcupsppdc.1.dylib
 %system !hpux !aix !darwin
 f 0755 root sys $LIBDIR/libcups.so.2 cups/libcups.so.2 nostrip()
 l 0755 root sys $LIBDIR/libcups.so libcups.so.2
+f 0755 root sys $LIBDIR/libcupscgi.so.1 cgi-bin/libcupscgi.so.1 nostrip()
+l 0755 root sys $LIBDIR/libcupscgi.so libcupscgi.so.1
+f 0755 root sys $LIBDIR/libcupsdriver.so.1 driver/libcupsdriver.so.1 nostrip()
+l 0755 root sys $LIBDIR/libcupsdriver.so libcupsdriver.so.1
 f 0755 root sys $LIBDIR/libcupsimage.so.2 filter/libcupsimage.so.2 nostrip()
 l 0755 root sys $LIBDIR/libcupsimage.so libcupsimage.so.2
+f 0755 root sys $LIBDIR/libcupsmime.so.1 scheduler/libcupsmime.so.1 nostrip()
+l 0755 root sys $LIBDIR/libcupsmime.so libcupsmime.so.1
+f 0755 root sys $LIBDIR/libcupsppdc.so.1 ppdc/libcupsppdc.so.1 nostrip()
+l 0755 root sys $LIBDIR/libcupsppdc.so libcupsppdc.so.1
 %system all
 %subpackage
 %endif
@@ -359,8 +387,16 @@ l 0755 root sys $LIBDIR/libcupsimage.so libcupsimage.so.2
 %subpackage libs
 f 0755 root sys $LIB32DIR/libcups.so.2 cups/libcups.32.so.2 nostrip()
 l 0755 root sys $LIB32DIR/libcups.so libcups.so.2
+f 0755 root sys $LIB32DIR/libcupscgi.so.1 cgi-bin/libcupscgi.32.so.1 nostrip()
+l 0755 root sys $LIB32DIR/libcupscgi.so libcupscgi.so.1
+f 0755 root sys $LIB32DIR/libcupsdriver.so.1 driver/libcupsdriver.32.so.1 nostrip()
+l 0755 root sys $LIB32DIR/libcupsdriver.so libcupsdriver.so.1
 f 0755 root sys $LIB32DIR/libcupsimage.so.2 filter/libcupsimage.32.so.2 nostrip()
 l 0755 root sys $LIB32DIR/libcupsimage.so libcupsimage.so.2
+f 0755 root sys $LIB32DIR/libcupsmime.so.1 scheduler/libcupsmime.32.so.1 nostrip()
+l 0755 root sys $LIB32DIR/libcupsmime.so libcupsmime.so.1
+f 0755 root sys $LIB32DIR/libcupsppdc.so.1 ppdc/libcupsppdc.32.so.1 nostrip()
+l 0755 root sys $LIB32DIR/libcupsppdc.so libcupsppdc.so.1
 %system all
 %subpackage
 %endif
@@ -369,8 +405,16 @@ l 0755 root sys $LIB32DIR/libcupsimage.so libcupsimage.so.2
 %subpackage libs
 f 0755 root sys $LIB64DIR/libcups.so.2 cups/libcups.64.so.2 nostrip()
 l 0755 root sys $LIB64DIR/libcups.so libcups.so.2
+f 0755 root sys $LIB64DIR/libcupscgi.so.1 cgi-bin/libcupscgi.64.so.1 nostrip()
+l 0755 root sys $LIB64DIR/libcupscgi.so libcupscgi.so.1
+f 0755 root sys $LIB64DIR/libcupsdriver.so.1 driver/libcupsdriver.64.so.1 nostrip()
+l 0755 root sys $LIB64DIR/libcupsdriver.so libcupsdriver.so.1
 f 0755 root sys $LIB64DIR/libcupsimage.so.2 filter/libcupsimage.64.so.2 nostrip()
 l 0755 root sys $LIB64DIR/libcupsimage.so libcupsimage.so.2
+f 0755 root sys $LIB64DIR/libcupsmime.so.1 scheduler/libcupsmime.64.so.1 nostrip()
+l 0755 root sys $LIB64DIR/libcupsmime.so libcupsmime.so.1
+f 0755 root sys $LIB64DIR/libcupsppdc.so.1 ppdc/libcupsppdc.64.so.1 nostrip()
+l 0755 root sys $LIB64DIR/libcupsppdc.so libcupsppdc.so.1
 %system all
 %subpackage
 %endif
@@ -540,6 +584,7 @@ f 0644 root sys $INCLUDEDIR/cups/file.h cups/file.h
 f 0644 root sys $INCLUDEDIR/cups/http.h cups/http.h
 f 0644 root sys $INCLUDEDIR/cups/image.h filter/image.h
 f 0644 root sys $INCLUDEDIR/cups/ipp.h cups/ipp.h
+f 0644 root sys $INCLUDEDIR/cups/mime.h scheduler/mime.h
 f 0644 root sys $INCLUDEDIR/cups/language.h cups/language.h
 f 0644 root sys $INCLUDEDIR/cups/ppd.h cups/ppd.h
 f 0644 root sys $INCLUDEDIR/cups/raster.h cups/raster.h
@@ -547,11 +592,13 @@ f 0644 root sys $INCLUDEDIR/cups/transcode.h cups/transcode.h
 
 %if INSTALLSTATIC
 f 0644 root sys $LIBDIR/libcups.a cups/libcups.a
+f 0644 root sys $LIBDIR/libcupscgi.a cgi-bin/libcupscgi.a
+f 0644 root sys $LIBDIR/libcupsdriver.a driver/libcupsdriver.a
 f 0644 root sys $LIBDIR/libcupsimage.a filter/libcupsimage.a
+f 0644 root sys $LIBDIR/libcupsmime.a scheduler/libcupsmime.a
+f 0644 root sys $LIBDIR/libcupsppdc.a ppdc/libcupsppdc.a
 %endif
 
-f 0644 root sys $LIBDIR/libcupsdriver.a driver/libcupsdriver.a
-
 d 0755 root sys $DOCDIR/help -
 f 0644 root sys $DOCDIR/help doc/help/api*.html
 f 0644 root sys $DOCDIR/help doc/help/spec*.html
diff --git a/ppd/Makefile b/ppd/Makefile
index 44588f1c8..a26a2efc2 100644
--- a/ppd/Makefile
+++ b/ppd/Makefile
@@ -3,7 +3,7 @@
 #
 #   PPD file makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -48,10 +48,17 @@ depend:
 
 
 #
-# Install files...
+# Install all targets...
 #
 
-install:	all
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
 	$(INSTALL_DIR) -m 755 $(DATADIR)/model
 	for file in $(FILES); do \
 		$(INSTALL_DATA) $$file $(DATADIR)/model; \
@@ -59,6 +66,27 @@ install:	all
 
 
 #
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
 # Uninstall files...
 #
 
diff --git a/ppdc/Dependencies b/ppdc/Dependencies
index 5e7bbc69e..c18234b41 100644
--- a/ppdc/Dependencies
+++ b/ppdc/Dependencies
@@ -1,68 +1,3 @@
 # DO NOT DELETE
-
-drv.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-drv.o: ../cups/versioning.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-drv.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-drv.o: ../cups/dir.h
-ppdc.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc.o: ../cups/versioning.h
-ppdhtml.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdhtml.o: ../cups/versioning.h
-ppdi.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdi.o: ../cups/versioning.h
-ppdmerge.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
-ppdmerge.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-ppdmerge.o: ../cups/array.h ../cups/string.h ../config.h
-ppdpo.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdpo.o: ../cups/versioning.h
-ppdc-array.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-array.o: ../cups/versioning.h
-ppdc-attr.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-attr.o: ../cups/versioning.h
-ppdc-catalog.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-catalog.o: ../cups/versioning.h ../cups/globals.h ../cups/string.h
-ppdc-catalog.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h
-ppdc-catalog.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-ppdc-catalog.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
-ppdc-catalog.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
-ppdc-choice.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-choice.o: ../cups/versioning.h
-ppdc-constraint.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-constraint.o: ../cups/versioning.h
-ppdc-driver.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-driver.o: ../cups/versioning.h ../cups/cups.h ../cups/ipp.h
-ppdc-driver.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-ppdc-driver.o: ../cups/language.h
-ppdc-file.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-file.o: ../cups/versioning.h
-ppdc-filter.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-filter.o: ../cups/versioning.h
-ppdc-font.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-font.o: ../cups/versioning.h
-ppdc-group.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-group.o: ../cups/versioning.h
-ppdc-import.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-import.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-ppdc-import.o: ../cups/file.h
-ppdc-mediasize.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-mediasize.o: ../cups/versioning.h
-ppdc-message.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-message.o: ../cups/versioning.h
-ppdc-option.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-option.o: ../cups/versioning.h
-ppdc-profile.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-profile.o: ../cups/versioning.h
-ppdc-shared.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-shared.o: ../cups/versioning.h
-ppdc-source.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-source.o: ../cups/versioning.h ../cups/globals.h ../cups/string.h
-ppdc-source.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h
-ppdc-source.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-ppdc-source.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
-ppdc-source.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
-ppdc-source.o: ../cups/raster.h ../cups/cups.h ../data/epson.h ../data/escp.h
-ppdc-source.o: ../data/hp.h ../data/label.h ../data/pcl.h
-ppdc-string.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-string.o: ../cups/versioning.h
-ppdc-variable.o: ppdc.h ../cups/string.h ../config.h ../cups/file.h
-ppdc-variable.o: ../cups/versioning.h
+# DO NOT DELETE
+# DO NOT DELETE
diff --git a/ppdc/Makefile b/ppdc/Makefile
index 1e6974709..edaafeceb 100644
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -24,7 +24,7 @@ include ../Makedefs
 # Object files...
 #
 
-PPDCOBJS	= \
+LIBOBJS =	\
 		ppdc-array.o \
 		ppdc-attr.o \
 		ppdc-catalog.o \
@@ -44,18 +44,23 @@ PPDCOBJS	= \
 		ppdc-source.o \
 		ppdc-string.o \
 		ppdc-variable.o
-
-OBJS		= \
+LIB32OBJS	= $(LIBOBJS:.o=.32.o)
+LIB64OBJS	= $(LIBOBJS:.o=.64.o)
+OBJS =		\
+		$(LIBOBJS) \
+		$(LIB32OBJS) \
+		$(LIB64OBJS) \
 		drv.o \
 		ppdc.o \
 		ppdhtml.o \
 		ppdi.o \
 		ppdmerge.o \
-		ppdpo.o \
-		$(PPDCOBJS)
-
-TARGETS		= \
-		libppdc.a \
+		ppdpo.o
+TARGETS	=	\
+		$(LIBCUPSPPDC) \
+		$(LIB32CUPSPPDC) \
+		$(LIB64CUPSPPDC) \
+		libcupsppdc.a \
 		drv \
 		ppdc-static \
 		ppdc \
@@ -82,6 +87,8 @@ clean:
 	$(RM) $(TARGETS)
 	$(RM) -r ppd
 	$(RM) test.drv
+	$(RM) libcupsppdc.so libcupsppdc.sl libcupsppdc.dylib
+	$(RM) -r 32bit 64bit
 
 
 #
@@ -89,14 +96,35 @@ clean:
 #
 
 depend:
-	makedepend -Y -I.. -fDependencies $(OBJS:.o=.cxx) >/dev/null 2>&1
+	touch Dependencies.tmp
+	makedepend -Y -I.. -fDependencies.tmp $(OBJS:.o=.c) >/dev/null 2>&1
+	$(RM) Dependencies
+	cp Dependencies.tmp Dependencies
+	sed -E -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' Dependencies.tmp >>Dependencies
+	sed -E -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies
+	$(RM) Dependencies.tmp
+
+
+#
+# Install all targets...
+#
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+	$(INSTALL_DIR) $(DATADIR)/drv
 
 
 #
-# Install...
+# Install programs...
 #
 
-install:
+install-exec:
 	echo Installing PPD compiler programs...
 	$(INSTALL_DIR) $(BINDIR)
 	$(INSTALL_BIN) ppdc $(BINDIR)
@@ -106,7 +134,62 @@ install:
 	$(INSTALL_BIN) ppdpo $(BINDIR)
 	$(INSTALL_DIR) $(SERVERBIN)/driver
 	$(INSTALL_BIN) drv $(SERVERBIN)/driver
-	$(INSTALL_DIR) $(DATADIR)/drv
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		for file in $(TARGETS); do \
+			cp $$file $(SYMROOT); \
+		done \
+	fi
+
+
+#
+# Install headers...
+#
+
+install-headers:
+	echo Installing header files in $(INCLUDEDIR)/cups...
+	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
+	$(INSTALL_DATA) ppdc.h $(INCLUDEDIR)/cups
+
+
+#
+# Install libraries...
+#
+
+install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+	echo Installing libraries in $(LIBDIR)...
+	$(INSTALL_DIR) -m 755 $(LIBDIR)
+	$(INSTALL_LIB) $(LIBCUPSPPDC) $(LIBDIR)
+	if test $(LIBCUPSPPDC) = "libcupsppdc.so.1" -o $(LIBCUPSPPDC) = "libcupsppdc.sl.1"; then \
+		$(RM) $(LIBDIR)/`basename $(LIBCUPSPPDC) .1`; \
+		$(LN) $(LIBCUPSPPDC) $(LIBDIR)/`basename $(LIBCUPSPPDC) .1`; \
+	fi
+	if test $(LIBCUPSPPDC) = "libcupsppdc.1.dylib"; then \
+		$(STRIP) -x $(LIBDIR)/$(LIBCUPSPPDC); \
+		$(RM) $(LIBDIR)/libcupsppdc.dylib; \
+		$(LN) $(LIBCUPSPPDC) $(LIBDIR)/libcupsppdc.dylib; \
+	fi
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		cp $(LIBCUPSPPDC) $(SYMROOT); \
+	fi
+
+installstatic:
+	$(INSTALL_DIR) -m 755 $(LIBDIR)
+	$(INSTALL_LIB) libcupsppdc.a $(LIBDIR)
+	$(RANLIB) $(LIBDIR)/libcupsppdc.a
+
+install32bit:
+	echo Installing libraries in $(LIB32DIR)...
+	$(INSTALL_DIR) -m 755 $(LIB32DIR)
+	$(INSTALL_LIB) 32bit/libcupsppdc.so.1 $(LIB32DIR)/libcupsppdc.so.1
+	$(LN) libcupsppdc.so.1 $(LIB32DIR)/libcupsppdc.so
+
+install64bit:
+	echo Installing libraries in $(LIB64DIR)...
+	$(INSTALL_DIR) -m 755 $(LIB64DIR)
+	$(INSTALL_LIB) 64bit/libcupsppdc.so.1 $(LIB64DIR)/libcupsppdc.so.1
+	$(LN) libcupsppdc.so.1 $(LIB64DIR)/libcupsppdc.so
 
 
 #
@@ -122,29 +205,70 @@ uninstall:
 	$(RM) $(SERVERBIN)/driver/drv
 	$(RMDIR) $(SERVERBIN)/driver
 	$(RMDIR) $(DATADIR)/drv
+	$(RM) $(LIBDIR)/libcupsppdc.1.dylib
+	$(RM) $(LIBDIR)/libcupsppdc.a
+	$(RM) $(LIBDIR)/libcupsppdc.dylib
+	$(RM) $(LIBDIR)/libcupsppdc_s.a
+	$(RM) $(LIBDIR)/libcupsppdc.sl
+	$(RM) $(LIBDIR)/libcupsppdc.sl.1
+	$(RM) $(LIBDIR)/libcupsppdc.so
+	$(RM) $(LIBDIR)/libcupsppdc.so.1
+	-$(RMDIR) $(LIBDIR)
+	$(RM) $(INCLUDEDIR)/cups/ppdc.h
+	-$(RMDIR) $(INCLUDEDIR)/cups
+
+uninstall32bit:
+	$(RM) $(LIB32DIR)/libcupsppdc.so
+	$(RM) $(LIB32DIR)/libcupsppdc.so.1
+	-$(RMDIR) $(LIB32DIR)
+
+uninstall64bit:
+	$(RM) $(LIB64DIR)/libcupsppdc.so
+	$(RM) $(LIB64DIR)/libcupsppdc.so.1
+	-$(RMDIR) $(LIB64DIR)
+
+
+#
+# Automatic API help files...
+#
+
+apihelp:
+	mxmldoc --section "Programming" \
+		--title "PPD Compiler API" \
+		--css ../doc/cups-printable.css \
+		--header api-ppdc.header --intro api-ppdc.shtml \
+		ppdc.h $(LIBOBJS:.o=.cxx) >../doc/help/api-ppdc.html
+
+framedhelp:
+	mxmldoc --framed api-ppdc \
+		--section "Programming" \
+		--title "PPD Compiler API" \
+		--css ../doc/cups-printable.css \
+		--header api-ppdc.header --intro api-ppdc.shtml \
+		ppdc.h $(LIBOBJS:.o=.cxx)
 
 
 #
 # drv, the CUPS driver interface program to the PPD compiler.
 #
 
-drv:			drv.o libppdc.a ../cups/$(LIBCUPS)
+drv:			drv.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CXX) $(LDFLAGS) -o $@ drv.o libppdc.a $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ drv.o -L. -lcupsppdc $(LIBS)
 
 
 #
 # ppdc, the PPD compiler.
 #
 
-ppdc:			ppdc.o libppdc.a ../cups/$(LIBCUPS)
+ppdc:			ppdc.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CXX) $(LDFLAGS) -o $@ ppdc.o libppdc.a $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ ppdc.o -L. -lcupsppdc $(LIBS)
 
 
-ppdc-static:		ppdc.o libppdc.a  ../cups/libcups.a foo.drv foo-fr.po
+ppdc-static:		ppdc.o libcupsppdc.a  ../cups/libcups.a foo.drv foo-fr.po
 	echo Linking $@...
-	$(CXX) $(LDFLAGS) -o ppdc-static ppdc.o libppdc.a ../cups/libcups.a \
+	$(CXX) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a ../cups/libcups.a \
 		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 	echo Testing PPD compiler...
 	./ppdc-static -l en,fr -I ../data foo.drv
@@ -155,18 +279,18 @@ ppdc-static:		ppdc.o libppdc.a  ../cups/libcups.a foo.drv foo-fr.po
 # ppdhtml, the PPD to HTML utility.
 #
 
-ppdhtml:			ppdhtml.o libppdc.a ../cups/$(LIBCUPS)
+ppdhtml:			ppdhtml.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CXX) $(LDFLAGS) -o $@ ppdhtml.o libppdc.a $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ ppdhtml.o -L. -lcupsppdc $(LIBS)
 
 
 #
 # ppdi, import PPD files.
 #
 
-ppdi:			ppdi.o libppdc.a ../cups/$(LIBCUPS)
+ppdi:			ppdi.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CXX) $(LDFLAGS) -o $@ ppdi.o libppdc.a $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ ppdi.o -L. -lcupsppdc $(LIBS)
 
 
 #
@@ -182,19 +306,91 @@ ppdmerge:			ppdmerge.o ../cups/$(LIBCUPS)
 # ppdpo, create message catalog files.
 #
 
-ppdpo:			ppdpo.o libppdc.a ../cups/$(LIBCUPS)
+ppdpo:			ppdpo.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CXX) $(LDFLAGS) -o $@ ppdpo.o libppdc.a $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ ppdpo.o -L. -lcupsppdc $(LIBS)
 
 
 #
-# libppdc.a, the PPD compiler library...
+# libcupsppdc.so.1, libcupsppdc.sl.1
 #
 
-libppdc.a:		$(PPDCOBJS)
+libcupsppdc.so.1 libcupsppdc.sl.1:	$(LIBOBJS)
+	echo Linking $@...
+	$(DSOXX) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
+	$(RM) `basename $@ .1`
+	$(LN) $@ `basename $@ .1`
+
+
+#
+# 32bit/libcupsppdc.so.1
+#
+
+32bit/libcupsppdc.so.1:	$(LIB32OBJS)
+	echo Linking 32-bit $@...
+	-mkdir 32bit
+	$(DSOXX) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(LIBS)
+	$(RM) 32bit/libcupsppdc.so
+	$(LN) libcupsppdc.so.1 32bit/libcupsppdc.so
+
+
+#
+# 64bit/libcupsppdc.so.1
+#
+
+64bit/libcupsppdc.so.1:	$(LIB64OBJS)
+	echo Linking 64-bit $@...
+	-mkdir 64bit
+	$(DSOXX) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(LIBS)
+	$(RM) 64bit/libcupsppdc.so
+	$(LN) libcupsppdc.so.1 64bit/libcupsppdc.so
+
+
+#
+# libcupsppdc.1.dylib
+#
+
+libcupsppdc.1.dylib:	$(LIBOBJS) libcupsppdc.exp
+	echo Linking $@...
+	$(DSOXX) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
+		-install_name $(libdir)/$@ \
+		-current_version 1.0.0 \
+		-compatibility_version 1.0.0 \
+		-exported_symbols_list libcupsppdc.exp \
+		$(LIBOBJS) $(LIBS)
+	$(RM) libcupsppdc.dylib
+	$(LN) $@ libcupsppdc.dylib
+
+
+#
+# libcupsppdc_s.a
+#
+
+libcupsppdc_s.a:	$(LIBOBJS)
 	echo Creating $@...
+	$(DSOXX) $(DSOFLAGS) -o libcupsppdc_s.o $(LIBOBJS) $(LIBS)
+	$(RM) $@
+	$(AR) $(ARFLAGS) $@ libcupsppdc_s.o
+
+
+#
+# libcupsppdc.la
+#
+
+libcupsppdc.la:    $(LIBOBJS)
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+		-version-info 1:0 $(LIBS)
+
+
+#
+# libcupsppdc.a
+#
+
+libcupsppdc.a:	$(LIBOBJS)
+	echo Archiving $@...
 	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $(PPDCOBJS)
+	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
 	$(RANLIB) $@
 
 
diff --git a/ppdc/libcupsppdc.exp b/ppdc/libcupsppdc.exp
new file mode 100644
index 000000000..999f7d8e4
--- /dev/null
+++ b/ppdc/libcupsppdc.exp
@@ -0,0 +1,158 @@
+__ZN10ppdcChoiceC1EPKcS1_S1_
+__ZN10ppdcChoiceC2EPKcS1_S1_
+__ZN10ppdcChoiceD0Ev
+__ZN10ppdcChoiceD1Ev
+__ZN10ppdcChoiceD2Ev
+__ZN10ppdcDriver10find_groupEPKc
+__ZN10ppdcDriver11find_optionEPKc
+__ZN10ppdcDriver11set_versionEPKc
+__ZN10ppdcDriver14set_model_nameEPKc
+__ZN10ppdcDriver14write_ppd_fileEP12_cups_file_sP11ppdcCatalogP9ppdcArrayP10ppdcSource14ppdcLineEnding
+__ZN10ppdcDriver16set_default_fontEP8ppdcFont
+__ZN10ppdcDriver16set_default_sizeEP13ppdcMediaSize
+__ZN10ppdcDriver16set_manufacturerEPKc
+__ZN10ppdcDriver16set_pc_file_nameEPKc
+__ZN10ppdcDriver20set_custom_size_codeEPKc
+__ZN10ppdcDriver9find_attrEPKcS1_
+__ZN10ppdcDriverC1EPS_
+__ZN10ppdcDriverC2EPS_
+__ZN10ppdcDriverD0Ev
+__ZN10ppdcDriverD1Ev
+__ZN10ppdcDriverD2Ev
+__ZN10ppdcFilterC1EPKcS1_i
+__ZN10ppdcFilterC2EPKcS1_i
+__ZN10ppdcFilterD0Ev
+__ZN10ppdcFilterD1Ev
+__ZN10ppdcFilterD2Ev
+__ZN10ppdcOption11find_choiceEPKc
+__ZN10ppdcOption13set_defchoiceEP10ppdcChoice
+__ZN10ppdcOptionC1E11ppdcOptTypePKcS2_14ppdcOptSectionf
+__ZN10ppdcOptionC1EPS_
+__ZN10ppdcOptionC2E11ppdcOptTypePKcS2_14ppdcOptSectionf
+__ZN10ppdcOptionC2EPS_
+__ZN10ppdcOptionD0Ev
+__ZN10ppdcOptionD1Ev
+__ZN10ppdcOptionD2Ev
+__ZN10ppdcShared3getEv
+__ZN10ppdcShared7releaseEv
+__ZN10ppdcSharedC1Ev
+__ZN10ppdcSharedC2Ev
+__ZN10ppdcSharedD0Ev
+__ZN10ppdcSharedD1Ev
+__ZN10ppdcSharedD2Ev
+__ZN10ppdcSource10get_choiceEP8ppdcFile
+__ZN10ppdcSource10get_duplexEP8ppdcFileP10ppdcDriver
+__ZN10ppdcSource10get_filterEP8ppdcFile
+__ZN10ppdcSource10get_optionEP8ppdcFileP10ppdcDriverP9ppdcGroup
+__ZN10ppdcSource10import_ppdEPKc
+__ZN10ppdcSource10write_fileEPKc
+__ZN10ppdcSource11add_includeEPKc
+__ZN10ppdcSource11find_driverEPKc
+__ZN10ppdcSource11get_booleanEP8ppdcFile
+__ZN10ppdcSource11get_genericEP8ppdcFilePKcS3_S3_
+__ZN10ppdcSource11get_integerEP8ppdcFile
+__ZN10ppdcSource11get_integerEPKc
+__ZN10ppdcSource12find_includeEPKcS1_Pci
+__ZN10ppdcSource12get_variableEP8ppdcFile
+__ZN10ppdcSource12set_variableEPKcS1_
+__ZN10ppdcSource13find_variableEPKc
+__ZN10ppdcSource14get_constraintEP8ppdcFile
+__ZN10ppdcSource14get_resolutionEP8ppdcFile
+__ZN10ppdcSource15get_color_modelEP8ppdcFile
+__ZN10ppdcSource15get_color_orderEPKc
+__ZN10ppdcSource15get_color_spaceEPKc
+__ZN10ppdcSource15get_custom_sizeEP8ppdcFile
+__ZN10ppdcSource15get_installableEP8ppdcFile
+__ZN10ppdcSource15get_measurementEP8ppdcFile
+__ZN10ppdcSource17get_color_profileEP8ppdcFile
+__ZN10ppdcSource18get_simple_profileEP8ppdcFile
+__ZN10ppdcSource6get_poEP8ppdcFile
+__ZN10ppdcSource6quotefEP12_cups_file_sPKcz
+__ZN10ppdcSource7find_poEPKc
+__ZN10ppdcSource8get_attrEP8ppdcFile
+__ZN10ppdcSource8get_fontEP8ppdcFile
+__ZN10ppdcSource8get_sizeEP8ppdcFile
+__ZN10ppdcSource9find_sizeEPKc
+__ZN10ppdcSource9get_floatEP8ppdcFile
+__ZN10ppdcSource9get_groupEP8ppdcFileP10ppdcDriver
+__ZN10ppdcSource9get_tokenEP8ppdcFilePci
+__ZN10ppdcSource9read_fileEPKc
+__ZN10ppdcSource9scan_fileEP8ppdcFileP10ppdcDriverb
+__ZN10ppdcSourceC1EPKc
+__ZN10ppdcSourceC2EPKc
+__ZN10ppdcSourceD0Ev
+__ZN10ppdcSourceD1Ev
+__ZN10ppdcSourceD2Ev
+__ZN10ppdcStringC1EPKc
+__ZN10ppdcStringC2EPKc
+__ZN10ppdcStringD0Ev
+__ZN10ppdcStringD1Ev
+__ZN10ppdcStringD2Ev
+__ZN11ppdcCatalog11add_messageEPKc
+__ZN11ppdcCatalog12find_messageEPKc
+__ZN11ppdcCatalog13load_messagesEPKc
+__ZN11ppdcCatalog13save_messagesEPKc
+__ZN11ppdcCatalogC1EPKcS1_
+__ZN11ppdcCatalogC2EPKcS1_
+__ZN11ppdcCatalogD0Ev
+__ZN11ppdcCatalogD1Ev
+__ZN11ppdcCatalogD2Ev
+__ZN11ppdcMessageC1EPKcS1_
+__ZN11ppdcMessageC2EPKcS1_
+__ZN11ppdcMessageD0Ev
+__ZN11ppdcMessageD1Ev
+__ZN11ppdcMessageD2Ev
+__ZN11ppdcProfileC1EPKcS1_ffPKf
+__ZN11ppdcProfileC2EPKcS1_ffPKf
+__ZN11ppdcProfileD0Ev
+__ZN11ppdcProfileD1Ev
+__ZN11ppdcProfileD2Ev
+__ZN12ppdcVariable9set_valueEPKc
+__ZN12ppdcVariableC1EPKcS1_
+__ZN12ppdcVariableC2EPKcS1_
+__ZN12ppdcVariableD0Ev
+__ZN12ppdcVariableD1Ev
+__ZN12ppdcVariableD2Ev
+__ZN13ppdcMediaSizeC1EPKcS1_ffffffS1_S1_
+__ZN13ppdcMediaSizeC2EPKcS1_ffffffS1_S1_
+__ZN13ppdcMediaSizeD0Ev
+__ZN13ppdcMediaSizeD1Ev
+__ZN13ppdcMediaSizeD2Ev
+__ZN14ppdcConstraintC1EPKcS1_S1_S1_
+__ZN14ppdcConstraintC2EPKcS1_S1_S1_
+__ZN14ppdcConstraintD0Ev
+__ZN14ppdcConstraintD1Ev
+__ZN14ppdcConstraintD2Ev
+__ZN8ppdcAttrC1EPKcS1_S1_S1_
+__ZN8ppdcAttrC2EPKcS1_S1_S1_
+__ZN8ppdcAttrD0Ev
+__ZN8ppdcAttrD1Ev
+__ZN8ppdcAttrD2Ev
+__ZN8ppdcFile3getEv
+__ZN8ppdcFile4peekEv
+__ZN8ppdcFileC1EPKc
+__ZN8ppdcFileC2EPKc
+__ZN8ppdcFileD1Ev
+__ZN8ppdcFileD2Ev
+__ZN8ppdcFontC1EPKcS1_S1_S1_14ppdcFontStatus
+__ZN8ppdcFontC2EPKcS1_S1_S1_14ppdcFontStatus
+__ZN8ppdcFontD0Ev
+__ZN8ppdcFontD1Ev
+__ZN8ppdcFontD2Ev
+__ZN9ppdcArray3addEP10ppdcShared
+__ZN9ppdcArray4nextEv
+__ZN9ppdcArray5firstEv
+__ZN9ppdcArray6removeEP10ppdcShared
+__ZN9ppdcArrayC1EPS_
+__ZN9ppdcArrayC2EPS_
+__ZN9ppdcArrayD0Ev
+__ZN9ppdcArrayD1Ev
+__ZN9ppdcArrayD2Ev
+__ZN9ppdcGroup11find_optionEPKc
+__ZN9ppdcGroupC1EPKcS1_
+__ZN9ppdcGroupC1EPS_
+__ZN9ppdcGroupC2EPKcS1_
+__ZN9ppdcGroupC2EPS_
+__ZN9ppdcGroupD0Ev
+__ZN9ppdcGroupD1Ev
+__ZN9ppdcGroupD2Ev
diff --git a/scheduler/Dependencies b/scheduler/Dependencies
index 9bf513e2d..02b8c6261 100644
--- a/scheduler/Dependencies
+++ b/scheduler/Dependencies
@@ -1,4 +1,4 @@
-# DO NOT DELETE THIS LINE -- make depend depends on it.
+# DO NOT DELETE
 
 auth.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
 auth.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
@@ -241,3 +241,489 @@ testsub.o: ../cups/debug.h ../cups/string.h ../config.h
 util.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 util.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 util.o: ../cups/language.h ../cups/file.h ../cups/string.h ../config.h
+# DO NOT DELETE
+
+auth.32.o: auth.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+auth.32.o: auth.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+auth.32.o: auth.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+auth.32.o: auth.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+auth.32.o: auth.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+auth.32.o: auth.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h auth.h
+auth.32.o: auth.c  client.h policy.h printers.h classes.h job.h conf.h banners.h
+auth.32.o: auth.c  dirsvc.h network.h subscriptions.h
+banners.32.o: banners.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+banners.32.o: banners.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+banners.32.o: banners.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+banners.32.o: banners.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+banners.32.o: banners.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+banners.32.o: banners.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+banners.32.o: banners.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+banners.32.o: banners.c  banners.h dirsvc.h network.h subscriptions.h ../cups/dir.h
+cert.32.o: cert.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+cert.32.o: cert.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+cert.32.o: cert.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+cert.32.o: cert.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+cert.32.o: cert.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+cert.32.o: cert.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h auth.h
+cert.32.o: cert.c  client.h policy.h printers.h classes.h job.h conf.h banners.h
+cert.32.o: cert.c  dirsvc.h network.h subscriptions.h
+classes.32.o: classes.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+classes.32.o: classes.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+classes.32.o: classes.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+classes.32.o: classes.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+classes.32.o: classes.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+classes.32.o: classes.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+classes.32.o: classes.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+classes.32.o: classes.c  banners.h dirsvc.h network.h subscriptions.h
+client.32.o: client.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+client.32.o: client.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+client.32.o: client.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+client.32.o: client.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+client.32.o: client.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+client.32.o: client.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+client.32.o: client.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+client.32.o: client.c  banners.h dirsvc.h network.h subscriptions.h
+conf.32.o: conf.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+conf.32.o: conf.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+conf.32.o: conf.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+conf.32.o: conf.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+conf.32.o: conf.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+conf.32.o: conf.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h auth.h
+conf.32.o: conf.c  client.h policy.h printers.h classes.h job.h conf.h banners.h
+conf.32.o: conf.c  dirsvc.h network.h subscriptions.h
+dirsvc.32.o: dirsvc.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+dirsvc.32.o: dirsvc.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+dirsvc.32.o: dirsvc.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+dirsvc.32.o: dirsvc.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+dirsvc.32.o: dirsvc.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+dirsvc.32.o: dirsvc.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+dirsvc.32.o: dirsvc.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+dirsvc.32.o: dirsvc.c  banners.h dirsvc.h network.h subscriptions.h
+env.32.o: env.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+env.32.o: env.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h
+env.32.o: env.c  ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h
+env.32.o: env.c  ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+env.32.o: env.c  ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h
+env.32.o: env.c  ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h
+env.32.o: env.c  printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+env.32.o: env.c  subscriptions.h
+main.32.o: main.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+main.32.o: main.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+main.32.o: main.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+main.32.o: main.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+main.32.o: main.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+main.32.o: main.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h auth.h
+main.32.o: main.c  client.h policy.h printers.h classes.h job.h conf.h banners.h
+main.32.o: main.c  dirsvc.h network.h subscriptions.h ../cups/dir.h
+ipp.32.o: ipp.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+ipp.32.o: ipp.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h
+ipp.32.o: ipp.c  ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h
+ipp.32.o: ipp.c  ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+ipp.32.o: ipp.c  ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h
+ipp.32.o: ipp.c  ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h
+ipp.32.o: ipp.c  printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+ipp.32.o: ipp.c  subscriptions.h ../cups/ppd-private.h
+listen.32.o: listen.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+listen.32.o: listen.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+listen.32.o: listen.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+listen.32.o: listen.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+listen.32.o: listen.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+listen.32.o: listen.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+listen.32.o: listen.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+listen.32.o: listen.c  banners.h dirsvc.h network.h subscriptions.h
+job.32.o: job.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+job.32.o: job.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h
+job.32.o: job.c  ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h
+job.32.o: job.c  ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+job.32.o: job.c  ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h
+job.32.o: job.c  ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h
+job.32.o: job.c  printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+job.32.o: job.c  subscriptions.h ../cups/backend.h ../cups/dir.h
+log.32.o: log.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+log.32.o: log.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h
+log.32.o: log.c  ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h
+log.32.o: log.c  ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+log.32.o: log.c  ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h
+log.32.o: log.c  ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h
+log.32.o: log.c  printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+log.32.o: log.c  subscriptions.h
+network.32.o: network.c  ../cups/http-private.h ../config.h ../cups/http.h
+network.32.o: network.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+network.32.o: network.c  ../cups/ipp.h cupsd.h ../cups/string.h ../cups/array.h
+network.32.o: network.c  ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+network.32.o: network.c  ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+network.32.o: network.c  ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h
+network.32.o: network.c  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+network.32.o: network.c  classes.h job.h conf.h banners.h dirsvc.h network.h
+network.32.o: network.c  subscriptions.h
+policy.32.o: policy.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+policy.32.o: policy.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+policy.32.o: policy.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+policy.32.o: policy.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+policy.32.o: policy.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+policy.32.o: policy.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+policy.32.o: policy.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+policy.32.o: policy.c  banners.h dirsvc.h network.h subscriptions.h
+printers.32.o: printers.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+printers.32.o: printers.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+printers.32.o: printers.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+printers.32.o: printers.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+printers.32.o: printers.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+printers.32.o: printers.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+printers.32.o: printers.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+printers.32.o: printers.c  banners.h dirsvc.h network.h subscriptions.h ../cups/dir.h
+process.32.o: process.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+process.32.o: process.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+process.32.o: process.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+process.32.o: process.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+process.32.o: process.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+process.32.o: process.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+process.32.o: process.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+process.32.o: process.c  banners.h dirsvc.h network.h subscriptions.h
+quotas.32.o: quotas.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+quotas.32.o: quotas.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+quotas.32.o: quotas.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+quotas.32.o: quotas.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+quotas.32.o: quotas.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+quotas.32.o: quotas.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+quotas.32.o: quotas.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+quotas.32.o: quotas.c  banners.h dirsvc.h network.h subscriptions.h
+removefile.32.o: removefile.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+removefile.32.o: removefile.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+removefile.32.o: removefile.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+removefile.32.o: removefile.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+removefile.32.o: removefile.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h
+removefile.32.o: removefile.c  ../cups/i18n.h ../cups/transcode.h ../cups/debug.h sysman.h
+removefile.32.o: removefile.c  statbuf.h cert.h auth.h client.h policy.h printers.h classes.h
+removefile.32.o: removefile.c  job.h conf.h banners.h dirsvc.h network.h subscriptions.h
+select.32.o: select.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+select.32.o: select.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+select.32.o: select.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+select.32.o: select.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+select.32.o: select.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+select.32.o: select.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+select.32.o: select.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+select.32.o: select.c  banners.h dirsvc.h network.h subscriptions.h
+server.32.o: server.c  ../cups/http-private.h ../config.h ../cups/http.h
+server.32.o: server.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+server.32.o: server.c  ../cups/ipp.h cupsd.h ../cups/string.h ../cups/array.h
+server.32.o: server.c  ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+server.32.o: server.c  ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+server.32.o: server.c  ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h
+server.32.o: server.c  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+server.32.o: server.c  classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h
+statbuf.32.o: statbuf.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+statbuf.32.o: statbuf.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+statbuf.32.o: statbuf.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+statbuf.32.o: statbuf.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+statbuf.32.o: statbuf.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+statbuf.32.o: statbuf.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+statbuf.32.o: statbuf.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+statbuf.32.o: statbuf.c  banners.h dirsvc.h network.h subscriptions.h
+subscriptions.32.o: subscriptions.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+subscriptions.32.o: subscriptions.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+subscriptions.32.o: subscriptions.c  ../cups/ipp.h ../cups/string.h ../cups/array.h
+subscriptions.32.o: subscriptions.c  ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+subscriptions.32.o: subscriptions.c  ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+subscriptions.32.o: subscriptions.c  ../cups/http.h ../cups/i18n.h ../cups/transcode.h
+subscriptions.32.o: subscriptions.c  ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h
+subscriptions.32.o: subscriptions.c  policy.h printers.h classes.h job.h conf.h banners.h
+subscriptions.32.o: subscriptions.c  dirsvc.h network.h subscriptions.h
+sysman.32.o: sysman.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+sysman.32.o: sysman.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+sysman.32.o: sysman.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+sysman.32.o: sysman.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+sysman.32.o: sysman.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+sysman.32.o: sysman.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+sysman.32.o: sysman.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+sysman.32.o: sysman.c  banners.h dirsvc.h network.h subscriptions.h
+filter.32.o: filter.c  ../cups/debug.h ../cups/string.h ../config.h mime.h ../cups/array.h
+filter.32.o: filter.c  ../cups/versioning.h ../cups/ipp.h ../cups/file.h
+mime.32.o: mime.c  ../cups/debug.h ../cups/dir.h ../cups/versioning.h ../cups/string.h
+mime.32.o: mime.c  ../config.h mime.h ../cups/array.h ../cups/ipp.h ../cups/file.h
+type.32.o: type.c  ../cups/string.h ../config.h mime.h ../cups/array.h
+type.32.o: type.c  ../cups/versioning.h ../cups/ipp.h ../cups/file.h ../cups/debug.h
+cupsfilter.32.o: cupsfilter.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h
+cupsfilter.32.o: cupsfilter.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+cupsfilter.32.o: cupsfilter.c  ../cups/file.h ../cups/language.h ../cups/i18n.h
+cupsfilter.32.o: cupsfilter.c  ../cups/transcode.h ../cups/string.h ../config.h mime.h
+cupsfilter.32.o: cupsfilter.c  ../cups/array.h ../cups/ipp.h ../cups/file.h
+cups-deviced.32.o: cups-deviced.c  util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+cups-deviced.32.o: cups-deviced.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+cups-deviced.32.o: cups-deviced.c  ../cups/file.h ../cups/language.h ../cups/file.h
+cups-deviced.32.o: cups-deviced.c  ../cups/string.h ../config.h ../cups/array.h ../cups/dir.h
+cups-driverd.32.o: cups-driverd.c  util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+cups-driverd.32.o: cups-driverd.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+cups-driverd.32.o: cups-driverd.c  ../cups/file.h ../cups/language.h ../cups/file.h
+cups-driverd.32.o: cups-driverd.c  ../cups/string.h ../config.h ../cups/dir.h
+cups-driverd.32.o: cups-driverd.c  ../cups/transcode.h
+cups-lpd.32.o: cups-lpd.c  ../cups/http-private.h ../config.h ../cups/http.h
+cups-lpd.32.o: cups-lpd.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+cups-lpd.32.o: cups-lpd.c  ../cups/ipp.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+cups-lpd.32.o: cups-lpd.c  ../cups/file.h ../cups/language.h ../cups/string.h
+cups-lpd.32.o: cups-lpd.c  ../cups/language.h
+cups-polld.32.o: cups-polld.c  ../cups/http-private.h ../config.h ../cups/http.h
+cups-polld.32.o: cups-polld.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+cups-polld.32.o: cups-polld.c  ../cups/ipp.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+cups-polld.32.o: cups-polld.c  ../cups/file.h ../cups/language.h ../cups/language.h
+cups-polld.32.o: cups-polld.c  ../cups/string.h
+testdirsvc.32.o: testdirsvc.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testdirsvc.32.o: testdirsvc.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+testdirsvc.32.o: testdirsvc.c  ../cups/file.h ../cups/language.h ../cups/string.h ../config.h
+testlpd.32.o: testlpd.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+testlpd.32.o: testlpd.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testlpd.32.o: testlpd.c  ../cups/string.h ../config.h
+testmime.32.o: testmime.c  ../cups/string.h ../config.h mime.h ../cups/array.h
+testmime.32.o: testmime.c  ../cups/versioning.h ../cups/ipp.h ../cups/file.h ../cups/dir.h
+testspeed.32.o: testspeed.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+testspeed.32.o: testspeed.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testspeed.32.o: testspeed.c  ../cups/language.h ../cups/debug.h
+testsub.32.o: testsub.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+testsub.32.o: testsub.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testsub.32.o: testsub.c  ../cups/debug.h ../cups/string.h ../config.h
+util.32.o: util.c  util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+util.32.o: util.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+util.32.o: util.c  ../cups/language.h ../cups/file.h ../cups/string.h ../config.h
+# DO NOT DELETE
+
+auth.64.o: auth.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+auth.64.o: auth.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+auth.64.o: auth.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+auth.64.o: auth.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+auth.64.o: auth.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+auth.64.o: auth.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h auth.h
+auth.64.o: auth.c  client.h policy.h printers.h classes.h job.h conf.h banners.h
+auth.64.o: auth.c  dirsvc.h network.h subscriptions.h
+banners.64.o: banners.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+banners.64.o: banners.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+banners.64.o: banners.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+banners.64.o: banners.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+banners.64.o: banners.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+banners.64.o: banners.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+banners.64.o: banners.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+banners.64.o: banners.c  banners.h dirsvc.h network.h subscriptions.h ../cups/dir.h
+cert.64.o: cert.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+cert.64.o: cert.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+cert.64.o: cert.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+cert.64.o: cert.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+cert.64.o: cert.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+cert.64.o: cert.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h auth.h
+cert.64.o: cert.c  client.h policy.h printers.h classes.h job.h conf.h banners.h
+cert.64.o: cert.c  dirsvc.h network.h subscriptions.h
+classes.64.o: classes.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+classes.64.o: classes.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+classes.64.o: classes.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+classes.64.o: classes.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+classes.64.o: classes.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+classes.64.o: classes.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+classes.64.o: classes.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+classes.64.o: classes.c  banners.h dirsvc.h network.h subscriptions.h
+client.64.o: client.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+client.64.o: client.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+client.64.o: client.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+client.64.o: client.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+client.64.o: client.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+client.64.o: client.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+client.64.o: client.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+client.64.o: client.c  banners.h dirsvc.h network.h subscriptions.h
+conf.64.o: conf.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+conf.64.o: conf.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+conf.64.o: conf.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+conf.64.o: conf.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+conf.64.o: conf.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+conf.64.o: conf.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h auth.h
+conf.64.o: conf.c  client.h policy.h printers.h classes.h job.h conf.h banners.h
+conf.64.o: conf.c  dirsvc.h network.h subscriptions.h
+dirsvc.64.o: dirsvc.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+dirsvc.64.o: dirsvc.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+dirsvc.64.o: dirsvc.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+dirsvc.64.o: dirsvc.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+dirsvc.64.o: dirsvc.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+dirsvc.64.o: dirsvc.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+dirsvc.64.o: dirsvc.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+dirsvc.64.o: dirsvc.c  banners.h dirsvc.h network.h subscriptions.h
+env.64.o: env.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+env.64.o: env.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h
+env.64.o: env.c  ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h
+env.64.o: env.c  ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+env.64.o: env.c  ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h
+env.64.o: env.c  ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h
+env.64.o: env.c  printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+env.64.o: env.c  subscriptions.h
+main.64.o: main.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+main.64.o: main.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+main.64.o: main.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+main.64.o: main.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+main.64.o: main.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+main.64.o: main.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h auth.h
+main.64.o: main.c  client.h policy.h printers.h classes.h job.h conf.h banners.h
+main.64.o: main.c  dirsvc.h network.h subscriptions.h ../cups/dir.h
+ipp.64.o: ipp.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+ipp.64.o: ipp.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h
+ipp.64.o: ipp.c  ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h
+ipp.64.o: ipp.c  ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+ipp.64.o: ipp.c  ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h
+ipp.64.o: ipp.c  ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h
+ipp.64.o: ipp.c  printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+ipp.64.o: ipp.c  subscriptions.h ../cups/ppd-private.h
+listen.64.o: listen.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+listen.64.o: listen.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+listen.64.o: listen.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+listen.64.o: listen.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+listen.64.o: listen.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+listen.64.o: listen.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+listen.64.o: listen.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+listen.64.o: listen.c  banners.h dirsvc.h network.h subscriptions.h
+job.64.o: job.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+job.64.o: job.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h
+job.64.o: job.c  ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h
+job.64.o: job.c  ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+job.64.o: job.c  ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h
+job.64.o: job.c  ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h
+job.64.o: job.c  printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+job.64.o: job.c  subscriptions.h ../cups/backend.h ../cups/dir.h
+log.64.o: log.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+log.64.o: log.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h
+log.64.o: log.c  ../cups/string.h ../cups/array.h ../cups/cups.h ../cups/ppd.h
+log.64.o: log.c  ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
+log.64.o: log.c  ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h
+log.64.o: log.c  ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h
+log.64.o: log.c  printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+log.64.o: log.c  subscriptions.h
+network.64.o: network.c  ../cups/http-private.h ../config.h ../cups/http.h
+network.64.o: network.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+network.64.o: network.c  ../cups/ipp.h cupsd.h ../cups/string.h ../cups/array.h
+network.64.o: network.c  ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+network.64.o: network.c  ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+network.64.o: network.c  ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h
+network.64.o: network.c  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+network.64.o: network.c  classes.h job.h conf.h banners.h dirsvc.h network.h
+network.64.o: network.c  subscriptions.h
+policy.64.o: policy.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+policy.64.o: policy.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+policy.64.o: policy.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+policy.64.o: policy.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+policy.64.o: policy.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+policy.64.o: policy.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+policy.64.o: policy.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+policy.64.o: policy.c  banners.h dirsvc.h network.h subscriptions.h
+printers.64.o: printers.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+printers.64.o: printers.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+printers.64.o: printers.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+printers.64.o: printers.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+printers.64.o: printers.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+printers.64.o: printers.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+printers.64.o: printers.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+printers.64.o: printers.c  banners.h dirsvc.h network.h subscriptions.h ../cups/dir.h
+process.64.o: process.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+process.64.o: process.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+process.64.o: process.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+process.64.o: process.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+process.64.o: process.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+process.64.o: process.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+process.64.o: process.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+process.64.o: process.c  banners.h dirsvc.h network.h subscriptions.h
+quotas.64.o: quotas.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+quotas.64.o: quotas.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+quotas.64.o: quotas.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+quotas.64.o: quotas.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+quotas.64.o: quotas.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+quotas.64.o: quotas.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+quotas.64.o: quotas.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+quotas.64.o: quotas.c  banners.h dirsvc.h network.h subscriptions.h
+removefile.64.o: removefile.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+removefile.64.o: removefile.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+removefile.64.o: removefile.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+removefile.64.o: removefile.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+removefile.64.o: removefile.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h
+removefile.64.o: removefile.c  ../cups/i18n.h ../cups/transcode.h ../cups/debug.h sysman.h
+removefile.64.o: removefile.c  statbuf.h cert.h auth.h client.h policy.h printers.h classes.h
+removefile.64.o: removefile.c  job.h conf.h banners.h dirsvc.h network.h subscriptions.h
+select.64.o: select.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+select.64.o: select.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+select.64.o: select.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+select.64.o: select.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+select.64.o: select.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+select.64.o: select.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+select.64.o: select.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+select.64.o: select.c  banners.h dirsvc.h network.h subscriptions.h
+server.64.o: server.c  ../cups/http-private.h ../config.h ../cups/http.h
+server.64.o: server.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+server.64.o: server.c  ../cups/ipp.h cupsd.h ../cups/string.h ../cups/array.h
+server.64.o: server.c  ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+server.64.o: server.c  ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+server.64.o: server.c  ../cups/http.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h
+server.64.o: server.c  sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+server.64.o: server.c  classes.h job.h conf.h banners.h dirsvc.h network.h subscriptions.h
+statbuf.64.o: statbuf.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+statbuf.64.o: statbuf.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+statbuf.64.o: statbuf.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+statbuf.64.o: statbuf.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+statbuf.64.o: statbuf.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+statbuf.64.o: statbuf.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+statbuf.64.o: statbuf.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+statbuf.64.o: statbuf.c  banners.h dirsvc.h network.h subscriptions.h
+subscriptions.64.o: subscriptions.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+subscriptions.64.o: subscriptions.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+subscriptions.64.o: subscriptions.c  ../cups/ipp.h ../cups/string.h ../cups/array.h
+subscriptions.64.o: subscriptions.c  ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+subscriptions.64.o: subscriptions.c  ../cups/language.h mime.h ../cups/ipp.h ../cups/file.h
+subscriptions.64.o: subscriptions.c  ../cups/http.h ../cups/i18n.h ../cups/transcode.h
+subscriptions.64.o: subscriptions.c  ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h
+subscriptions.64.o: subscriptions.c  policy.h printers.h classes.h job.h conf.h banners.h
+subscriptions.64.o: subscriptions.c  dirsvc.h network.h subscriptions.h
+sysman.64.o: sysman.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+sysman.64.o: sysman.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+sysman.64.o: sysman.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
+sysman.64.o: sysman.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+sysman.64.o: sysman.c  mime.h ../cups/ipp.h ../cups/file.h ../cups/http.h ../cups/i18n.h
+sysman.64.o: sysman.c  ../cups/transcode.h ../cups/debug.h sysman.h statbuf.h cert.h
+sysman.64.o: sysman.c  auth.h client.h policy.h printers.h classes.h job.h conf.h
+sysman.64.o: sysman.c  banners.h dirsvc.h network.h subscriptions.h
+filter.64.o: filter.c  ../cups/debug.h ../cups/string.h ../config.h mime.h ../cups/array.h
+filter.64.o: filter.c  ../cups/versioning.h ../cups/ipp.h ../cups/file.h
+mime.64.o: mime.c  ../cups/debug.h ../cups/dir.h ../cups/versioning.h ../cups/string.h
+mime.64.o: mime.c  ../config.h mime.h ../cups/array.h ../cups/ipp.h ../cups/file.h
+type.64.o: type.c  ../cups/string.h ../config.h mime.h ../cups/array.h
+type.64.o: type.c  ../cups/versioning.h ../cups/ipp.h ../cups/file.h ../cups/debug.h
+cupsfilter.64.o: cupsfilter.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h
+cupsfilter.64.o: cupsfilter.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+cupsfilter.64.o: cupsfilter.c  ../cups/file.h ../cups/language.h ../cups/i18n.h
+cupsfilter.64.o: cupsfilter.c  ../cups/transcode.h ../cups/string.h ../config.h mime.h
+cupsfilter.64.o: cupsfilter.c  ../cups/array.h ../cups/ipp.h ../cups/file.h
+cups-deviced.64.o: cups-deviced.c  util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+cups-deviced.64.o: cups-deviced.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+cups-deviced.64.o: cups-deviced.c  ../cups/file.h ../cups/language.h ../cups/file.h
+cups-deviced.64.o: cups-deviced.c  ../cups/string.h ../config.h ../cups/array.h ../cups/dir.h
+cups-driverd.64.o: cups-driverd.c  util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+cups-driverd.64.o: cups-driverd.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+cups-driverd.64.o: cups-driverd.c  ../cups/file.h ../cups/language.h ../cups/file.h
+cups-driverd.64.o: cups-driverd.c  ../cups/string.h ../config.h ../cups/dir.h
+cups-driverd.64.o: cups-driverd.c  ../cups/transcode.h
+cups-lpd.64.o: cups-lpd.c  ../cups/http-private.h ../config.h ../cups/http.h
+cups-lpd.64.o: cups-lpd.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+cups-lpd.64.o: cups-lpd.c  ../cups/ipp.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+cups-lpd.64.o: cups-lpd.c  ../cups/file.h ../cups/language.h ../cups/string.h
+cups-lpd.64.o: cups-lpd.c  ../cups/language.h
+cups-polld.64.o: cups-polld.c  ../cups/http-private.h ../config.h ../cups/http.h
+cups-polld.64.o: cups-polld.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
+cups-polld.64.o: cups-polld.c  ../cups/ipp.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
+cups-polld.64.o: cups-polld.c  ../cups/file.h ../cups/language.h ../cups/language.h
+cups-polld.64.o: cups-polld.c  ../cups/string.h
+testdirsvc.64.o: testdirsvc.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h
+testdirsvc.64.o: testdirsvc.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+testdirsvc.64.o: testdirsvc.c  ../cups/file.h ../cups/language.h ../cups/string.h ../config.h
+testlpd.64.o: testlpd.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+testlpd.64.o: testlpd.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testlpd.64.o: testlpd.c  ../cups/string.h ../config.h
+testmime.64.o: testmime.c  ../cups/string.h ../config.h mime.h ../cups/array.h
+testmime.64.o: testmime.c  ../cups/versioning.h ../cups/ipp.h ../cups/file.h ../cups/dir.h
+testspeed.64.o: testspeed.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+testspeed.64.o: testspeed.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testspeed.64.o: testspeed.c  ../cups/language.h ../cups/debug.h
+testsub.64.o: testsub.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/versioning.h
+testsub.64.o: testsub.c  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+testsub.64.o: testsub.c  ../cups/debug.h ../cups/string.h ../config.h
+util.64.o: util.c  util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+util.64.o: util.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+util.64.o: util.c  ../cups/language.h ../cups/file.h ../cups/string.h ../config.h
diff --git a/scheduler/Makefile b/scheduler/Makefile
index 47e1bd146..faea0b37d 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -3,7 +3,7 @@
 #
 #   Scheduler Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -40,13 +40,17 @@ CUPSDOBJS =	\
 		statbuf.o \
 		subscriptions.o \
 		sysman.o
-MIMEOBJS =	\
+LIBOBJS =	\
 		filter.o \
 		mime.o \
 		type.o
+LIB32OBJS	= $(LIBOBJS:.o=.32.o)
+LIB64OBJS	= $(LIBOBJS:.o=.64.o)
 OBJS	=	\
 		$(CUPSDOBJS) \
-		$(MIMEOBJS) \
+		$(LIBOBJS) \
+		$(LIB32OBJS) \
+		$(LIB64OBJS) \
 		cupsfilter.o \
 		cups-deviced.o \
 		cups-driverd.o \
@@ -65,7 +69,10 @@ TARGETS	=	\
 		cups-driverd \
 		cups-lpd \
 		cups-polld \
-		libmime.a \
+		$(LIBCUPSMIME) \
+		$(LIB32CUPSMIME) \
+		$(LIB64CUPSMIME) \
+		libcupsmime.a \
 		testdirsvc \
 		testlpd \
 		testmime \
@@ -87,6 +94,8 @@ all:		$(TARGETS)
 clean:
 	$(RM) $(OBJS)
 	$(RM) $(TARGETS) convert
+	$(RM) libcupsmime.so libcupsmime.sl libcupsmime.dylib
+	$(RM) -r 32bit 64bit
 
 
 #
@@ -94,29 +103,27 @@ clean:
 #
 
 depend:
-	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
+	touch Dependencies.tmp
+	makedepend -Y -I.. -fDependencies.tmp $(OBJS:.o=.c) >/dev/null 2>&1
+	$(RM) Dependencies
+	cp Dependencies.tmp Dependencies
+	sed -E -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' Dependencies.tmp >>Dependencies
+	sed -E -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies
+	$(RM) Dependencies.tmp
 
 
 #
-# Install the scheduler...
+# Install all targets...
 #
 
-install:	all
-	echo Creating $(SBINDIR)...
-	$(INSTALL_DIR) -m 755 $(SBINDIR)
-	echo Installing cupsd in $(SBINDIR)...
-	$(INSTALL_BIN) cupsd $(SBINDIR)
-	echo Installing cupsfilter in $(SBINDIR)...
-	$(INSTALL_BIN) cupsfilter $(SBINDIR)
-	echo Creating $(SERVERBIN)...
-	$(INSTALL_DIR) -m 755 $(SERVERBIN)
-	echo Creating $(SERVERBIN)/daemon...
-	$(INSTALL_DIR) -m 755 $(SERVERBIN)/daemon
-	echo Installing cups-deviced, cups-driverd, cups-lpd, and cups-polld in $(SERVERBIN)/daemon...
-	$(INSTALL_BIN) cups-deviced $(SERVERBIN)/daemon
-	$(INSTALL_BIN) cups-driverd $(SERVERBIN)/daemon
-	$(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
-	$(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
 	echo Creating $(SERVERBIN)/driver...
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
 	echo Creating $(SERVERROOT)...
@@ -128,10 +135,7 @@ install:	all
 	echo Creating $(SERVERROOT)/ppd...
 	$(INSTALL_DIR) -m 755 $(SERVERROOT)/ppd
 	-chgrp $(CUPS_GROUP) $(SERVERROOT)/ppd
-	-if test "x`uname`" = xDarwin; then \
-		$(INSTALL_DIR) $(BUILDROOT)/System/Library/Printers/Libraries; \
-		$(LN) $(sbindir)/cupsfilter $(BUILDROOT)/System/Library/Printers/Libraries/convert; \
-	else \
+	-if test "x`uname`" != xDarwin; then \
 		echo Creating $(SERVERROOT)/ssl...; \
 		$(INSTALL_DIR) -m 700 $(SERVERROOT)/ssl; \
 		chgrp $(CUPS_GROUP) $(SERVERROOT)/ssl || true; \
@@ -155,6 +159,28 @@ install:	all
 #	echo Creating $(CACHEDIR)/ppd...
 #	$(INSTALL_DIR) -m 755 $(CACHEDIR)/ppd
 #	-chgrp $(CUPS_GROUP) $(CACHEDIR)/ppd
+
+
+#
+# Install programs...
+#
+
+install-exec:
+	echo Installing programs in $(SBINDIR)...
+	$(INSTALL_DIR) -m 755 $(SBINDIR)
+	$(INSTALL_BIN) cupsd $(SBINDIR)
+	$(INSTALL_BIN) cupsfilter $(SBINDIR)
+	-if test "x`uname`" = xDarwin; then \
+		$(INSTALL_DIR) $(BUILDROOT)/System/Library/Printers/Libraries; \
+		$(LN) $(sbindir)/cupsfilter $(BUILDROOT)/System/Library/Printers/Libraries/convert; \
+	fi
+	echo Installing programs in $(SERVERBIN)/daemon...
+	$(INSTALL_DIR) -m 755 $(SERVERBIN)
+	$(INSTALL_DIR) -m 755 $(SERVERBIN)/daemon
+	$(INSTALL_BIN) cups-deviced $(SERVERBIN)/daemon
+	$(INSTALL_BIN) cups-driverd $(SERVERBIN)/daemon
+	$(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
+	$(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
 		for file in $(TARGETS); do \
@@ -164,10 +190,60 @@ install:	all
 
 
 #
+# Install headers...
+#
+
+install-headers:
+	echo Installing header files in $(INCLUDEDIR)/cups...
+	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
+	$(INSTALL_DATA) mime.h $(INCLUDEDIR)/cups
+
+
+#
+# Install libraries...
+#
+
+install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+	echo Installing libraries in $(LIBDIR)...
+	$(INSTALL_DIR) -m 755 $(LIBDIR)
+	$(INSTALL_LIB) $(LIBCUPSMIME) $(LIBDIR)
+	if test $(LIBCUPSMIME) = "libcupsmime.so.1" -o $(LIBCUPSMIME) = "libcupsmime.sl.1"; then \
+		$(RM) $(LIBDIR)/`basename $(LIBCUPSMIME) .1`; \
+		$(LN) $(LIBCUPSMIME) $(LIBDIR)/`basename $(LIBCUPSMIME) .1`; \
+	fi
+	if test $(LIBCUPSMIME) = "libcupsmime.1.dylib"; then \
+		$(STRIP) -x $(LIBDIR)/$(LIBCUPSMIME); \
+		$(RM) $(LIBDIR)/libcupsmime.dylib; \
+		$(LN) $(LIBCUPSMIME) $(LIBDIR)/libcupsmime.dylib; \
+	fi
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		cp $(LIBCUPSMIME) $(SYMROOT); \
+	fi
+
+installstatic:
+	$(INSTALL_DIR) -m 755 $(LIBDIR)
+	$(INSTALL_LIB) libcupsmime.a $(LIBDIR)
+	$(RANLIB) $(LIBDIR)/libcupsmime.a
+
+install32bit:
+	echo Installing libraries in $(LIB32DIR)...
+	$(INSTALL_DIR) -m 755 $(LIB32DIR)
+	$(INSTALL_LIB) 32bit/libcupsmime.so.1 $(LIB32DIR)/libcupsmime.so.1
+	$(LN) libcupsmime.so.1 $(LIB32DIR)/libcupsmime.so
+
+install64bit:
+	echo Installing libraries in $(LIB64DIR)...
+	$(INSTALL_DIR) -m 755 $(LIB64DIR)
+	$(INSTALL_LIB) 64bit/libcupsmime.so.1 $(LIB64DIR)/libcupsmime.so.1
+	$(LN) libcupsmime.so.1 $(LIB64DIR)/libcupsmime.so
+
+
+#
 # Uninstall the scheduler...
 #
 
-uninstall:	all
+uninstall: $(UNINSTALL32) $(UNINSTALL64)
 	$(RM) $(SBINDIR)/cupsd
 	$(RM) $(SBINDIR)/cupsfilter
 	$(RM) $(SERVERBIN)/daemon/cups-deviced
@@ -188,22 +264,63 @@ uninstall:	all
 	-$(RMDIR) $(REQUESTS)
 	-$(RMDIR) $(LOGDIR)
 	-$(RMDIR) $(CACHEDIR)
+	$(RM) $(LIBDIR)/libcupsmime.1.dylib
+	$(RM) $(LIBDIR)/libcupsmime.a
+	$(RM) $(LIBDIR)/libcupsmime.dylib
+	$(RM) $(LIBDIR)/libcupsmime_s.a
+	$(RM) $(LIBDIR)/libcupsmime.sl
+	$(RM) $(LIBDIR)/libcupsmime.sl.1
+	$(RM) $(LIBDIR)/libcupsmime.so
+	$(RM) $(LIBDIR)/libcupsmime.so.1
+	-$(RMDIR) $(LIBDIR)
+	$(RM) $(INCLUDEDIR)/cups/mime.h
+	-$(RMDIR) $(INCLUDEDIR)/cups
+
+uninstall32bit:
+	$(RM) $(LIB32DIR)/libcupsmime.so
+	$(RM) $(LIB32DIR)/libcupsmime.so.1
+	-$(RMDIR) $(LIB32DIR)
+
+uninstall64bit:
+	$(RM) $(LIB64DIR)/libcupsmime.so
+	$(RM) $(LIB64DIR)/libcupsmime.so.1
+	-$(RMDIR) $(LIB64DIR)
+
+
+#
+# Automatic API help files...
+#
+
+apihelp:
+	mxmldoc --section "Programming" \
+		--title "MIME API" \
+		--css ../doc/cups-printable.css \
+		--header api-mime.header --intro api-mime.shtml \
+		mime.h $(LIBOBJS:.o=.c) >../doc/help/api-mime.html
+
+framedhelp:
+	mxmldoc --framed api-mime \
+		--section "Programming" \
+		--title "MIME API" \
+		--css ../doc/cups-printable.css \
+		--header api-mime.header --intro api-mime.shtml \
+		mime.h $(LIBOBJS:.o=.c)
 
 
 #
 # Make the scheduler executable, "cupsd".
 #
 
-cupsd:	$(CUPSDOBJS) libmime.a ../cups/$(LIBCUPS)
+cupsd:	$(CUPSDOBJS) $(LIBCUPSMIME) ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) libmime.a \
+	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
 		$(LIBPAPER) $(LIBMALLOC) $(CUPSDLIBS) $(DNSSDLIBS) $(LIBS) \
 		$(LIBGSSAPI)
 
-cupsd-static:	$(CUPSDOBJS) libmime.a ../cups/libcups.a
+cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o cupsd-static $(CUPSDOBJS) libmime.a \
+	$(CC) $(LDFLAGS) -o cupsd-static $(CUPSDOBJS) libcupsmime.a \
 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
 		../cups/libcups.a $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
 		$(LIBMALLOC) $(CUPSDLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
@@ -213,9 +330,9 @@ cupsd-static:	$(CUPSDOBJS) libmime.a ../cups/libcups.a
 # Make the cupsfilter utility.
 #
 
-cupsfilter:	cupsfilter.o libmime.a ../cups/$(LIBCUPS)
+cupsfilter:	cupsfilter.o $(LIBCUPSMIME) ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o cupsfilter cupsfilter.o libmime.a $(LIBS)
+	$(CC) $(LDFLAGS) -o cupsfilter cupsfilter.o -L. -lcupsmime $(LIBS)
 	$(RM) convert
 	$(LN) cupsfilter convert
 
@@ -257,13 +374,85 @@ cups-polld:	cups-polld.o ../cups/$(LIBCUPS)
 
 
 #
-# libmime.a
+# libcupsmime.so.1, libcupsmime.sl.1
+#
+
+libcupsmime.so.1 libcupsmime.sl.1:	$(LIBOBJS)
+	echo Linking $@...
+	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
+	$(RM) `basename $@ .1`
+	$(LN) $@ `basename $@ .1`
+
+
+#
+# 32bit/libcupsmime.so.1
+#
+
+32bit/libcupsmime.so.1:	$(LIB32OBJS)
+	echo Linking 32-bit $@...
+	-mkdir 32bit
+	$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(LIBS)
+	$(RM) 32bit/libcupsmime.so
+	$(LN) libcupsmime.so.1 32bit/libcupsmime.so
+
+
+#
+# 64bit/libcupsmime.so.1
+#
+
+64bit/libcupsmime.so.1:	$(LIB64OBJS)
+	echo Linking 64-bit $@...
+	-mkdir 64bit
+	$(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(LIBS)
+	$(RM) 64bit/libcupsmime.so
+	$(LN) libcupsmime.so.1 64bit/libcupsmime.so
+
+
+#
+# libcupsmime.1.dylib
+#
+
+libcupsmime.1.dylib:	$(LIBOBJS) libcupsmime.exp
+	echo Linking $@...
+	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
+		-install_name $(libdir)/$@ \
+		-current_version 1.0.0 \
+		-compatibility_version 1.0.0 \
+		-exported_symbols_list libcupsmime.exp \
+		$(LIBOBJS) $(LIBS)
+	$(RM) libcupsmime.dylib
+	$(LN) $@ libcupsmime.dylib
+
+
+#
+# libcupsmime_s.a
+#
+
+libcupsmime_s.a:	$(LIBOBJS)
+	echo Creating $@...
+	$(DSO) $(DSOFLAGS) -o libcupsmime_s.o $(LIBOBJS) $(LIBS)
+	$(RM) $@
+	$(AR) $(ARFLAGS) $@ libcupsmime_s.o
+
+
+#
+# libcupsmime.la
+#
+
+libcupsmime.la:    $(LIBOBJS)
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+		-version-info 1:0 $(LIBS)
+
+
+#
+# libcupsmime.a
 #
 
-libmime.a:	$(MIMEOBJS)
+libcupsmime.a:	$(LIBOBJS)
 	echo Archiving $@...
 	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $(MIMEOBJS)
+	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
 	$(RANLIB) $@
 
 
@@ -290,9 +479,9 @@ testlpd:	testlpd.o ../cups/libcups.a cups-lpd
 # testmime
 #
 
-testmime:	testmime.o libmime.a ../cups/libcups.a
+testmime:	testmime.o libcupsmime.a ../cups/libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testmime.o libmime.a ../cups/libcups.a \
+	$(CC) $(LDFLAGS) -o $@ testmime.o libcupsmime.a ../cups/libcups.a \
 		$(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(LIBGSSAPI)
 
 
diff --git a/scheduler/libcupsmime.exp b/scheduler/libcupsmime.exp
new file mode 100644
index 000000000..bf2fa4c02
--- /dev/null
+++ b/scheduler/libcupsmime.exp
@@ -0,0 +1,19 @@
+_mimeAddFilter
+_mimeAddType
+_mimeAddTypeRule
+_mimeDelete
+_mimeDeleteFilter
+_mimeDeleteType
+_mimeFileType
+_mimeFilter
+_mimeFilterLookup
+_mimeFirstFilter
+_mimeFirstType
+_mimeLoad
+_mimeMerge
+_mimeNew
+_mimeNextFilter
+_mimeNextType
+_mimeNumFilters
+_mimeNumTypes
+_mimeType
diff --git a/scheduler/main.c b/scheduler/main.c
index 613b593fb..8ecd4309e 100644
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -133,7 +133,8 @@ main(int  argc,				/* I - Number of command-line args */
 			browse_time,	/* Next browse send time */
 			senddoc_time,	/* Send-Document time */
 			expire_time,	/* Subscription expire time */
-			report_time;	/* Malloc/client/job report time */
+			report_time,	/* Malloc/client/job report time */
+			event_time;	/* Last time an event notification was done */
   long			timeout;	/* Timeout for cupsdDoSelect() */
   struct rlimit		limit;		/* Runtime limit */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
@@ -663,11 +664,13 @@ main(int  argc,				/* I - Number of command-line args */
   * Loop forever...
   */
 
-  browse_time   = time(NULL);
-  expire_time   = time(NULL);
+  current_time  = time(NULL);
+  browse_time   = current_time;
+  event_time    = current_time;
+  expire_time   = current_time;
   fds           = 1;
   report_time   = 0;
-  senddoc_time  = time(NULL);
+  senddoc_time  = current_time;
 
   while (!stop_scheduler)
   {
@@ -771,7 +774,8 @@ main(int  argc,				/* I - Number of command-line args */
     * times.
     */
 
-    timeout = select_timeout(fds);
+    if ((timeout = select_timeout(fds)) > 1 && LastEvent)
+      timeout = 1;
 
 #if HAVE_LAUNCHD
    /*
@@ -1044,7 +1048,7 @@ main(int  argc,				/* I - Number of command-line args */
     * accumulated.  Don't send these more than once a second...
     */
 
-    if (LastEvent)
+    if (LastEvent && (current_time - event_time) >= 1)
     {
 #ifdef HAVE_NOTIFY_POST
       if (LastEvent & (CUPSD_EVENT_PRINTER_ADDED |
@@ -1077,7 +1081,8 @@ main(int  argc,				/* I - Number of command-line args */
       * Reset the accumulated events...
       */
 
-      LastEvent = CUPSD_EVENT_NONE;
+      LastEvent  = CUPSD_EVENT_NONE;
+      event_time = current_time;
     }
   }
 
diff --git a/scripting/php/Makefile b/scripting/php/Makefile
index 8451dfd03..bc07028fe 100644
--- a/scripting/php/Makefile
+++ b/scripting/php/Makefile
@@ -3,7 +3,7 @@
 #
 #   PHP Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -62,10 +62,24 @@ depend:
 
 
 #
-# Install object and target files...
+# Install all targets...
 #
 
-install:	all
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
 	echo Installing $(PHPCUPS) in $(PHPDIR)
 	$(INSTALL_DIR) $(PHPDIR)
 	$(INSTALL_BIN) $(PHPCUPS) $(PHPDIR)
@@ -76,6 +90,20 @@ install:	all
 
 
 #
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
 # Uninstall object and target files...
 #
 
diff --git a/standards/Makefile b/standards/Makefile
index 4bde645b2..74d87853e 100644
--- a/standards/Makefile
+++ b/standards/Makefile
@@ -3,7 +3,7 @@
 #
 #   Standards makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -85,10 +85,38 @@ depend:
 
 
 #
-# Install files...
+# Install all targets...
 #
 
-install:	all
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
 
 
 #
diff --git a/systemv/Dependencies b/systemv/Dependencies
index 263d3e753..7e2c8c5d6 100644
--- a/systemv/Dependencies
+++ b/systemv/Dependencies
@@ -23,7 +23,8 @@ cupstestdsc.o: ../cups/file.h ../cups/i18n.h ../cups/transcode.h
 cupstestppd.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
 cupstestppd.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h
 cupstestppd.o: ../cups/array.h ../cups/file.h ../cups/language.h
-cupstestppd.o: ../cups/i18n.h ../cups/transcode.h ../cups/raster.h
+cupstestppd.o: ../cups/ppd-private.h ../cups/i18n.h ../cups/transcode.h
+cupstestppd.o: ../cups/raster.h
 lp.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
 lp.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 lp.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h
diff --git a/systemv/Makefile b/systemv/Makefile
index f73d80fcd..ee9290bb9 100644
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -49,7 +49,21 @@ depend:
 # Install all targets...
 #
 
-install:	all
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
 	$(INSTALL_DIR) -m 755 $(SBINDIR)
 	$(INSTALL_BIN) accept $(SBINDIR)
 	$(RM) $(SBINDIR)/reject
@@ -80,6 +94,20 @@ install:	all
 
 
 #
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
+#
 # Uninstall all targets...
 #
 
diff --git a/templates/Makefile b/templates/Makefile
index f123241ea..ea2c1084f 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -3,7 +3,7 @@
 #
 #   Template makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1993-2007 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -111,10 +111,17 @@ depend:
 
 
 #
-# Install files...
+# Install all targets...
 #
 
-install: all $(INSTALL_LANGUAGES)
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data: $(INSTALL_LANGUAGES)
 	$(INSTALL_DIR) -m 755 $(DATADIR)/templates
 	for file in $(FILES); do \
 		$(INSTALL_DATA) $$file $(DATADIR)/templates; \
@@ -131,6 +138,28 @@ install-languages:
 	done
 
 
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
 #
 # Uninstall files...
 #
diff --git a/test/Makefile b/test/Makefile
index 45be7df87..49fabb3de 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,7 +3,7 @@
 #
 #   IPP test makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -43,7 +43,35 @@ depend:
 # Install all targets...
 #
 
-install: all
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
 
 
 #
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 20b426067..ba5184cff 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -238,7 +238,7 @@ ln -s $root/filter/pstops /tmp/cups-$user/bin/filter
 ln -s $root/filter/rastertoepson /tmp/cups-$user/bin/filter
 ln -s $root/filter/rastertohp /tmp/cups-$user/bin/filter
 ln -s $root/filter/texttops /tmp/cups-$user/bin/filter
-ln -s $root/pdftops/pdftops /tmp/cups-$user/bin/filter
+ln -s $root/filter/pdftops /tmp/cups-$user/bin/filter
 
 ln -s $root/data/classified /tmp/cups-$user/share/banners
 ln -s $root/data/confidential /tmp/cups-$user/share/banners
@@ -374,28 +374,28 @@ cp $root/conf/mime.convs /tmp/cups-$user/mime.convs
 echo "Setting up environment variables for test..."
 
 if test "x$LD_LIBRARY_PATH" = x; then
-	LD_LIBRARY_PATH="$root/cups:$root/filter"
+	LD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/driver:$root/ppdc"
 else
-	LD_LIBRARY_PATH="$root/cups:$root/filter:$LD_LIBRARY_PATH"
+	LD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/driver:$root/ppdc:$LD_LIBRARY_PATH"
 fi
 
 export LD_LIBRARY_PATH
 
-LD_PRELOAD="$root/cups/libcups.so.2:$root/filter/libcupsimage.so.2"
+LD_PRELOAD="$root/cups/libcups.so.2:$root/filter/libcupsimage.so.2:$root/cgi-bin/libcupscgi.so.1:$root/scheduler/libcupsmime.so.1:$root/driver/libcupsdriver.so.1:$root/ppdc/libcupsppdc.so.1"
 export LD_PRELOAD
 
 if test "x$DYLD_LIBRARY_PATH" = x; then
-	DYLD_LIBRARY_PATH="$root/cups:$root/filter"
+	DYLD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/driver:$root/ppdc"
 else
-	DYLD_LIBRARY_PATH="$root/cups:$root/filter:$DYLD_LIBRARY_PATH"
+	DYLD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/driver:$root/ppdc:$DYLD_LIBRARY_PATH"
 fi
 
 export DYLD_LIBRARY_PATH
 
 if test "x$SHLIB_PATH" = x; then
-	SHLIB_PATH="$root/cups:$root/filter"
+	SHLIB_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/driver:$root/ppdc"
 else
-	SHLIB_PATH="$root/cups:$root/filter:$SHLIB_PATH"
+	SHLIB_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/driver:$root/ppdc:$SHLIB_PATH"
 fi
 
 export SHLIB_PATH
@@ -469,7 +469,7 @@ done
 # Create the test report source file...
 #
 
-strfile=cups-str-1.3-`date +%Y-%m-%d`-$user.html
+strfile=cups-str-1.4-`date +%Y-%m-%d`-$user.html
 
 rm -f $strfile
 cat str-header.html >$strfile
diff --git a/tools/testosx b/tools/testosx
index 36ee26612..13bf53da1 100755
--- a/tools/testosx
+++ b/tools/testosx
@@ -134,4 +134,4 @@ hdiutil create -ov -srcfolder cups.pkg cups-$version.dmg
 
 # Cleanup temp files...
 echo Removing temporary files...
-rm -rf $pkgdir
+#rm -rf $pkgdir