Load cups into easysw/current.

[thirdparty/cups.git] / filter / Makefile

diff --git a/filter/Makefile b/filter/Makefile
index 79b7fecb26382feb989bb81bd1859e30f4dba1e6..528839bc1fca8118a8c1ce7788e0cd7072a15fbf 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5354 2006-03-29 20:55:15Z mike $"
+# "$Id$"
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
@@ -33,6 +33,7 @@ TARGETS       =       $(FILTERS) \
                libcupsimage.a \
                $(LIB32CUPSIMAGE) \
                $(LIB64CUPSIMAGE) \
+               rasterbench \
                testimage \
                testraster
 
@@ -47,7 +48,7 @@ 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 \
-               raster.o rastertoepson.o rastertohp.o rastertolabel.o \
+               rasterbench.o rastertoepson.o rastertohp.o rastertolabel.o \
                testimage.o testraster.o textcommon.o texttops.o
 
 
@@ -65,7 +66,7 @@ all:  $(TARGETS)
 clean:
        $(RM) $(OBJS) $(TARGETS)
        $(RM) libcupsimage.so libcupsimage.sl libcupsimage.dylib
-       $(RM) libcupsimage.32.so libcupsimage.64.so
+       $(RM) -r 32bit 64bit
 
 
 #
@@ -117,13 +118,13 @@ installhdrs:
 
 install32bit:
        $(INSTALL_DIR) -m 755 $(LIB32DIR)
-       $(INSTALL_LIB) libcupsimage.32.so.2 $(LIB32DIR)/libcupsimage.so.2
-       $(LN) libcupsimage.so $(LIB32DIR)/libcupsimage.so.2
+       $(INSTALL_LIB) 32bit/libcupsimage.so.2 $(LIB32DIR)/libcupsimage.so.2
+       $(LN) libcupsimage.so.2 $(LIB32DIR)/libcupsimage.so
 
 install64bit:
        $(INSTALL_DIR) -m 755 $(LIB64DIR)
-       $(INSTALL_LIB) libcupsimage.64.so.2 $(LIB64DIR)/libcupsimage.so.2
-       $(LN) libcupsimage.so $(LIB64DIR)/libcupsimage.so.2
+       $(INSTALL_LIB) 64bit/libcupsimage.so.2 $(LIB64DIR)/libcupsimage.so.2
+       $(LN) libcupsimage.so.2 $(LIB64DIR)/libcupsimage.so
 
 
 #
@@ -205,27 +206,32 @@ hpgltops: $(HPGLOBJS) common.o ../cups/$(LIBCUPS)
 
 libcupsimage.so.2 libcupsimage.sl.2:   $(IMAGEOBJS)
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm
+       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
+               -L../cups $(LINKCUPS) -lm
        $(RM) `basename $@ .2`
        $(LN) $@ `basename $@ .2`
 
 
 #
-# libcupsimage.32.so.2
+# 32bit/libcupsimage.so.2
 #
 
-libcupsimage.32.so.2:  $(IMAGE32OBJS)
+32bit/libcupsimage.so.2:       $(IMAGE32OBJS)
        echo Linking 32-bit $@...
-       $(DSO) $(ARCH32FLAGS) $(DSOFLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) -lm
+       -mkdir 32bit
+       $(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) \
+               -L../cups/32bit $(LINKCUPS) -lm
 
 
 #
-# libcupsimage.64.so.2
+# 64bit/libcupsimage.so.2
 #
 
-libcupsimage.64.so.2:  $(IMAGE64OBJS)
+64bit/libcupsimage.so.2:       $(IMAGE64OBJS)
        echo Linking 64-bit $@...
-       $(DSO) $(ARCH64FLAGS) $(DSOFLAGS) -o $@ $(IMAGE64OBJS) $(DSOLIBS) -lm
+       -mkdir 64bit
+       $(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(IMAGE64OBJS) $(DSOLIBS) \
+               -L../cups/64bit $(LINKCUPS) -lm
 
 
 #
@@ -247,7 +253,7 @@ libcupsimage.2.dylib:       $(IMAGEOBJS)
 # libcupsimage_s.a
 #
 
-libcupsimage_s.a:      $(IMAGEOBJS)
+libcupsimage_s.a:      $(IMAGEOBJS) libcupsimage_s.exp
        echo Linking $@...
        $(DSO) $(DSOFLAGS) -Wl,-berok,-bexport:libcupsimage_s.exp \
                -o libcupsimage_s.o $(IMAGEOBJS) $(DSOLIBS) -lm
@@ -262,6 +268,7 @@ libcupsimage_s.a:   $(IMAGEOBJS)
 libcupsimage.la:       $(IMAGEOBJS)
        echo Linking $@...
        $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
+               -L../cups $(LINKCUPS) \
                -rpath $(LIBDIR) -version-info 2:2
 
 
@@ -353,6 +360,15 @@ testraster:        testraster.o raster.o
        $(CC) $(LDFLAGS) -o $@ testraster.o raster.o
 
 
+#
+# rasterbench
+#
+
+rasterbench:   rasterbench.o raster.o
+       echo Linking $@...
+       $(CC) $(LDFLAGS) -o $@ rasterbench.o raster.o
+
+
 #
 # texttops
 #
@@ -371,5 +387,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5354 2006-03-29 20:55:15Z mike $".
+# End of "$Id$".
 #