Merge changes from CUPS 1.4svn-r7282.

[thirdparty/cups.git] / filter / Makefile

diff --git a/filter/Makefile b/filter/Makefile
index 36e947ce255b35ba07fba304d21204a85050aef2..5f6a4aca52793b783b4e320c5c36c11f09b93d06 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
+# "$Id: Makefile 6696 2007-07-19 23:27:49Z mike $"
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -19,7 +19,7 @@ include ../Makedefs
 
 
 FILTERS        =       gziptoany hpgltops texttops pstops $(IMGFILTERS) \
-               rastertolabel rastertoepson rastertohp
+               $(PDFTOPS) rastertolabel rastertoepson rastertohp
 TARGETS        =       $(FILTERS) \
                $(LIBCUPSIMAGE) \
                libcupsimage.a \
@@ -39,7 +39,8 @@ 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 pstops.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
 
@@ -167,9 +168,18 @@ uninstall64bit:
 apihelp:
        echo Generating CUPS API help files...
        mxmldoc --section "Programming" --title "Raster API" \
-               --intro api-raster.shtml \
+               --css ../doc/cups-printable.css \
+               --header api-raster.header --intro api-raster.shtml \
                raster.h interpret.c raster.c >../doc/help/api-raster.html
 
+framedhelp:
+       echo Generating CUPS API help files...
+       mxmldoc --section "Programming" --title "Raster API" \
+               --framed ../cups/api-raster \
+               --css ../doc/cups-printable.css \
+               --header api-raster.header --intro api-raster.shtml \
+               raster.h interpret.c raster.c
+
 
 #
 # formtops
@@ -236,12 +246,13 @@ libcupsimage.so.2 libcupsimage.sl.2:      $(IMAGEOBJS)
 # libcupsimage.2.dylib
 #
 
-libcupsimage.2.dylib:  $(IMAGEOBJS)
+libcupsimage.2.dylib:  $(IMAGEOBJS) $(LIBCUPSIMAGEORDER)
        echo Linking $@...
        $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
                -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
@@ -322,6 +333,15 @@ 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)
+
+
 #
 # rastertolabel
 #
@@ -386,5 +406,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id: Makefile 6696 2007-07-19 23:27:49Z mike $".
 #