Merge changes from CUPS 1.6svn-r9939.

[thirdparty/cups.git] / filter / Makefile

diff --git a/filter/Makefile b/filter/Makefile
index 7ddbb1dc1f2cdd2dbf6e3a834e1d7b425456cd14..e7440eefe5a995d0b3239ad75f208646ca3c55e3 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,9 +1,9 @@
 #
 # "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
 #
-#   Filter makefile for the Common UNIX Printing System (CUPS).
+#   Filter makefile for CUPS.
 #
-#   Copyright 2007-2010 by Apple Inc.
+#   Copyright 2007-2011 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -19,16 +19,13 @@ include ../Makedefs
 
 
 FILTERS        =       \
-               $(BANNERTOPS) \
                commandtops \
                gziptoany \
-               $(TEXTTOPS) \
                pstops \
-               $(IMGFILTERS) \
-               $(PDFTOPS) \
-               rastertolabel \
                rastertoepson \
-               rastertohp
+               rastertohp \
+               rastertolabel \
+               rastertopwg
 LIBTARGETS =   \
                $(LIBCUPSIMAGE) \
                libcupsimage.a \
@@ -36,23 +33,18 @@ LIBTARGETS =        \
                $(LIB64CUPSIMAGE)
 UNITTARGETS =  \
                rasterbench \
-               testimage \
                testraster
 TARGETS        =       \
                $(LIBTARGETS) \
                $(FILTERS)
 
-IMAGEOBJS =    image-bmp.o image-colorspace.o image-gif.o image-jpeg.o \
-               image-photocd.o image-pix.o image-png.o image-pnm.o \
-               image-sgi.o image-sgilib.o image-sun.o image-tiff.o \
-               image-zoom.o image.o error.o interpret.o raster.o
+IMAGEOBJS =    error.o interpret.o raster.o
 IMAGE32OBJS =  $(IMAGEOBJS:.o=.32.o)
 IMAGE64OBJS =  $(IMAGEOBJS:.o=.64.o)
 OBJS   =       $(IMAGEOBJS) \
-               bannertops.o commandtops.o gziptoany.o imagetops.o \
-               imagetoraster.o common.o pdftops.o pstext.o pstops.o \
+               commandtops.o gziptoany.o common.o pstops.o \
                rasterbench.o rastertoepson.o rastertohp.o rastertolabel.o \
-               testimage.o testraster.o textcommon.o texttops.o
+               rastertopwg.o testraster.o
 
 
 #
@@ -138,8 +130,6 @@ install-exec:
 #
 
 install-headers:
-       $(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
-       $(INSTALL_DATA) image.h $(INCLUDEDIR)/cups
 
 
 #
@@ -199,8 +189,6 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
        $(RM) $(LIBDIR)/libcupsimage.so
        $(RM) $(LIBDIR)/libcupsimage.so.2
        -$(RMDIR) $(LIBDIR)
-       $(RM) $(INCLUDEDIR)/cups/image.h
-       -$(RMDIR) $(INCLUDEDIR)/cups
 
 uninstall32bit:
        $(RM) $(LIB32DIR)/libcupsimage.so
@@ -245,6 +233,12 @@ apihelp:
                --header raster-driver.header \
                --intro raster-driver.shtml \
                >../doc/help/raster-driver.html
+       mxmldoc --section "Specifications" \
+               --title "CUPS PPD Extensions" \
+               --css ../doc/cups-printable.css \
+               --header spec-ppd.header \
+               --intro spec-ppd.shtml \
+               >../doc/help/spec-ppd.html
 
 framedhelp:
        echo Generating CUPS API help files...
@@ -271,16 +265,12 @@ framedhelp:
                --css ../doc/cups-printable.css \
                --header raster-driver.header \
                --intro raster-driver.shtml
-
-
-#
-# bannertops
-#
-
-bannertops:    bannertops.o pstext.o common.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
-       echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ bannertops.o pstext.o common.o $(LINKCUPSIMAGE) \
-               $(IMGLIBS) $(LIBS)
+       mxmldoc --section "Specifications" \
+               --title "CUPS PPD Extensions" \
+               --framed ../cups/spec-ppd \
+               --css ../doc/cups-printable.css \
+               --header spec-ppd.header \
+               --intro spec-ppd.shtml \
 
 
 #
@@ -345,7 +335,6 @@ libcupsimage.2.dylib:       $(IMAGEOBJS) $(LIBCUPSIMAGEORDER)
                -install_name $(libdir)/$@ \
                -current_version 2.3.0 \
                -compatibility_version 2.0.0 \
-               -sectorder __TEXT __text $(LIBCUPSIMAGEORDER) \
                $(IMAGEOBJS) $(DSOLIBS) -L../cups $(LINKCUPS) -lm
        $(RM) libcupsimage.dylib
        $(LN) $@ libcupsimage.dylib
@@ -385,38 +374,6 @@ libcupsimage.a:    $(IMAGEOBJS)
        $(RANLIB) $@
 
 
-#
-# testimage
-#
-
-testimage:     testimage.o libcupsimage.a ../Makedefs
-       echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testimage.o libcupsimage.a \
-               $(IMGLIBS) $(DSOLIBS) $(LIBS)
-
-
-#
-# imagetops
-#
-
-imagetops:     imagetops.o common.o $(LIBCUPSIMAGE) \
-               ../cups/$(LIBCUPS)
-       echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ imagetops.o common.o $(LINKCUPSIMAGE) \
-               $(IMGLIBS) $(LIBS)
-
-
-#
-# imagetoraster
-#
-
-imagetoraster: imagetoraster.o common.o $(LIBCUPSIMAGE) \
-               ../cups/$(LIBCUPS)
-       echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ imagetoraster.o common.o $(LINKCUPSIMAGE) \
-               $(IMGLIBS) $(LIBS)
-
-
 #
 # pstops
 #
@@ -427,39 +384,39 @@ pstops:   pstops.o common.o ../cups/$(LIBCUPS)
 
 
 #
-# pdftops
+# rastertoepson
 #
 
-pdftops:       pdftops.o common.o ../cups/$(LIBCUPS)
+rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ pdftops.o common.o $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
 
 #
-# rastertolabel
+# rastertohp
 #
 
-rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
+rastertohp:    rastertohp.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
 
 #
-# rastertoepson
+# rastertolabel
 #
 
-rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
+rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
 
 #
-# rastertohp
+# rastertopwg
 #
 
-rastertohp:    rastertohp.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
+rastertopwg:   rastertopwg.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
 
 #
@@ -484,20 +441,10 @@ rasterbench:      rasterbench.o libcupsimage.a
        $(CC) $(LDFLAGS) -o $@ rasterbench.o libcupsimage.a $(LIBS)
 
 
-#
-# texttops
-#
-
-texttops:      texttops.o textcommon.o common.o \
-               ../cups/$(LIBCUPS)
-       echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ texttops.o textcommon.o common.o $(LIBS)
-
-
 #
 # Dependencies...
 #
-  
+
 include Dependencies