Merge changes from CUPS 1.4svn-r7961.

[thirdparty/cups.git] / cups / Makefile

diff --git a/cups/Makefile b/cups/Makefile
index 6d4a684813d42f14ec1a08122756308900b7d3a0..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).
 #
@@ -28,6 +28,7 @@ LIBOBJS       =       \
                auth.o \
                backchannel.o \
                backend.o \
+               conflicts.o \
                custom.o \
                debug.o \
                dest.o \
@@ -72,6 +73,7 @@ OBJS  =       \
                $(LIB64OBJS) \
                testadmin.o \
                testarray.o \
+               testconflicts.o \
                testcups.o \
                testfile.o \
                testhttp.o \
@@ -113,21 +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 \
-               testcups \
-               testsnmp
+               $(LIBTARGETS)
 
 
 #
@@ -144,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
 
@@ -400,6 +412,16 @@ testarray: testarray.o libcups.a
        ./testarray
 
 
+#
+# testconflicts (dependency on static CUPS library is intentional)
+#
+
+testconflicts: testconflicts.o libcups.a
+       echo Linking $@...
+       $(CC) $(LDFLAGS) -o $@ testconflicts.o libcups.a \
+               $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+
+
 #
 # testcups (dependency on static CUPS library is intentional)
 #
@@ -532,7 +554,7 @@ apihelp:
        mxmldoc --section "Programming" --title "PPD API" \
                --css ../doc/cups-printable.css \
                --header api-ppd.header --intro api-ppd.shtml \
-               ppd.h attr.c custom.c emit.c localize.c mark.c page.c \
+               ppd.h attr.c conflicts.c custom.c emit.c localize.c mark.c page.c \
                ppd.c >../doc/help/api-ppd.html
        mxmldoc --section "Programming" --title "HTTP and IPP APIs" \
                --css ../doc/cups-printable.css \
@@ -575,8 +597,8 @@ framedhelp:
                --section "Programming" --title "PPD API" \
                --css ../doc/cups-printable.css \
                --header api-ppd.header --intro api-ppd.shtml \
-               ppd.h attr.c custom.c emit.c localize.c mark.c page.c \
-               ppd.c
+               ppd.h attr.c conflicts.c custom.c emit.c localize.c mark.c \
+               page.c ppd.c
        mxmldoc --framed api-httpipp \
                --section "Programming" --title "HTTP and IPP APIs" \
                --css ../doc/cups-printable.css \
@@ -600,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 $".
 #