Remove all of the Subversion keywords from various source files.

[thirdparty/cups.git] / cups / Makefile

diff --git a/cups/Makefile b/cups/Makefile
index 084b1680e5e00535fa510429c87fb8ed17ab74e3..593113abccfa06113324b847a695760855f6d1ba 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,9 +1,7 @@
 #
-# "$Id$"
-#
 # API library Makefile for CUPS.
 #
-# Copyright 2007-2013 by Apple Inc.
+# Copyright 2007-2015 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -32,25 +30,22 @@ OPTIONS     =       -D_CUPS_NO_DEPRECATED=1 -D_PPD_DEPRECATED=""
 LIBOBJS        =       \
                adminutil.o \
                array.o \
-               attr.o \
                auth.o \
                backchannel.o \
                backend.o \
-               conflicts.o \
-               custom.o \
                debug.o \
                dest.o \
                dest-job.o \
                dest-localization.o \
                dest-options.o \
                dir.o \
-               emit.o \
                encode.o \
                file.o \
                getdevices.o \
                getifaddrs.o \
                getputfile.o \
                globals.o \
+               hash.o \
                http.o \
                http-addr.o \
                http-addrlist.o \
@@ -59,15 +54,20 @@ LIBOBJS     =       \
                ipp-support.o \
                langprintf.o \
                language.o \
-               localize.o \
-               mark.o \
                md5.o \
                md5passwd.o \
                notify.o \
                options.o \
-               page.o \
                ppd.o \
+               ppd-attr.o \
                ppd-cache.o \
+               ppd-conflicts.o \
+               ppd-custom.o \
+               ppd-emit.o \
+               ppd-localize.o \
+               ppd-mark.o \
+               ppd-page.o \
+               ppd-util.o \
                pwg-media.o \
                request.o \
                sidechannel.o \
@@ -76,14 +76,17 @@ LIBOBJS     =       \
                string.o \
                tempfile.o \
                thread.o \
+               tls.o \
                transcode.o \
                usersys.o \
                util.o
 TESTOBJS       = \
                testadmin.o \
                testarray.o \
+               testcache.o \
                testconflicts.o \
                testcups.o \
+               testdest.o \
                testfile.o \
                testhttp.o \
                testi18n.o \
@@ -92,7 +95,8 @@ TESTOBJS      = \
                testlang.o \
                testppd.o \
                testpwg.o \
-               testsnmp.o
+               testsnmp.o \
+               tlscheck.o
 OBJS   =       \
                $(LIBOBJS) \
                $(TESTOBJS)
@@ -147,8 +151,10 @@ LIBTARGETS =       \
 UNITTARGETS =  \
                testadmin \
                testarray \
+               testcache \
                testconflicts \
                testcups \
+               testdest \
                testfile \
                testhttp \
                testi18n \
@@ -157,7 +163,8 @@ UNITTARGETS =       \
                testoptions \
                testppd \
                testpwg \
-               testsnmp
+               testsnmp \
+               tlscheck
 
 TARGETS        =       \
                $(LIBTARGETS)
@@ -313,13 +320,14 @@ libcups.so.2:     $(LIBOBJS)
 
 libcups.2.dylib:       $(LIBOBJS) $(LIBCUPSORDER)
        echo Creating export list for $@...
-       nm $(LIBOBJS) 2>/dev/null | grep "T _" | awk '{print $$3}' | \
-               grep -v -e '^(_cupsConnect|_cupsCharset|_cupsEncodingName|_cupsSetDefaults|_cupsSetHTTPError|_cupsUserDefault|_httpWait)$$' | \
+       nm -gm $(LIBOBJS) 2>/dev/null | grep "__text" | grep -v weak | \
+               awk '{print $$NF}' | \
+               grep -v -E -e '^(_cupsConnect|_cupsCharset|_cupsEncodingName|_cupsSetDefaults|_cupsSetHTTPError|_cupsUserDefault)$$' | \
                sort >t.exp
        echo Linking $@...
        $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
                -install_name $(libdir)/$@ \
-               -current_version 2.10.0 \
+               -current_version 2.12.0 \
                -compatibility_version 2.0.0 \
                -exported_symbols_list t.exp \
                $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
@@ -335,7 +343,7 @@ libcups.2.dylib:    $(LIBOBJS) $(LIBCUPSORDER)
 libcups.la:    $(LIBOBJS)
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
-               -rpath $(LIBDIR) -version-info 2:10 $(LIBGSSAPI) $(SSLLIBS) \
+               -rpath $(LIBDIR) -version-info 2:12 $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -350,6 +358,23 @@ libcups.a: $(LIBOBJS)
        $(RANLIB) $@
 
 
+#
+# libcups2.def (Windows DLL exports file...)
+#
+
+libcups2.def: $(LIBOBJS) Makefile
+       echo Generating $@...
+       echo "LIBRARY libcups2" >libcups2.def
+       echo "VERSION 2.11" >>libcups2.def
+       echo "EXPORTS" >>libcups2.def
+       (nm $(LIBOBJS) 2>/dev/null | grep "T _" | awk '{print $$3}'; \
+        echo __cups_strcpy; echo __cups_strlcat; echo __cups_strlcpy) | \
+               grep -v -E \
+                   -e 'cups_debug|Apple|BackChannel|Backend|FileCheck|Filter|GSSService|SetNegotiate|SideChannel' \
+                   -e 'Block$$' | \
+               sed -e '1,$$s/^_//' | sort >>libcups2.def
+
+
 #
 # testadmin (dependency on static CUPS library is intentional)
 #
@@ -372,6 +397,16 @@ testarray: testarray.o $(LIBCUPSSTATIC)
        ./testarray
 
 
+#
+# testcache (dependency on static CUPS library is intentional)
+#
+
+testcache:     testcache.o $(LIBCUPSSTATIC)
+       echo Linking $@...
+       $(CC) $(LDFLAGS) -o $@ testcache.o $(LIBCUPSSTATIC) \
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+
+
 #
 # testconflicts (dependency on static CUPS library is intentional)
 #
@@ -392,6 +427,16 @@ testcups:  testcups.o $(LIBCUPSSTATIC)
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
+#
+# testdest (dependency on static CUPS library is intentional)
+#
+
+testdest:      testdest.o $(LIBCUPSSTATIC)
+       echo Linking $@...
+       $(CC) $(LDFLAGS) -o $@ testdest.o $(LIBCUPSSTATIC) \
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+
+
 #
 # testfile (dependency on static CUPS library is intentional)
 #
@@ -498,6 +543,16 @@ testsnmp:  testsnmp.o $(LIBCUPSSTATIC)
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
+#
+# tlscheck (dependency on static CUPS library is intentional)
+#
+
+tlscheck:      tlscheck.o $(LIBCUPSSTATIC)
+       echo Linking $@...
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ tlscheck.o $(LIBCUPSSTATIC) \
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+
+
 #
 # Automatic API help files...
 #
@@ -535,9 +590,7 @@ apihelp:
        mxmldoc --section "Programming" --title "PPD API (DEPRECATED)" \
                --css ../doc/cups-printable.css \
                --header api-ppd.header --intro api-ppd.shtml \
-               api-ppd.xml \
-               ppd.h attr.c conflicts.c custom.c emit.c localize.c mark.c page.c \
-               ppd.c >../doc/help/api-ppd.html
+               api-ppd.xml ppd.h ppd-*.c >../doc/help/api-ppd.html
        mxmldoc --tokens help/api-ppd.html api-ppd.xml >../doc/help/api-ppd.tokens
        $(RM) api-ppd.xml
        mxmldoc --section "Programming" --title "HTTP and IPP APIs" \
@@ -620,9 +673,4 @@ sloc:
 #
 
 include Dependencies
-http.o: tls-darwin.c tls-gnutls.c tls-sspi.c
-
-
-#
-# End of "$Id$".
-#
+tls.o: tls-darwin.c tls-gnutls.c tls-sspi.c