License change: Apache License, Version 2.0.

[thirdparty/cups.git] / filter / Makefile

diff --git a/filter/Makefile b/filter/Makefile
index 3c605b05ffa3028381cf93f1b0e2cf5968731990..9b1680995cb103e516f99765c97f0c71186aa414 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -4,13 +4,7 @@
 # Copyright 2007-2017 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products.
 #
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file.  If this file is
-# missing or damaged, see the license at "http://www.cups.org/".
-#
-# This file is subject to the Apple OS-Developed Software exception.
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
 #
 
 include ../Makedefs
@@ -29,6 +23,7 @@ LIBTARGETS =  \
                libcupsimage.a
 UNITTARGETS =  \
                rasterbench \
+               testclient \
                testraster
 TARGETS        =       \
                $(LIBTARGETS) \
@@ -38,7 +33,7 @@ IMAGEOBJS =   error.o interpret.o raster.o
 OBJS   =       $(IMAGEOBJS) \
                commandtops.o gziptoany.o common.o pstops.o \
                rasterbench.o rastertoepson.o rastertohp.o rastertolabel.o \
-               rastertopwg.o testraster.o
+               rastertopwg.o testclient.o testraster.o
 
 
 #
@@ -145,7 +140,7 @@ installstatic:
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) -m 755 libcupsimage.a $(LIBDIR)
        $(RANLIB) $(LIBDIR)/libcupsimage.a
-       $(LD_CHMOD) 555 $(LIBDIR)/libcupsimage.a
+       $(CHMOD) 555 $(LIBDIR)/libcupsimage.a
 
 
 #
@@ -336,10 +331,21 @@ rastertopwg:      rastertopwg.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
 rastertopwg-static:    rastertopwg.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o libcupsimage.a \
-               ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(LD_COMMONLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
                $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
 
 
+#
+# testclient (dependency on static libraries is intentional)
+#
+
+testclient:    testclient.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
+       echo Linking $@...
+       $(LD_CC) $(LDFLAGS) -o $@ testclient.o \
+               libcupsimage.a ../cups/$(LIBCUPSSTATIC) \
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+
+
 #
 # testraster
 #
@@ -347,7 +353,7 @@ rastertopwg-static: rastertopwg.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
 testraster:    testraster.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \
-               ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(LD_COMMONLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
                $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
        echo Running raster API tests...
        ./testraster