Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / cups / Makefile

diff --git a/cups/Makefile b/cups/Makefile
index 3ea42068148f497a1d9da3e3696c1ab36b65b10e..752edd1a9adadb175dec225a346e582ff73248dd 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
+# "$Id: Makefile 7589 2008-05-19 00:13:23Z 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,11 +73,13 @@ OBJS        =       \
                $(LIB64OBJS) \
                testadmin.o \
                testarray.o \
+               testconflicts.o \
                testcups.o \
                testfile.o \
                testhttp.o \
                testi18n.o \
                testipp.o \
+               testoptions.o \
                testlang.o \
                testppd.o \
                testsnmp.o \
@@ -100,7 +103,6 @@ HEADERS     =       \
                ppd.h \
                raster.h \
                sidechannel.h \
-               snmp.h \
                transcode.h \
                versioning.h
 
@@ -109,22 +111,29 @@ HEADERS   =       \
 # Targets in this directory...
 #
 
-TARGETS        =       \
+LIBTARGETS =   \
                $(LIBCUPS) \
                $(LIB32CUPS) \
                $(LIB64CUPS) \
-               libcups.a \
+               libcups.a
+
+UNITTARGETS =  \
                testadmin \
                testarray \
+               testconflicts \
                testcups \
                testfile \
                testhttp \
                testi18n \
                testipp \
                testlang \
+               testoptions \
                testppd \
                testsnmp
 
+TARGETS        =       \
+               $(LIBTARGETS)
+
 
 #
 # Make all targets...
@@ -133,12 +142,26 @@ TARGETS   =       \
 all:   $(TARGETS)
 
 
+#
+# Make library 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
 
@@ -383,7 +406,19 @@ testadmin: testadmin.o libcups.a
 
 testarray:     testarray.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testarray.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testarray.o libcups.a \
+               $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running array API tests...
+       ./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)
 
 
@@ -403,8 +438,10 @@ testcups:  testcups.o libcups.a
 
 testfile:      testfile.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testfile.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testfile.o libcups.a \
                $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running file API tests...
+       ./testfile
 
 
 #
@@ -413,8 +450,10 @@ testfile:  testfile.o libcups.a
 
 testhttp:      testhttp.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhttp.o libcups.a \
                $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running HTTP API tests...
+       ./testhttp
 
 
 #
@@ -423,8 +462,10 @@ testhttp:  testhttp.o libcups.a
 
 testipp:       testipp.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testipp.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testipp.o libcups.a \
                $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running IPP API tests...
+       ./testipp
 
 
 #
@@ -433,8 +474,10 @@ testipp:   testipp.o libcups.a
 
 testi18n:      testi18n.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testi18n.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testi18n.o libcups.a \
                $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running internationalization API tests...
+       ./testi18n
 
 
 #
@@ -443,8 +486,22 @@ testi18n:  testi18n.o libcups.a
 
 testlang:      testlang.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testlang.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testlang.o libcups.a \
+               $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running language API tests...
+       ./testlang
+
+
+#
+# testoptions (dependency on static CUPS library is intentional)
+#
+
+testoptions:   testoptions.o libcups.a
+       echo Linking $@...
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testoptions.o libcups.a \
                $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running option API tests...
+       ./testoptions
 
 
 #
@@ -453,8 +510,10 @@ testlang:  testlang.o libcups.a
 
 testppd:       testppd.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testppd.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testppd.o libcups.a \
                $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running PPD API tests...
+       ./testppd
 
 
 #
@@ -495,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 \
@@ -508,7 +567,7 @@ apihelp:
                --css ../doc/cups-printable.css \
                --header api-filter.header --intro api-filter.shtml \
                backchannel.c backend.h backend.c sidechannel.c sidechannel.h \
-               snmp.c snmp.h >../doc/help/api-filter.html
+               >../doc/help/api-filter.html
 
 framedhelp:
        echo Generating CUPS API help files...
@@ -538,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 \
@@ -552,8 +611,7 @@ framedhelp:
                --title "Filter and Backend Programming" \
                --css ../doc/cups-printable.css \
                --header api-filter.header --intro api-filter.shtml \
-               backchannel.c backend.h backend.c sidechannel.c sidechannel.h \
-               snmp.c snmp.h
+               backchannel.c backend.h backend.c sidechannel.c sidechannel.h
 
 
 #
@@ -564,5 +622,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id: Makefile 7589 2008-05-19 00:13:23Z mike $".
 #