Merge changes from CUPS 1.4svn-r8606.

[thirdparty/cups.git] / cgi-bin / Makefile

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index b94cf0840476723d51face9c08dee33abb9acf88..b51b4c06c5efb55a90ddd8bc412178735f6208ca 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -3,7 +3,7 @@
 #
 #   CGI 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
@@ -28,6 +28,7 @@ OBJS  =       \
                classes.o \
                help.o \
                jobs.o \
+               makedocset.o \
                printers.o \
                testcgi.o \
                testhi.o \
@@ -80,7 +81,7 @@ unittests:    $(UNITTARGETS)
 #
 
 clean:
-       $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
+       $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset
        $(RM) libcupscgi.so libcupscgi.sl libcupscgi.dylib
 
 
@@ -194,6 +195,8 @@ apihelp:
                --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
+       mxmldoc --tokens help/api-cgi.html api-cgi.xml >../doc/help/api-cgi.tokens
+       $(RM) api-cgi.xml
 
 framedhelp:
        mxmldoc --framed api-cgi \
@@ -299,6 +302,17 @@ jobs.cgi:  jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        $(CC) $(LDFLAGS) -o $@ jobs.o -lcupscgi $(LIBS)
 
 
+#
+# makedocset
+#
+
+makedocset:    makedocset.o ../Makedefs libcupscgi.a ../cups/libcups.a
+       echo Linking $@...
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \
+               ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+               $(LIBZ) $(LIBGSSAPI)
+
+
 #
 # printers.cgi
 #
@@ -315,7 +329,8 @@ printers.cgi:       printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 testcgi:       testcgi.o ../Makedefs libcupscgi.a ../cups/libcups.a
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
-               ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
+               ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+               $(LIBZ) $(LIBGSSAPI)
        echo Testing CGI API...
        ./testcgi
 
@@ -327,7 +342,8 @@ testcgi:    testcgi.o ../Makedefs libcupscgi.a ../cups/libcups.a
 testhi:        testhi.o ../Makedefs libcupscgi.a ../cups/libcups.a
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
-               ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
+               ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+               $(LIBZ) $(LIBGSSAPI)
        echo Testing help index API...
        ./testhi
 
@@ -339,7 +355,7 @@ testhi:     testhi.o ../Makedefs libcupscgi.a ../cups/libcups.a
 testtemplate:  testtemplate.o ../Makedefs libcupscgi.a ../cups/libcups.a
        echo Linking $@...
        $(CC) $(LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/libcups.a \
-               $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
+               $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
 #
@@ -349,7 +365,8 @@ testtemplate:       testtemplate.o ../Makedefs libcupscgi.a ../cups/libcups.a
 websearch:     websearch.o ../Makedefs libcupscgi.a ../cups/libcups.a
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ websearch.o libcupscgi.a \
-               ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
+               ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+               $(LIBZ) $(LIBGSSAPI)
 
 
 #