Merge changes from CUPS 1.4svn-r7961.

[thirdparty/cups.git] / filter / Makefile

diff --git a/filter/Makefile b/filter/Makefile
index 09df33085ec3e400dce7281d8dce1cbf1160cf2c..6e288c010aa9bc60fe252a5b03db46b8d559eca5 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 6696 2007-07-19 23:27:49Z mike $"
+# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
@@ -18,16 +18,29 @@
 include ../Makedefs
 
 
-FILTERS        =       commandtops gziptoany hpgltops texttops pstops $(IMGFILTERS) \
-               $(PDFTOPS) rastertolabel rastertoepson rastertohp
-TARGETS        =       $(FILTERS) \
+FILTERS        =       \
+               commandtops \
+               gziptoany \
+               hpgltops \
+               texttops \
+               pstops \
+               $(IMGFILTERS) \
+               $(PDFTOPS) \
+               rastertolabel \
+               rastertoepson \
+               rastertohp
+LIBTARGETS =   \
                $(LIBCUPSIMAGE) \
                libcupsimage.a \
                $(LIB32CUPSIMAGE) \
-               $(LIB64CUPSIMAGE) \
+               $(LIB64CUPSIMAGE)
+UNITTARGETS =  \
                rasterbench \
                testimage \
                testraster
+TARGETS        =       \
+               $(LIBTARGETS) \
+               $(FILTERS)
 
 HPGLOBJS =     hpgl-attr.o hpgl-config.o hpgl-main.o hpgl-prolog.o \
                hpgl-char.o hpgl-input.o hpgl-polygon.o hpgl-vector.o
@@ -52,12 +65,26 @@ OBJS        =       $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:          $(LIBTARGETS)
+
+
+#
+# Make unit tests...
+#
+
+unittests:     $(UNITTARGETS)
+
+
 #
 # Clean all object files...
 #
 
 clean:
-       $(RM) $(OBJS) $(TARGETS)
+       $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
        $(RM) libcupsimage.so libcupsimage.sl libcupsimage.dylib
        $(RM) -r 32bit 64bit
 
@@ -408,8 +435,11 @@ rastertohp:        rastertohp.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
 
 testraster:    testraster.o ../cups/libcups.a libcupsimage.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testraster.o libcupsimage.a ../cups/libcups.a \
-               $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) $(SSLLIBS) $(LIBGSSAPI)
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \
+               ../cups/libcups.a $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
+               $(SSLLIBS) $(LIBGSSAPI)
+       echo Running raster API tests...
+       ./testraster
 
 
 #
@@ -439,5 +469,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 6696 2007-07-19 23:27:49Z mike $".
+# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
 #