Merge changes from CUPS 1.6svn-r9939.

[thirdparty/cups.git] / filter / Makefile

diff --git a/filter/Makefile b/filter/Makefile
index 104d4cda69e2b420e5a804c15d631a14d83ae128..e7440eefe5a995d0b3239ad75f208646ca3c55e3 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -19,13 +19,9 @@ include ../Makedefs
 
 
 FILTERS        =       \
-               $(BANNERTOPS) \
                commandtops \
                gziptoany \
-               $(TEXTTOPS) \
                pstops \
-               $(IMGFILTERS) \
-               $(PDFTOPS) \
                rastertoepson \
                rastertohp \
                rastertolabel \
@@ -37,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 \
-               rastertopwg.o testimage.o testraster.o textcommon.o texttops.o
+               rastertopwg.o testraster.o
 
 
 #
@@ -139,8 +130,6 @@ install-exec:
 #
 
 install-headers:
-       $(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
-       $(INSTALL_DATA) image.h $(INCLUDEDIR)/cups
 
 
 #
@@ -200,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
@@ -286,16 +273,6 @@ framedhelp:
                --intro spec-ppd.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)
-
-
 #
 # commandtops
 #
@@ -397,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
 #
@@ -438,15 +383,6 @@ pstops:    pstops.o common.o ../cups/$(LIBCUPS)
        $(CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS) -lm
 
 
-#
-# pdftops
-#
-
-pdftops:       pdftops.o common.o ../cups/$(LIBCUPS)
-       echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ pdftops.o common.o $(LIBS)
-
-
 #
 # rastertoepson
 #
@@ -505,16 +441,6 @@ 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...
 #