Merge changes from CUPS trunk, r7566.

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

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 9a49370f696c1486768b1d4f628d0c62957cdc18..d0c0c01555ff34818c7f7250cb9a44a88b10a0ef 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -42,14 +42,17 @@ CGIS        =       \
                help.cgi \
                jobs.cgi \
                printers.cgi
-TARGETS        =       \
+LIBTARGETS =   \
                libcupscgi.a \
                $(LIBCUPSCGI) \
                $(LIB32CUPSCGI) \
                $(LIB32CUPSCGI) \
-               $(CGIS) \
                testcgi \
-               testhi \
+               testhi
+
+TARGETS        =       \
+               $(LIBTARGETS) \
+               $(CGIS) \
                testtemplate
 
 
@@ -60,6 +63,13 @@ TARGETS      =       \
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:          $(LIBTARGETS)
+
+
 #
 # Clean all object files...
 #
@@ -352,8 +362,10 @@ 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) $(LIBZ) $(LIBGSSAPI)
+       echo Testing CGI API...
+       ./testcgi
 
 
 #
@@ -362,8 +374,10 @@ 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) $(LIBZ) $(LIBGSSAPI)
+       echo Testing help index API...
+       ./testhi
 
 
 #