Merge changes from CUPS 1.4svn-r8606.

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

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 0e35492b0163e481102a2d166a16c81d9c3c0acf..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
@@ -22,16 +22,13 @@ LIBOBJS     =       \
                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 \
+               makedocset.o \
                printers.o \
                testcgi.o \
                testhi.o \
@@ -46,8 +43,6 @@ CGIS  =       \
 LIBTARGETS =   \
                libcupscgi.a \
                $(LIBCUPSCGI) \
-               $(LIB32CUPSCGI) \
-               $(LIB32CUPSCGI) \
                websearch
 
 UNITTARGETS =  \
@@ -86,9 +81,8 @@ unittests:    $(UNITTARGETS)
 #
 
 clean:
-       $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
+       $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset
        $(RM) libcupscgi.so libcupscgi.sl libcupscgi.dylib
-       $(RM) -r 32bit 64bit
 
 
 #
@@ -96,13 +90,7 @@ clean:
 #
 
 depend:
-       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
+       makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
 
 
 #
@@ -151,7 +139,7 @@ install-headers:
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+install-libs: $(INSTALLSTATIC)
        echo Installing libraries in $(LIBDIR)...
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR)
@@ -173,24 +161,12 @@ installstatic:
        $(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: $(UNINSTALL32) $(UNINSTALL64)
+uninstall:
        for file in $(CGIS); do \
                $(RM) $(SERVERBIN)/cgi-bin/$$file; \
        done
@@ -208,16 +184,6 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
        $(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...
@@ -229,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 \
@@ -250,30 +218,6 @@ libcupscgi.so.1 libcupscgi.sl.1:   $(LIBOBJS)
        $(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
 #
@@ -358,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
 #
@@ -374,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
 
@@ -386,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
 
@@ -398,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)
 
 
 #
@@ -408,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)
 
 
 #