Merge changes from CUPS 1.4svn-r8252.

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

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 9a49370f696c1486768b1d4f628d0c62957cdc18..3e1a59aaab9d8e2cc44bae316d272511ec78f10a 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
+# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
 #
 #   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,12 +22,8 @@ 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 \
@@ -35,23 +31,28 @@ OBJS        =       \
                printers.o \
                testcgi.o \
                testhi.o \
-               testtemplate.o
+               testtemplate.o \
+               websearch.o
 CGIS   =       \
                admin.cgi \
                classes.cgi \
                help.cgi \
                jobs.cgi \
                printers.cgi
-TARGETS        =       \
+LIBTARGETS =   \
                libcupscgi.a \
                $(LIBCUPSCGI) \
-               $(LIB32CUPSCGI) \
-               $(LIB32CUPSCGI) \
-               $(CGIS) \
+               websearch
+
+UNITTARGETS =  \
                testcgi \
                testhi \
                testtemplate
 
+TARGETS        =       \
+               $(LIBTARGETS) \
+               $(CGIS)
+
 
 #
 # Make all targets...
@@ -60,14 +61,27 @@ TARGETS     =       \
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:          $(LIBTARGETS) $(UNITTESTS)
+
+
+#
+# Make unit tests...
+#
+
+unittests:     $(UNITTARGETS)
+
+
 #
 # Clean all object files...
 #
 
 clean:
-       $(RM) $(OBJS) $(TARGETS)
+       $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
        $(RM) libcupscgi.so libcupscgi.sl libcupscgi.dylib
-       $(RM) -r 32bit 64bit
 
 
 #
@@ -75,13 +89,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
 
 
 #
@@ -130,7 +138,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)
@@ -152,24 +160,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
@@ -187,16 +183,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,30 +215,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
 #
@@ -307,7 +269,7 @@ libcupscgi.a:       $(LIBOBJS)
 
 admin.cgi:     admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ admin.o -L. -lcupscgi $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ admin.o -lcupscgi $(LIBS)
 
 
 #
@@ -316,7 +278,7 @@ admin.cgi:  admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 
 classes.cgi:   classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ classes.o -L. -lcupscgi $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ classes.o -lcupscgi $(LIBS)
 
 
 #
@@ -325,7 +287,7 @@ classes.cgi:        classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 
 help.cgi:      help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ help.o -L. -lcupscgi $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ help.o -lcupscgi $(LIBS)
 
 
 #
@@ -334,7 +296,7 @@ help.cgi:   help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 
 jobs.cgi:      jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ jobs.o -L. -lcupscgi $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ jobs.o -lcupscgi $(LIBS)
 
 
 #
@@ -352,8 +314,11 @@ printers.cgi:      printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 
 testcgi:       testcgi.o ../Makedefs libcupscgi.a ../cups/libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a ../cups/libcups.a \
-               $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
+               ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+               $(LIBZ) $(LIBGSSAPI)
+       echo Testing CGI API...
+       ./testcgi
 
 
 #
@@ -362,8 +327,11 @@ testcgi:   testcgi.o ../Makedefs libcupscgi.a ../cups/libcups.a
 
 testhi:        testhi.o ../Makedefs libcupscgi.a ../cups/libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testhi.o libcupscgi.a ../cups/libcups.a \
-               $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
+               ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+               $(LIBZ) $(LIBGSSAPI)
+       echo Testing help index API...
+       ./testhi
 
 
 #
@@ -373,7 +341,18 @@ 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)
+
+
+#
+# websearch
+#
+
+websearch:     websearch.o ../Makedefs libcupscgi.a ../cups/libcups.a
+       echo Linking $@...
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ websearch.o libcupscgi.a \
+               ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+               $(LIBZ) $(LIBGSSAPI)
 
 
 #
@@ -384,5 +363,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
 #