Merge changes from CUPS 1.4svn-r7874.

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

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 53911d8450822ff7f45dfced7ecf706d701cbf34..0d538c0d7999a3be89519df18eddb542acfe0854 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -35,7 +35,8 @@ OBJS  =       \
                printers.o \
                testcgi.o \
                testhi.o \
-               testtemplate.o
+               testtemplate.o \
+               websearch.o
 CGIS   =       \
                admin.cgi \
                classes.cgi \
@@ -47,13 +48,16 @@ LIBTARGETS =        \
                $(LIBCUPSCGI) \
                $(LIB32CUPSCGI) \
                $(LIB32CUPSCGI) \
+               websearch
+
+UNITTARGETS =  \
                testcgi \
-               testhi
+               testhi \
+               testtemplate
 
 TARGETS        =       \
                $(LIBTARGETS) \
-               $(CGIS) \
-               testtemplate
+               $(CGIS)
 
 
 #
@@ -67,7 +71,14 @@ all: $(TARGETS)
 # Make library targets...
 #
 
-libs:          $(LIBTARGETS)
+libs:          $(LIBTARGETS) $(UNITTESTS)
+
+
+#
+# Make unit tests...
+#
+
+unittests:     $(UNITTARGETS)
 
 
 #
@@ -75,7 +86,7 @@ libs:         $(LIBTARGETS)
 #
 
 clean:
-       $(RM) $(OBJS) $(TARGETS)
+       $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
        $(RM) libcupscgi.so libcupscgi.sl libcupscgi.dylib
        $(RM) -r 32bit 64bit
 
@@ -390,6 +401,16 @@ testtemplate:      testtemplate.o ../Makedefs libcupscgi.a ../cups/libcups.a
                $(COMMONLIBS) $(SSLLIBS) $(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) $(LIBZ) $(LIBGSSAPI)
+
+
 #
 # Dependencies...
 #