Merge changes from CUPS 1.4svn-r7961.

[thirdparty/cups.git] / cups / Makefile

diff --git a/cups/Makefile b/cups/Makefile
index 584276a16872babff7d60170559af1a19ff10df2..3710985e5c6c8a43e15449004d3b8b8735b9d657 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7589 2008-05-19 00:13:23Z mike $"
+# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
 #
 #   API library Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -115,22 +115,24 @@ LIBTARGETS =      \
                $(LIBCUPS) \
                $(LIB32CUPS) \
                $(LIB64CUPS) \
-               libcups.a \
+               libcups.a
+
+UNITTARGETS =  \
+               testadmin \
                testarray \
+               testconflicts \
+               testcups \
                testfile \
                testhttp \
                testi18n \
                testipp \
                testlang \
                testoptions \
-               testppd
+               testppd \
+               testsnmp
 
 TARGETS        =       \
-               $(LIBTARGETS) \
-               testadmin \
-               testconflicts \
-               testcups \
-               testsnmp
+               $(LIBTARGETS)
 
 
 #
@@ -147,12 +149,19 @@ all:      $(TARGETS)
 libs:          $(LIBTARGETS)
 
 
+#
+# Make unit tests...
+#
+
+unittests:     $(UNITTARGETS)
+
+
 #
 # Remove object and target files...
 #
 
 clean:
-       $(RM) $(OBJS) $(TARGETS)
+       $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
        $(RM) libcups.so libcups.sl libcups.dylib
        $(RM) -r 32bit 64bit
 
@@ -613,5 +622,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7589 2008-05-19 00:13:23Z mike $".
+# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
 #