Merge changes from CUPS 1.4svn-r8540.

[thirdparty/cups.git] / Makefile

diff --git a/Makefile b/Makefile
index 7be3bac5981c26b1d4b033773e5483a75ec646fc..fb892d04c84ffe6971abc253d92a2360acd65d12 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7613 2008-05-22 23:27:52Z mike $"
+# "$Id: Makefile 7961 2008-09-17 19:52:46Z mike $"
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -15,6 +15,14 @@
 
 include Makedefs
 
+
+#
+# Don't run top-level build targets in parallel...
+#
+
+.NOTPARALLEL:
+
+
 #
 # Directories to make...
 #
@@ -22,7 +30,7 @@ include Makedefs
 DIRS   =       cups filter backend berkeley cgi-bin driver locale man monitor \
                notifier ppdc scheduler systemv test \
                $(PHPDIR) \
-               conf data doc $(FONTS) templates
+               conf data doc examples $(FONTS) templates
 
 
 #
@@ -41,7 +49,7 @@ all:
        echo Using LIBS="$(LIBS)"
        for dir in $(DIRS); do\
                echo Making all in $$dir... ;\
-               (cd $$dir ; $(MAKE) $(MFLAGS) all) || exit 1;\
+               (cd $$dir ; $(MAKE) $(MFLAGS) all $(UNITTESTS)) || exit 1;\
        done
 
 
@@ -107,12 +115,15 @@ distclean:        clean
        $(RM) man/client.conf.man
        $(RM) man/cups-deviced.man man/cups-driverd.man
        $(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
-       $(RM) man/cupsd.conf.man man/lpoptions.man
+       $(RM) man/cupsd.conf.man man/drv.man man/lpoptions.man
        $(RM) packaging/cups.list
+       $(RM) packaging/cups-desc.plist packaging/cups-info.plist
        $(RM) templates/header.tmpl
+       $(RM) desktop/cups.desktop
+       $(RM) init/cups.xml
        -$(RM) doc/*/index.html
        -$(RM) templates/*/header.tmpl
-       -$(RM) -r autom4te*.cache
+       -$(RM) -r autom4te*.cache clang cups/charmaps cups/locale driver/test
 
 
 #
@@ -132,14 +143,9 @@ depend:
 
 .PHONY: clang
 clang:
-       if test ! -d clang; then \
-               mkdir clang; \
-       else \
-               rm -rf clang/*; \
-       fi
-       $(MAKE) $(MFLAGS) CC="scan-build -o ../clang $(CC)" \
-               CXX="scan-build -o ../clang $(CXX)" clean all
-       test `ls -1 clang | wc -l` = 0
+       $(RM) -r clang
+       scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) \
+               CC=ccc-analyzer CXX=ccc-analyzer clean all
 
 
 #
@@ -369,5 +375,5 @@ dist:       all
 
 
 #
-# End of "$Id: Makefile 7613 2008-05-22 23:27:52Z mike $".
+# End of "$Id: Makefile 7961 2008-09-17 19:52:46Z mike $".
 #