Merge changes from CUPS 1.4svn-r7696.

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

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 4122d37ee46ae6b85d6c9a682e7efd379039aba4..53911d8450822ff7f45dfced7ecf706d701cbf34 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
+# "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $"
 #
 #   CGI makefile for the Common UNIX Printing System (CUPS).
 #
@@ -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...
 #
@@ -139,7 +149,6 @@ install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
                $(LN) $(LIBCUPSCGI) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
        fi
        if test $(LIBCUPSCGI) = "libcupscgi.1.dylib"; then \
-               $(STRIP) -x $(LIBDIR)/$(LIBCUPSCGI); \
                $(RM) $(LIBDIR)/libcupscgi.dylib; \
                $(LN) $(LIBCUPSCGI) $(LIBDIR)/libcupscgi.dylib; \
        fi
@@ -353,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
 
 
 #
@@ -363,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
 
 
 #
@@ -385,5 +398,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $".
 #