Merge changes from CUPS 1.5svn-r9641

[thirdparty/cups.git] / cups / Makefile

diff --git a/cups/Makefile b/cups/Makefile
index b565c436a42b17083b61d9d07472926fced45650..38fdcb64520e06a6a9eaf87a152e9c9ccab304fb 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,15 +56,15 @@ 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 \
                snprintf.o \
                string.o \
                tempfile.o \
+               thread.o \
                transcode.o \
                usersys.o \
                util.o
@@ -86,8 +86,7 @@ OBJS  =       \
                testlang.o \
                testppd.o \
                testpwg.o \
-               testsnmp.o \
-               php_cups_wrap.o
+               testsnmp.o
 
 
 #
@@ -121,7 +120,9 @@ HEADERSPRIV =       \
                ppd-private.h \
                pwg-private.h \
                snmp-private.h \
-               string-private.h
+               string-private.h \
+               thread-private.h
+
 
 #
 # Targets in this directory...
@@ -283,7 +284,7 @@ install64bit:
 
 uninstall: $(UNINSTALL32) $(UNINSTALL64)
        $(RM) $(LIBDIR)/libcups.2.dylib
-       $(RM) $(LIBDIR)/libcups.a
+       $(RM) $(LIBDIR)/$(LIBCUPSSTATIC)
        $(RM) $(LIBDIR)/libcups.dylib
        $(RM) $(LIBDIR)/libcups_s.a
        $(RM) $(LIBDIR)/libcups.sl
@@ -352,15 +353,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
@@ -387,7 +387,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)
 
 
@@ -656,6 +656,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...
 #