Merge changes from CUPS 1.4svn-r7932.

[thirdparty/cups.git] / backend / Makefile

diff --git a/backend/Makefile b/backend/Makefile
index bb9d0f8dc75dcf188415f28ba0e8d05eb84bc093..11ebdbd481888e0fb8627eb83d928f51d36d08c0 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -17,12 +17,12 @@
 
 include ../Makedefs
 
-RBACKENDS =    ipp lpd $(MDNS)
+RBACKENDS =    ipp lpd $(DNSSD_BACKEND)
 UBACKENDS =    $(PAP) $(LEGACY_BACKENDS) serial snmp socket usb
 TARGETS        =       test1284 testbackend testsupplies \
                libbackend.a $(RBACKENDS) $(UBACKENDS)
 LIBOBJS        =       ieee1284.o network.o runloop.o snmp-supplies.o
-OBJS   =       ipp.o lpd.o mdns.o pap.o parallel.o scsi.o serial.o snmp.o \
+OBJS   =       ipp.o lpd.o dnssd.o pap.o parallel.o scsi.o serial.o snmp.o \
                socket.o test1284.o testbackend.o testsupplies.o usb.o
 
 
@@ -52,7 +52,7 @@ unittests:
 #
 
 clean:
-       $(RM) $(OBJS) $(TARGETS) $(LIBOBJS) http
+       $(RM) $(OBJS) $(TARGETS) $(LIBOBJS) http mdns
 
 
 #
@@ -91,6 +91,10 @@ install-exec:
        done
        $(RM) $(SERVERBIN)/backend/http
        $(LN) ipp $(SERVERBIN)/backend/http
+       if test "x$(DNSSD_BACKEND)" != x; then \
+               $(RM) $(SERVERBIN)/backend/mdns; \
+               $(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \
+       fi
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
                for file in $(TARGETS); do \
@@ -167,6 +171,17 @@ libbackend.a:      $(LIBOBJS)
        $(RANLIB) $@
 
 
+#
+# dnssd
+#
+
+dnssd: dnssd.o ../cups/$(LIBCUPS) libbackend.a
+       echo Linking $@...
+       $(CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
+       $(RM) mdns
+       $(LN) dnssd mdns
+
+
 #
 # ipp
 #
@@ -187,15 +202,6 @@ lpd:       lpd.o ../cups/$(LIBCUPS) libbackend.a
        $(CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
 
 
-#
-# mdns
-#
-
-mdns:  mdns.o ../cups/$(LIBCUPS) libbackend.a
-       echo Linking $@...
-       $(CC) $(LDFLAGS) -o mdns mdns.o libbackend.a $(LIBS)
-
-
 #
 # pap
 #
@@ -258,7 +264,8 @@ socket:     socket.o ../cups/$(LIBCUPS) libbackend.a
 
 usb:   usb.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) $(BACKLIBS) $(LIBS)
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
+               $(BACKLIBS) $(LIBS)
 usb.o: usb.c usb-darwin.c usb-libusb.c usb-unix.c