Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / driver / Makefile

diff --git a/driver/Makefile b/driver/Makefile
index accaacc13548e8753fe3109cc8f60d777e0065ce..998501e881fd1f87cd9dba748eff63fbf616965e 100644 (file)
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -79,6 +79,13 @@ all:         $(TARGETS)
 libs:          $(LIBTARGETS)
 
 
+#
+# Make unit tests...
+#
+
+unittests:
+
+
 #
 # Clean everything...
 #
@@ -87,7 +94,7 @@ clean:
        $(RM) $(OBJS) core
        $(RM) *.bck core.*
        $(RM) $(TARGETS)
-       $(RM) -r images
+       $(RM) -r test
        $(RM) libcupsdriver.so libcupsdriver.sl libcupsdriver.dylib
        $(RM) -r 32bit 64bit
 
@@ -276,17 +283,25 @@ rastertopclx:             rastertopclx.o pcl-common.o $(LIBCUPSDRIVER) \
                $(LINKCUPSIMAGE) $(LIBS)
 
 
+#
+# test, make a common test subdirectory for the other test programs.
+#
+
+test:
+       if test ! -d test; then \
+               rm -rf test; \
+               mkdir test; \
+       fi
+
+
 #
 # testcmyk, test cmyk separation functions.
 #
 
-testcmyk:              testcmyk.o libcupsdriver.a ../cups/libcups.a
+testcmyk:              test testcmyk.o libcupsdriver.a ../cups/libcups.a
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcmyk.o libcupsdriver.a \
                ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
-       if test ! -d test; then \
-               mkdir test; \
-       fi
        echo Running CMYK API tests...
        ./testcmyk > test/testcmyk.log
 
@@ -295,13 +310,10 @@ testcmyk:         testcmyk.o libcupsdriver.a ../cups/libcups.a
 # testdither, test dithering functions.
 #
 
-testdither:            testdither.o libcupsdriver.a ../cups/libcups.a
+testdither:            test testdither.o libcupsdriver.a ../cups/libcups.a
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testdither.o libcupsdriver.a \
                ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
-       if test ! -d test; then \
-               mkdir test; \
-       fi
        echo Running dither API tests...
        ./testdither > test/0-255.pgm 2>test/0-255.log
        ./testdither 0 127 255 > test/0-127-255.pgm 2>test/0-127-255.log
@@ -317,13 +329,10 @@ testdither:               testdither.o libcupsdriver.a ../cups/libcups.a
 # testrgb, test RGB separation functions.
 #
 
-testrgb:               testrgb.o libcupsdriver.a ../cups/libcups.a
+testrgb:               test testrgb.o libcupsdriver.a ../cups/libcups.a
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testrgb.o libcupsdriver.a \
                ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
-       if test ! -d test; then \
-               mkdir test; \
-       fi
        echo Running RGB API tests...
        ./testrgb > test/testrgb.log 2>&1 || echo "RGB tests failed!"