Add missing image.

[thirdparty/cups.git] / Makefile

diff --git a/Makefile b/Makefile
index 017378db38ebe07fcda3809e38c2d7146bf03a56..d74d82f096d2b1004fb9e1798aa243033c2f08b3 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...
 #
@@ -34,12 +42,14 @@ all:
        echo Using ARCHFLAGS="$(ARCHFLAGS)"
        echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
        echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
+       echo Using CC="$(CC)"
+       echo Using CXX="$(CC)"
        echo Using DSOFLAGS="$(DSOFLAGS)"
        echo Using LDFLAGS="$(LDFLAGS)"
        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
 
 
@@ -51,6 +61,8 @@ libs:
        echo Using ARCHFLAGS="$(ARCHFLAGS)"
        echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
        echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
+       echo Using CC="$(CC)"
+       echo Using CXX="$(CC)"
        echo Using DSOFLAGS="$(DSOFLAGS)"
        echo Using LDFLAGS="$(LDFLAGS)"
        echo Using LIBS="$(LIBS)"
@@ -60,6 +72,25 @@ libs:
        done
 
 
+#
+# Make unit test targets...
+#
+
+unittests:
+       echo Using ARCHFLAGS="$(ARCHFLAGS)"
+       echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
+       echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
+       echo Using CC="$(CC)"
+       echo Using CXX="$(CC)"
+       echo Using DSOFLAGS="$(DSOFLAGS)"
+       echo Using LDFLAGS="$(LDFLAGS)"
+       echo Using LIBS="$(LIBS)"
+       for dir in $(DIRS); do\
+               echo Making all in $$dir... ;\
+               (cd $$dir ; $(MAKE) $(MFLAGS) unittests) || exit 1;\
+       done
+
+
 #
 # Remove object and target files...
 #
@@ -84,9 +115,11 @@ 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) templates/header.tmpl
+       $(RM) desktop/cups.desktop
+       $(RM) init/cups.xml
        -$(RM) doc/*/index.html
        -$(RM) templates/*/header.tmpl
        -$(RM) -r autom4te*.cache
@@ -109,14 +142,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 || exit 1
+       $(RM) -r clang
+       scan-build -k -o `pwd`/clang $(MAKE) $(MFLAGS) \
+               CC=ccc-analyzer CXX=ccc-analyzer clean all
 
 
 #
@@ -346,5 +374,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 $".
 #