Fix Avahi/Linux build error (Issue #5566)

[thirdparty/cups.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 1e1751630c6f90a882c77d5377647461fb1e2ac9..d2e047cb523ca431424df84d05203faa4936e3cc 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,7 +1,7 @@
 #
 # IPP test makefile for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2019 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -36,6 +36,7 @@ TESTFILES     =       \
                        get-jobs.test \
                        get-notifications.test \
                        get-printer-attributes.test \
+                       get-printer-attributes-suite.test \
                        get-subscriptions.test \
                        ipp-1.1.test \
                        ipp-2.0.test \
@@ -47,12 +48,15 @@ TESTFILES   =       \
                        print-job-gzip.test \
                        validate-job.test
 OBJS           =       \
+                       ippevepcl.o \
+                       ippeveprinter.o \
+                       ippeveps.o \
                        ippfind.o \
-                       ippserver.o \
                        ipptool.o
 TARGETS                =       \
+                       $(IPPEVECOMMANDS) \
+                       ippeveprinter \
                        $(IPPFIND_BIN) \
-                       ippserver \
                        ipptool \
                        $(LOCALTARGET)
 
@@ -84,7 +88,7 @@ unittests:
 
 clean:
        $(RM) $(TARGETS) $(OBJS)
-       $(RM) ippserver ippserver-shared ipptool-static
+       $(RM) ippeveprinter-static ippfind-static ipptool-static
 
 
 #
@@ -124,14 +128,23 @@ install-data:
 install-exec:
        echo Installing ipptool in $(BINDIR)...
        $(INSTALL_DIR) -m 755 $(BINDIR)
-       $(INSTALL_BIN) ipptool $(BINDIR)
+       $(INSTALL_BIN) ippeveprinter $(BINDIR)
        if test -x ippfind; then \
                $(INSTALL_BIN) ippfind $(BINDIR); \
        fi
+       $(INSTALL_BIN) ipptool $(BINDIR)
+       $(INSTALL_DIR) -m 755 $(SERVERBIN)/ippeveprinter
+       for file in $(IPPEVECOMMANDS); do \
+               $(INSTALL_BIN) $$file $(SERVERBIN)/ippeveprinter; \
+       done
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
-               cp ippfind $(SYMROOT); \
-               dsymutil $(SYMROOT)/ippfind; \
+               cp ippeveprinter $(SYMROOT); \
+               dsymutil $(SYMROOT)/ippeveprinter; \
+               if test -x ippfind; then \
+                       cp ippfind $(SYMROOT); \
+                       dsymutil $(SYMROOT)/ippfind; \
+               fi; \
                cp ipptool $(SYMROOT); \
                dsymutil $(SYMROOT)/ipptool; \
        fi
@@ -157,6 +170,14 @@ install-libs:
 
 uninstall:
        echo Uninstalling sample ipptool files from $(DATADIR)/ipptool...
+       for file in ippeveprinter ippfind ipptool; do \
+               $(RM) $(BINDIR)/$$file; \
+       done
+       -$(RMDIR) $(BINDIR)
+       for file in $(IPPEVECOMMANDS); do \
+               $(RM) $(SERVERBIN)/ippeveprinter/$$file; \
+       done
+       -$(RMDIR) $(SERVERBIN)/ippeveprinter
        for file in $(DATAFILES); do \
                $(RM) $(DATADIR)/ipptool/$$file; \
        done
@@ -170,38 +191,69 @@ uninstall:
 # Local programs (not built when cross-compiling...)
 #
 
-local: ippserver ippserver-shared ipptool-static
+local: ippeveprinter-static ipptool-static
 
 
 #
-# ippfind
+# ippeveprinter
 #
 
-ippfind:       ippfind.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSSTATIC)
+ippeveprinter: ippeveprinter.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ ippfind.o $(LIBS)
-       echo Linking $@-static...
-       $(LD_CC) $(LDFLAGS) -o $@-static ippfind.o  ../cups/$(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
-# ippserver
+# ippeveprinter-static
 #
 
-ippserver:     ippserver.o ../cups/$(LIBCUPSSTATIC)
+ippeveprinter-static:  ippeveprinter.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ ippserver.o  ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o  ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+
+
+#
+# ippevepcl
+#
+
+ippevepcl:     ippevepcl.o ../cups/$(LIBCUPS)
+       echo Linking $@...
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippevepcl.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
-# ippserver-shared
+# ippeveps
 #
 
-ippserver-shared:      ippserver.o ../cups/$(LIBCUPS)
+ippeveps:      ippeveps.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ ippserver.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveps.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+
+
+#
+# ippfind
+#
+
+ippfind:       ippfind.o ../cups/$(LIBCUPS)
+       echo Linking $@...
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+
+
+#
+# ippfind-static
+#
+
+ippfind-static:        ippfind.o ../cups/$(LIBCUPSSTATIC)
+       echo Linking $@
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o  ../cups/$(LIBCUPSSTATIC) \
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -210,7 +262,8 @@ ippserver-shared:   ippserver.o ../cups/$(LIBCUPS)
 
 ipptool:       ipptool.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ ipptool.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ipptool.o $(LIBS)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
@@ -219,8 +272,21 @@ ipptool:   ipptool.o ../cups/$(LIBCUPS)
 
 ipptool-static:        ipptool.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ ipptool.o  ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ipptool.o  ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
+
+
+#
+# printer-png.h
+#
+
+printer-png.h: printer.png
+       echo "Generating printer-png.h from printer.png..."
+       echo "static const unsigned char printer_png[] =" >printer-png.h
+       echo "{" >>printer-png.h
+       od -t x1 printer.png | cut -b12- | awk '{printf("  "); for (i = 1; i <= NF; i ++) printf("0x%s,", $$i); print "";}' >>printer-png.h
+       echo "};" >>printer-png.h
 
 
 #