Merge changes from CUPS 1.4svn-r8606.

[thirdparty/cups.git] / filter / Makefile

diff --git a/filter/Makefile b/filter/Makefile
index d77e7cb0316565c1e0cb7bcff021af236f15119c..2bb7a7f5277af1efda57ec4d0b23efe3d2673995 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -3,7 +3,7 @@
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007-2009 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -221,8 +221,11 @@ apihelp:
        mxmldoc --section "Programming" --title "Raster API" \
                --css ../doc/cups-printable.css \
                --header api-raster.header --intro api-raster.shtml \
+               api-raster.xml \
                ../cups/raster.h interpret.c raster.c \
                >../doc/help/api-raster.html
+       mxmldoc --tokens help/api-raster.html api-raster.xml >../doc/help/api-raster.tokens
+       $(RM) api-raster.xml
        mxmldoc --section "Programming" \
                --title "Developing PostScript Printer Drivers" \
                --css ../doc/cups-printable.css \
@@ -268,25 +271,6 @@ framedhelp:
                --header raster-driver.header \
                --intro raster-driver.shtml
 
-docsets:
-       echo Generating CUPS API documentation sets...
-       ../tools/makedocset --docset org.cups.raster.docset \
-               --title "Raster API" \
-               --header api-raster.header --intro api-raster.shtml \
-               ../cups/raster.h interpret.c raster.c
-       ../tools/makedocset --docset org.cups.postscript-driver.docset \
-               --title "Developing PostScript Printer Drivers" \
-               --header postscript-driver.header \
-               --intro postscript-driver.shtml
-       ../tools/makedocset --docset org.cups.ppd-compiler.docset \
-               --title "Introduction to the PPD Compiler" \
-               --header ppd-compiler.header \
-               --intro ppd-compiler.shtml
-       ../tools/makedocset --docset org.cups.raster-driver.docset \
-               --title "Developing Raster Printer Drivers" \
-               --header raster-driver.header \
-               --intro raster-driver.shtml
-
 
 #
 # bannertops
@@ -503,7 +487,7 @@ testraster: testraster.o ../cups/libcups.a libcupsimage.a
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \
                ../cups/libcups.a $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
-               $(SSLLIBS) $(LIBGSSAPI)
+               $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
        echo Running raster API tests...
        ./testraster