Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / Makefile

diff --git a/Makefile b/Makefile
index 017378db38ebe07fcda3809e38c2d7146bf03a56..7be3bac5981c26b1d4b033773e5483a75ec646fc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,8 @@ all:
        echo Using ARCHFLAGS="$(ARCHFLAGS)"
        echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
        echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
        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)"
        echo Using DSOFLAGS="$(DSOFLAGS)"
        echo Using LDFLAGS="$(LDFLAGS)"
        echo Using LIBS="$(LIBS)"


@@ -51,6 +53,8 @@ libs:
        echo Using ARCHFLAGS="$(ARCHFLAGS)"
        echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
        echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
        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)"
        echo Using DSOFLAGS="$(DSOFLAGS)"
        echo Using LDFLAGS="$(LDFLAGS)"
        echo Using LIBS="$(LIBS)"


@@ -60,6 +64,25 @@ libs:
        done
 
 
        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...
 #
 #
 # Remove object and target files...
 #


@@ -116,7 +139,7 @@ clang:
        fi
        $(MAKE) $(MFLAGS) CC="scan-build -o ../clang $(CC)" \
                CXX="scan-build -o ../clang $(CXX)" clean all
        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
+       test `ls -1 clang | wc -l` = 0

 
 
 #
 
 
 #