Merge changes from CUPS 1.5.1-r9875.

[thirdparty/cups.git] / Makefile

diff --git a/Makefile b/Makefile
index 96f9c53d6e4d60bd7eaa644d773bdede0efc0ca8..747955d75fc9fed188de2aa332500641164d3ec0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7961 2008-09-17 19:52:46Z mike $"
+# "$Id: Makefile 9391 2010-11-30 21:53:04Z mike $"
 #
 #   Top-level Makefile for CUPS.
 #
@@ -16,13 +16,6 @@
 include Makedefs
 
 
-#
-# Don't run top-level build targets in parallel...
-#
-
-.NOTPARALLEL:
-
-
 #
 # Directories to make...
 #
@@ -167,6 +160,8 @@ install:    install-data install-headers install-libs install-exec
 #
 
 install-data:
+       echo Making all in cups...
+       (cd cups; $(MAKE) $(MFLAGS) all)
        for dir in $(DIRS); do\
                echo Installing data files in $$dir... ;\
                (cd $$dir; $(MAKE) $(MFLAGS) install-data) || exit 1;\
@@ -285,6 +280,16 @@ docset:    apihelp
                org.cups.docset
 
 
+#
+# Lines of code computation...
+#
+
+sloc:
+       for dir in cups cupslite scheduler; do \
+               (cd $$dir; $(MAKE) $(MFLAGS) sloc) || exit 1;\
+       done
+
+
 #
 # Make software distributions using EPM (http://www.epmhome.org/)...
 #
@@ -297,9 +302,6 @@ aix bsd deb depot inst pkg setld slackware swinstall tardist:
 epm:
        epm $(EPMFLAGS) -s packaging/installer.gif cups packaging/cups.list
 
-osx:
-       epm $(EPMFLAGS) -f osx -s packaging/installer.tif cups packaging/cups.list
-
 rpm:
        epm $(EPMFLAGS) -f rpm -s packaging/installer.gif cups packaging/cups.list
 
@@ -317,5 +319,12 @@ dist:      all
 
 
 #
-# End of "$Id: Makefile 7961 2008-09-17 19:52:46Z mike $".
+# Don't run top-level build targets in parallel...
+#
+
+.NOTPARALLEL:
+
+
+#
+# End of "$Id: Makefile 9391 2010-11-30 21:53:04Z mike $".
 #