Merge changes from CUPS 1.6svn-r10002

[thirdparty/cups.git] / cups / Makefile

diff --git a/cups/Makefile b/cups/Makefile
index cd557d57a1f4bec52df94b64a41a5002820417ee..0924e144dbcf2ccc34cd4a8c2ec89e6a68818ed8 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -3,7 +3,7 @@
 #
 #   API library Makefile for CUPS.
 #
-#   Copyright 2007-2010 by Apple Inc.
+#   Copyright 2007-2011 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -56,9 +56,8 @@ LIBOBJS       =       \
                options.o \
                page.o \
                ppd.o \
-               pwg-file.o \
+               ppd-cache.o \
                pwg-media.o \
-               pwg-ppd.o \
                request.o \
                sidechannel.o \
                snmp.o \
@@ -87,8 +86,7 @@ OBJS  =       \
                testlang.o \
                testppd.o \
                testpwg.o \
-               testsnmp.o \
-               php_cups_wrap.o
+               testsnmp.o
 
 
 #
@@ -112,6 +110,7 @@ HEADERS     =       \
                versioning.h
 
 HEADERSPRIV =  \
+               array-private.h \
                cups-private.h \
                debug-private.h \
                file-private.h \
@@ -121,6 +120,7 @@ HEADERSPRIV =       \
                md5-private.h \
                ppd-private.h \
                pwg-private.h \
+               raster-private.h \
                snmp-private.h \
                string-private.h \
                thread-private.h
@@ -355,15 +355,14 @@ libcups.so.2 libcups.sl.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|_cupsSetDefaults|_cupsSetHTTPError|_cupsUserDefault|_httpWait)$$' | \
+               grep -v -e '^(_cupsConnect|_cupsCharset|_cupsEncodingName|_cupsSetDefaults|_cupsSetHTTPError|_cupsUserDefault|_httpWait)$$' | \
                sort >t.exp
        echo Linking $@...
        $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
                -install_name $(libdir)/$@ \
-               -current_version 2.8.0 \
+               -current_version 2.9.0 \
                -compatibility_version 2.0.0 \
                -exported_symbols_list t.exp \
-               -sectorder __TEXT __text $(LIBCUPSORDER) \
                $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        $(RM) libcups.dylib t.exp
@@ -378,7 +377,7 @@ libcups_s.a:        $(LIBOBJS) libcups_s.exp
        echo Creating $@...
        $(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o \
                $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(COMMONLIBS) $(LIBZ) -lm
+               $(COMMONLIBS) $(LIBZ)
        $(RM) $@
        $(AR) $(ARFLAGS) $@ libcups_s.o
 
@@ -390,7 +389,7 @@ libcups_s.a:        $(LIBOBJS) libcups_s.exp
 libcups.la:    $(LIBOBJS)
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
-               -rpath $(LIBDIR) -version-info 2:8 $(LIBGSSAPI) $(SSLLIBS) \
+               -rpath $(LIBDIR) -version-info 2:9 $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
@@ -659,6 +658,17 @@ framedhelp:
                backchannel.c backend.h backend.c sidechannel.c sidechannel.h
 
 
+#
+# Lines of code computation...
+#
+
+sloc:
+       echo "libcupslite: \c"
+       sloccount $(LITEOBJS:.o=.c) 2>/dev/null | grep "Total Physical" | awk '{print $$9}'
+       echo "libcups: \c"
+       sloccount $(LIBOBJS:.o=.c) 2>/dev/null | grep "Total Physical" | awk '{print $$9}'
+
+
 #
 # Dependencies...
 #