Merge changes from CUPS trunk, r7566.

[thirdparty/cups.git] / filter / Makefile

diff --git a/filter/Makefile b/filter/Makefile
index 6bd1f556e6bfe7cf3e0d18389642363ddc86d43c..61d578ce7f552f9a12dac878f228e297af906639 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -18,16 +18,28 @@
 include ../Makedefs
 
 
-FILTERS        =       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) \
-               rasterbench \
-               testimage \
                testraster
+TARGETS        =       \
+               $(LIBTARGETS) \
+               $(FILTERS) \
+               rasterbench \
+               testimage
 
 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
@@ -39,7 +51,7 @@ IMAGE32OBJS = $(IMAGEOBJS:.o=.32.o)
 IMAGE64OBJS =  $(IMAGEOBJS:.o=.64.o)
 FORMOBJS =     form-attr.o form-main.o form-ps.o form-text.o form-tree.o
 OBJS   =       $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \
-               gziptoany.o imagetops.o imagetoraster.o common.o \
+               commandtops.o gziptoany.o imagetops.o imagetoraster.o common.o \
                pdftops.o pstops.o \
                rasterbench.o rastertoepson.o rastertohp.o rastertolabel.o \
                testimage.o testraster.o textcommon.o texttops.o
@@ -52,6 +64,13 @@ OBJS =       $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:          $(LIBTARGETS)
+
+
 #
 # Clean all object files...
 #
@@ -205,6 +224,15 @@ framedhelp:
                ../cups/raster.h interpret.c raster.c
 
 
+#
+# commandtops
+#
+
+commandtops:   commandtops.o ../cups/$(LIBCUPS)
+       echo Linking $@...
+       $(CC) $(LDFLAGS) -o $@ commandtops.o $(LIBS)
+
+
 #
 # formtops
 #
@@ -399,8 +427,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
 
 
 #