Merge changes from CUPS trunk, r7566.

[thirdparty/cups.git] / filter / Makefile

diff --git a/filter/Makefile b/filter/Makefile
index 5f6a4aca52793b783b4e320c5c36c11f09b93d06..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...
 #
@@ -71,8 +90,8 @@ depend:
        makedepend -Y -I.. -fDependencies.tmp $(OBJS:.o=.c) >/dev/null 2>&1
        $(RM) Dependencies
        cp Dependencies.tmp Dependencies
-       sed -r -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' Dependencies.tmp >>Dependencies
-       sed -r -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies
+       sed -E -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' Dependencies.tmp >>Dependencies
+       sed -E -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies
        $(RM) Dependencies.tmp
 
 
@@ -80,13 +99,49 @@ depend:
 # Install all targets...
 #
 
-install:       all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+install:       all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
        $(INSTALL_DIR) -m 755 $(SERVERBIN)/filter
        for file in $(FILTERS); do \
                $(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
        done
        $(RM) $(SERVERBIN)/filter/rastertodymo
        $(LN) rastertolabel $(SERVERBIN)/filter/rastertodymo
+       if test "x$(SYMROOT)" != "x"; then \
+               $(INSTALL_DIR) $(SYMROOT); \
+               for file in $(TARGETS); do \
+                       cp $$file $(SYMROOT); \
+               done \
+       fi
+
+
+#
+# Install headers...
+#
+
+install-headers:
+       $(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
+       $(INSTALL_DATA) image.h $(INCLUDEDIR)/cups
+
+
+#
+# Install libraries...
+#
+
+install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
        -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
@@ -94,27 +149,15 @@ install:   all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
                $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
        fi
        -if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
-               $(STRIP) -x $(LIBDIR)/$(LIBCUPSIMAGE); \
                $(RM) $(LIBDIR)/libcupsimage.dylib; \
                $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
        fi
-       if test "x$(SYMROOT)" != "x"; then \
-               $(INSTALL_DIR) $(SYMROOT); \
-               for file in $(TARGETS); do \
-                       cp $$file $(SYMROOT); \
-               done \
-       fi
 
 installstatic:
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) libcupsimage.a $(LIBDIR);
        $(RANLIB) $(LIBDIR)/libcupsimage.a;
 
-installhdrs:
-       $(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
-       $(INSTALL_DATA) image.h $(INCLUDEDIR)/cups
-       $(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups
-
 install32bit:
        $(INSTALL_DIR) -m 755 $(LIB32DIR)
        $(INSTALL_LIB) 32bit/libcupsimage.so.2 $(LIB32DIR)/libcupsimage.so.2
@@ -147,7 +190,6 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
        $(RM) $(LIBDIR)/libcupsimage.so.2
        -$(RMDIR) $(LIBDIR)
        $(RM) $(INCLUDEDIR)/cups/image.h
-       $(RM) $(INCLUDEDIR)/cups/raster.h
        -$(RMDIR) $(INCLUDEDIR)/cups
 
 uninstall32bit:
@@ -170,7 +212,8 @@ apihelp:
        mxmldoc --section "Programming" --title "Raster API" \
                --css ../doc/cups-printable.css \
                --header api-raster.header --intro api-raster.shtml \
-               raster.h interpret.c raster.c >../doc/help/api-raster.html
+               ../cups/raster.h interpret.c raster.c \
+               >../doc/help/api-raster.html
 
 framedhelp:
        echo Generating CUPS API help files...
@@ -178,7 +221,16 @@ framedhelp:
                --framed ../cups/api-raster \
                --css ../doc/cups-printable.css \
                --header api-raster.header --intro api-raster.shtml \
-               raster.h interpret.c raster.c
+               ../cups/raster.h interpret.c raster.c
+
+
+#
+# commandtops
+#
+
+commandtops:   commandtops.o ../cups/$(LIBCUPS)
+       echo Linking $@...
+       $(CC) $(LDFLAGS) -o $@ commandtops.o $(LIBS)
 
 
 #
@@ -375,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
 
 
 #