Make ippserver sample code a supported program called "ippeveprinter", which

[thirdparty/cups.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 78a5218aef7256239a7a3e3062efd5aca1d52b1b..8d4c506f51e4c098f1931a0500bf676c4786c3ac 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -47,12 +47,12 @@ TESTFILES   =       \
                        print-job-gzip.test \
                        validate-job.test
 OBJS           =       \
+                       ippeveprinter.o \
                        ippfind.o \
-                       ippserver.o \
                        ipptool.o
 TARGETS                =       \
+                       ippeveprinter \
                        $(IPPFIND_BIN) \
-                       ippserver \
                        ipptool \
                        $(LOCALTARGET)
 
@@ -84,7 +84,7 @@ unittests:
 
 clean:
        $(RM) $(TARGETS) $(OBJS)
-       $(RM) ippfind-static ippserver ippserver-shared ipptool-static
+       $(RM) ippeveprinter-static ippfind-static ipptool-static
 
 
 #
@@ -124,14 +124,19 @@ 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)
        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 +162,10 @@ 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 $(DATAFILES); do \
                $(RM) $(DATADIR)/ipptool/$$file; \
        done
@@ -170,43 +179,48 @@ 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)
+ippeveprinter: ippeveprinter.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
-ippfind-static:        ippfind.o ../cups/$(LIBCUPSSTATIC)
-       echo Linking $@
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o  ../cups/$(LIBCUPSSTATIC) \
+
+#
+# ippeveprinter-static
+#
+
+ippeveprinter-static:  ippeveprinter.o ../cups/$(LIBCUPS)
+       echo Linking $@...
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o  ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
-# ippserver
+# ippfind
 #
 
-ippserver:     ippserver.o ../cups/$(LIBCUPSSTATIC)
+ippfind:       ippfind.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippserver.o  ../cups/$(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 #
-# ippserver-shared
+# ippfind-static
 #
 
-ippserver-shared:      ippserver.o ../cups/$(LIBCUPS)
-       echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippserver.o $(LIBS)
+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)" $@