Fix a performance regression with large PPDs (rdar://47040759)

[thirdparty/cups.git] / Makefile

diff --git a/Makefile b/Makefile
index 1bc05d4f634d4aa4900c701588bb43d2328f0aa5..ddb3a5f53ae1240e2531e11f38ce14c97a5b3ad1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
 #
 # Top-level Makefile for CUPS.
 #
-# Copyright 2007-2016 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
 # property of Apple Inc. and are protected by Federal copyright
 # law.  Distribution and use rights are outlined in the file "LICENSE.txt"
 # which should have been included with this file.  If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include Makedefs
@@ -271,38 +271,6 @@ apihelp:
                (cd $$dir; $(MAKE) $(MFLAGS) apihelp) || exit 1;\
        done
 
-framedhelp:
-       for dir in cups filter; do\
-               echo Generating framed API help in $$dir... ;\
-               (cd $$dir; $(MAKE) $(MFLAGS) framedhelp) || exit 1;\
-       done
-
-
-#
-# Create an Xcode docset using Mini-XML's mxmldoc (http://www.msweet.org/)...
-#
-
-docset:        apihelp
-       echo Generating docset directory tree...
-       $(RM) -r org.cups.docset
-       mkdir -p org.cups.docset/Contents/Resources/Documentation/help
-       mkdir -p org.cups.docset/Contents/Resources/Documentation/images
-       cd man; $(MAKE) $(MFLAGS) html
-       cd doc; $(MAKE) $(MFLAGS) docset
-       cd cgi-bin; $(MAKE) $(MFLAGS) makedocset
-       cgi-bin/makedocset org.cups.docset \
-               `svnversion . | sed -e '1,$$s/[a-zA-Z]//g'` \
-               doc/help/api-*.tokens
-       $(RM) doc/help/api-*.tokens
-       echo Indexing docset...
-       /Applications/Xcode.app/Contents/Developer/usr/bin/docsetutil index org.cups.docset
-       echo Generating docset archive and feed...
-       $(RM) org.cups.docset.atom
-       /Applications/Xcode.app/Contents/Developer/usr/bin/docsetutil package --output org.cups.docset.xar \
-               --atom org.cups.docset.atom \
-               --download-url http://www.cups.org/org.cups.docset.xar \
-               org.cups.docset
-
 
 #
 # Lines of code computation...
@@ -320,22 +288,15 @@ sloc:
 
 EPMFLAGS       =       -v --output-dir dist $(EPMARCH)
 
-bsd deb pkg slackware:
+bsd deb epm pkg rpm slackware:
        epm $(EPMFLAGS) -f $@ cups packaging/cups.list
 
-epm:
-       epm $(EPMFLAGS) -s packaging/installer.gif cups packaging/cups.list
-
-rpm:
-       epm $(EPMFLAGS) -f rpm -s packaging/installer.gif cups packaging/cups.list
-
-.PHONEY:       dist
+.PHONY:        dist
 dist:  all
        $(RM) -r dist
        $(MAKE) $(MFLAGS) epm
        case `uname` in \
                *BSD*) $(MAKE) $(MFLAGS) bsd;; \
-               Darwin*) $(MAKE) $(MFLAGS) osx;; \
                Linux*) test ! -x /usr/bin/rpm || $(MAKE) $(MFLAGS) rpm;; \
                SunOS*) $(MAKE) $(MFLAGS) pkg;; \
        esac