Merge changes from CUPS 1.6svn-r9939.

[thirdparty/cups.git] / backend / Makefile

diff --git a/backend/Makefile b/backend/Makefile
index 5a0521cff822ae072ea1a16afe6f4c2956bd1a91..27f4e6859932001501a224b31cd0e096f5363ec5 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -21,13 +21,37 @@ include ../Makedefs
 # Object files...
 #
 
-RBACKENDS =    ipp lpd $(DNSSD_BACKEND)
-UBACKENDS =    $(LEGACY_BACKENDS) serial snmp socket usb
-UNITTESTS =    test1284 testbackend testsupplies
-TARGETS =      libbackend.a $(RBACKENDS) $(UBACKENDS)
-LIBOBJS        =       ieee1284.o network.o runloop.o snmp-supplies.o
-OBJS   =       ipp.o lpd.o dnssd.o parallel.o serial.o snmp.o \
-               socket.o test1284.o testbackend.o testsupplies.o usb.o
+RBACKENDS =    \
+               ipp \
+               lpd \
+               $(DNSSD_BACKEND)
+UBACKENDS =    \
+               snmp \
+               socket \
+               usb
+UNITTESTS =    \
+               test1284 \
+               testbackend \
+               testsupplies
+TARGETS =      \
+               libbackend.a \
+               $(RBACKENDS) \
+               $(UBACKENDS)
+LIBOBJS        =       \
+               ieee1284.o \
+               network.o \
+               runloop.o \
+               snmp-supplies.o
+OBJS   =       \
+               ipp.o \
+               lpd.o \
+               dnssd.o \
+               snmp.o \
+               socket.o \
+               test1284.o \
+               testbackend.o \
+               testsupplies.o \
+               usb.o
 
 
 #
@@ -56,7 +80,7 @@ unittests:    $(UNITTESTS)
 #
 
 clean:
-       $(RM) $(OBJS) $(TARGETS) $(UNITTESTS) $(LIBOBJS) http mdns
+       $(RM) $(OBJS) $(TARGETS) $(UNITTESTS) $(LIBOBJS) http https ipps mdns
 
 
 #
@@ -226,24 +250,6 @@ lpd:       lpd.o ../cups/$(LIBCUPS) libbackend.a
        $(CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
 
 
-#
-# parallel
-#
-
-parallel:      parallel.o ../cups/$(LIBCUPS) libbackend.a
-       echo Linking $@...
-       $(CC) $(LDFLAGS) -o parallel parallel.o libbackend.a $(LIBS)
-
-
-#
-# serial
-#
-
-serial:        serial.o ../cups/$(LIBCUPS) libbackend.a
-       echo Linking $@...
-       $(CC) $(LDFLAGS) -o serial serial.o libbackend.a $(BACKLIBS) $(LIBS)
-
-
 #
 # snmp
 #