]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - scheduler/Makefile
Remove all of the Subversion keywords from various source files.
[thirdparty/cups.git] / scheduler / Makefile
index e38238f9f1ec1028c2ec48e4a331fdf18e79e7cb..3f707ae08fb09a2cb041c87a3171037068e7065d 100644 (file)
@@ -1,16 +1,14 @@
 #
-# "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $"
+# Scheduler Makefile for CUPS.
 #
-#   Scheduler Makefile for the Common UNIX Printing System (CUPS).
+# Copyright 2007-2015 by Apple Inc.
+# Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2008 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
-#
-#   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
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# 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
+# file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 include ../Makedefs
@@ -21,9 +19,11 @@ CUPSDOBJS =  \
                cert.o \
                classes.o \
                client.o \
+               colorman.o \
                conf.o \
                dirsvc.o \
                env.o \
+               file.o \
                main.o \
                ipp.o \
                listen.o \
@@ -34,7 +34,6 @@ CUPSDOBJS =   \
                printers.o \
                process.o \
                quotas.o \
-               removefile.o \
                select.o \
                server.o \
                statbuf.o \
@@ -44,18 +43,13 @@ LIBOBJS =   \
                filter.o \
                mime.o \
                type.o
-LIB32OBJS      = $(LIBOBJS:.o=.32.o)
-LIB64OBJS      = $(LIBOBJS:.o=.64.o)
 COBJS  =       \
                $(CUPSDOBJS) \
                $(LIBOBJS) \
-               $(LIB32OBJS) \
-               $(LIB64OBJS) \
                cupsfilter.o \
                cups-deviced.o \
+               cups-exec.o \
                cups-lpd.o \
-               cups-polld.o \
-               testdirsvc.o \
                testlpd.o \
                testmime.o \
                testspeed.o \
@@ -68,25 +62,25 @@ OBJS        =       \
                $(CXXOBJS)
 LIBTARGETS =   \
                $(LIBCUPSMIME) \
-               $(LIB32CUPSMIME) \
-               $(LIB64CUPSMIME) \
                libcupsmime.a
 
 UNITTARGETS =  \
-               testdirsvc \
                testlpd \
                testmime \
                testspeed \
                testsub
 
-TARGETS        =       \
-               $(LIBTARGETS) \
+PROGRAMS =     \
                cupsd \
                cupsfilter \
                cups-deviced \
                cups-driverd \
-               cups-lpd \
-               cups-polld \
+               cups-exec \
+               cups-lpd
+
+TARGETS        =       \
+               $(LIBTARGETS) \
+               $(PROGRAMS)
 
 
 #
@@ -117,8 +111,7 @@ unittests:  $(UNITTARGETS)
 clean:
        $(RM) $(OBJS)
        $(RM) $(TARGETS) $(UNITTARGETS) convert
-       $(RM) libcupsmime.so libcupsmime.sl libcupsmime.dylib
-       $(RM) -r 32bit 64bit
+       $(RM) libcupsmime.so libcupsmime.dylib
 
 
 #
@@ -126,17 +119,16 @@ clean:
 #
 
 depend:
-       touch Dependencies.tmp Dependencies.tmplib
-       makedepend -Y -I.. -fDependencies.tmp $(COBJS:.o=.c) \
-               $(CXXOBJS:.o=.cxx) >/dev/null 2>&1
-       makedepend -Y -I.. -fDependencies.tmplib $(LIBOBJS:.o=.c) >/dev/null 2>&1
-       $(RM) Dependencies
-       cp Dependencies.tmp Dependencies
-       sed -E -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' \
-               Dependencies.tmplib >>Dependencies
-       sed -E -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' \
-               Dependencies.tmplib >>Dependencies
-       $(RM) Dependencies.tmp Dependencies.tmplib
+       $(CC) -MM $(ALL_CFLAGS) $(COBJS:.o=.c) >Dependencies
+       $(CXX) -MM $(ALL_CXXFLAGS) $(CXXOBJS:.o=.cxx) >>Dependencies
+
+
+#
+# Run oclint to check code coverage...
+#
+
+oclint:
+       oclint -o=oclint.html -html $(CUPSDOBJS:.o=.c) $(LIBOBJS:.o=.c) -- $(ALL_CFLAGS)
 
 
 #
@@ -154,38 +146,69 @@ install-data:
        echo Creating $(SERVERBIN)/driver...
        $(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
        echo Creating $(SERVERROOT)...
-       $(INSTALL_DIR) -m 755 $(SERVERROOT)
-       -chgrp $(CUPS_GROUP) $(SERVERROOT)
-       echo Creating $(SERVERROOT)/interfaces...
-       $(INSTALL_DIR) -m 755 $(SERVERROOT)/interfaces
-       -chgrp $(CUPS_GROUP) $(SERVERROOT)/interfaces
+       $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)
        echo Creating $(SERVERROOT)/ppd...
-       $(INSTALL_DIR) -m 755 $(SERVERROOT)/ppd
-       -chgrp $(CUPS_GROUP) $(SERVERROOT)/ppd
-       -if test "x`uname`" != xDarwin; then \
+       $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/ppd
+       if test "x`uname`" != xDarwin; then \
                echo Creating $(SERVERROOT)/ssl...; \
-               $(INSTALL_DIR) -m 700 $(SERVERROOT)/ssl; \
-               chgrp $(CUPS_GROUP) $(SERVERROOT)/ssl || true; \
+               $(INSTALL_DIR) -m 700 -g $(CUPS_GROUP) $(SERVERROOT)/ssl; \
+       fi
+       if test "$(STATEDIR)" != "$(SERVERROOT)"; then \
                echo Creating $(STATEDIR)...; \
                $(INSTALL_DIR) -m 755 $(STATEDIR); \
-               echo Creating $(STATEDIR)/certs...; \
-               $(INSTALL_DIR) -m 511 $(STATEDIR)/certs; \
-               chgrp $(CUPS_PRIMARY_SYSTEM_GROUP) $(STATEDIR)/certs || true; \
        fi
+       echo Creating $(STATEDIR)/certs...
+       $(INSTALL_DIR) -m 511 -o $(CUPS_USER) -g $(CUPS_PRIMARY_SYSTEM_GROUP) \
+               $(STATEDIR)/certs
        echo Creating $(LOGDIR)...
        $(INSTALL_DIR) -m 755 $(LOGDIR)
        echo Creating $(REQUESTS)...
-       $(INSTALL_DIR) -m 710 $(REQUESTS)
-       -chgrp $(CUPS_GROUP) $(REQUESTS)
+       $(INSTALL_DIR) -m 710 -g $(CUPS_GROUP) $(REQUESTS)
        echo Creating $(REQUESTS)/tmp...
-       $(INSTALL_DIR) -m 1770 $(REQUESTS)/tmp
-       -chgrp $(CUPS_GROUP) $(REQUESTS)/tmp
+       $(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp
        echo Creating $(CACHEDIR)...
-       $(INSTALL_DIR) -m 775 $(CACHEDIR)
-       -chgrp $(CUPS_GROUP) $(CACHEDIR)
-#      echo Creating $(CACHEDIR)/ppd...
-#      $(INSTALL_DIR) -m 755 $(CACHEDIR)/ppd
-#      -chgrp $(CUPS_GROUP) $(CACHEDIR)/ppd
+       $(INSTALL_DIR) -m 770 -g $(CUPS_GROUP) $(CACHEDIR)
+       if test "x$(INITDIR)" != x; then \
+               echo Installing init scripts...; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
+               $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
+               for level in $(RCLEVELS); do \
+                       $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
+                       $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
+                       $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
+               done; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
+               $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
+       fi
+       if test "x$(INITDDIR)" != x; then \
+               echo Installing init script...; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR); \
+               $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR); \
+       fi
+       if test "x$(LAUNCHD_DIR)" != x; then \
+               echo Installing launchd configuration files...; \
+               $(INSTALL_DIR) $(BUILDROOT)$(LAUNCHD_DIR); \
+               $(INSTALL_DATA) org.cups.cupsd.plist $(BUILDROOT)$(LAUNCHD_DIR); \
+               $(INSTALL_DATA) org.cups.cups-lpd.plist $(BUILDROOT)$(LAUNCHD_DIR); \
+       fi
+       if test "x$(SMFMANIFESTDIR)" != x; then \
+               echo Installing SMF manifest in $(SMFMANIFESTDIR)...;\
+               $(INSTALL_DIR) $(BUILDROOT)/$(SMFMANIFESTDIR); \
+               $(INSTALL_SCRIPT) cups.xml $(BUILDROOT)$(SMFMANIFESTDIR)/cups.xml; \
+       fi
+       if test "x$(SYSTEMD_DIR)" != x; then \
+               echo Installing systemd configuration files...; \
+               $(INSTALL_DIR) $(BUILDROOT)$(SYSTEMD_DIR); \
+               $(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR); \
+               $(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR); \
+               $(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
+               $(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cups-lpd@.service; \
+               $(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
+       elif test "x$(XINETD)" != x; then \
+               echo Installing xinetd configuration file for cups-lpd...; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
+               $(INSTALL_DATA) cups-lpd.xinetd $(BUILDROOT)$(XINETD)/cups-lpd; \
+       fi
 
 
 #
@@ -195,23 +218,20 @@ install-data:
 install-exec:
        echo Installing programs in $(SBINDIR)...
        $(INSTALL_DIR) -m 755 $(SBINDIR)
-       $(INSTALL_BIN) cupsd $(SBINDIR)
+       $(INSTALL_BIN) -m $(CUPS_CUPSD_FILE_PERM) cupsd $(SBINDIR)
        $(INSTALL_BIN) cupsfilter $(SBINDIR)
-       -if test "x`uname`" = xDarwin; then \
-               $(INSTALL_DIR) $(BUILDROOT)/System/Library/Printers/Libraries; \
-               $(LN) $(sbindir)/cupsfilter $(BUILDROOT)/System/Library/Printers/Libraries/convert; \
-       fi
        echo Installing programs in $(SERVERBIN)/daemon...
        $(INSTALL_DIR) -m 755 $(SERVERBIN)
        $(INSTALL_DIR) -m 755 $(SERVERBIN)/daemon
        $(INSTALL_BIN) cups-deviced $(SERVERBIN)/daemon
        $(INSTALL_BIN) cups-driverd $(SERVERBIN)/daemon
+       $(INSTALL_BIN) cups-exec $(SERVERBIN)/daemon
        $(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
-       $(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
-               for file in $(TARGETS); do \
+               for file in $(PROGRAMS); do \
                        cp $$file $(SYMROOT); \
+                       dsymutil $(SYMROOT)/$$file; \
                done \
        fi
 
@@ -230,11 +250,11 @@ install-headers:
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+install-libs: $(INSTALLSTATIC)
        echo Installing libraries in $(LIBDIR)...
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) $(LIBCUPSMIME) $(LIBDIR)
-       if test $(LIBCUPSMIME) = "libcupsmime.so.1" -o $(LIBCUPSMIME) = "libcupsmime.sl.1"; then \
+       if test $(LIBCUPSMIME) = "libcupsmime.so.1"; then \
                $(RM) $(LIBDIR)/`basename $(LIBCUPSMIME) .1`; \
                $(LN) $(LIBCUPSMIME) $(LIBDIR)/`basename $(LIBCUPSMIME) .1`; \
        fi
@@ -245,38 +265,27 @@ install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
                cp $(LIBCUPSMIME) $(SYMROOT); \
+               dsymutil $(SYMROOT)/$(LIBCUPSMIME); \
        fi
 
 installstatic:
        $(INSTALL_DIR) -m 755 $(LIBDIR)
-       $(INSTALL_LIB) libcupsmime.a $(LIBDIR)
+       $(INSTALL_LIB) -m 755 libcupsmime.a $(LIBDIR)
        $(RANLIB) $(LIBDIR)/libcupsmime.a
-
-install32bit:
-       echo Installing libraries in $(LIB32DIR)...
-       $(INSTALL_DIR) -m 755 $(LIB32DIR)
-       $(INSTALL_LIB) 32bit/libcupsmime.so.1 $(LIB32DIR)/libcupsmime.so.1
-       $(LN) libcupsmime.so.1 $(LIB32DIR)/libcupsmime.so
-
-install64bit:
-       echo Installing libraries in $(LIB64DIR)...
-       $(INSTALL_DIR) -m 755 $(LIB64DIR)
-       $(INSTALL_LIB) 64bit/libcupsmime.so.1 $(LIB64DIR)/libcupsmime.so.1
-       $(LN) libcupsmime.so.1 $(LIB64DIR)/libcupsmime.so
+       $(CHMOD) 555 $(LIBDIR)/libcupsmime.a
 
 
 #
 # Uninstall the scheduler...
 #
 
-uninstall: $(UNINSTALL32) $(UNINSTALL64)
+uninstall:
        $(RM) $(SBINDIR)/cupsd
        $(RM) $(SBINDIR)/cupsfilter
        $(RM) $(SERVERBIN)/daemon/cups-deviced
        $(RM) $(SERVERBIN)/daemon/cups-driverd
+       $(RM) $(SERVERBIN)/daemon/cups-exec
        $(RM) $(SERVERBIN)/daemon/cups-lpd
-       $(RM) $(SERVERBIN)/daemon/cups-polld
-       $(RM) $(BUILDROOT)/System/Library/Printers/Libraries/convert
        -$(RMDIR) $(STATEDIR)/certs
        -$(RMDIR) $(STATEDIR)
        -$(RMDIR) $(SERVERROOT)/ppd
@@ -293,24 +302,48 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
        $(RM) $(LIBDIR)/libcupsmime.1.dylib
        $(RM) $(LIBDIR)/libcupsmime.a
        $(RM) $(LIBDIR)/libcupsmime.dylib
-       $(RM) $(LIBDIR)/libcupsmime_s.a
-       $(RM) $(LIBDIR)/libcupsmime.sl
-       $(RM) $(LIBDIR)/libcupsmime.sl.1
        $(RM) $(LIBDIR)/libcupsmime.so
        $(RM) $(LIBDIR)/libcupsmime.so.1
        -$(RMDIR) $(LIBDIR)
        $(RM) $(INCLUDEDIR)/cups/mime.h
        -$(RMDIR) $(INCLUDEDIR)/cups
-
-uninstall32bit:
-       $(RM) $(LIB32DIR)/libcupsmime.so
-       $(RM) $(LIB32DIR)/libcupsmime.so.1
-       -$(RMDIR) $(LIB32DIR)
-
-uninstall64bit:
-       $(RM) $(LIB64DIR)/libcupsmime.so
-       $(RM) $(LIB64DIR)/libcupsmime.so.1
-       -$(RMDIR) $(LIB64DIR)
+       if test "x$(INITDIR)" != x; then \
+               echo Uninstalling init scripts...; \
+               $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \
+               $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \
+               $(RM)  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
+               $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
+               $(RM) $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
+               $(RMDIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
+               $(RM) $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
+               $(RMDIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
+               $(RM) $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
+               $(RMDIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
+       fi
+       if test "x$(INITDDIR)" != x; then \
+               echo Uninstalling startup script...; \
+               $(RM) $(BUILDROOT)$(INITDDIR)/cups.sh; \
+               $(RMDIR) $(BUILDROOT)$(INITDDIR); \
+       fi
+       if test "x$LAUNCHD_DIR" != x; then \
+               echo Uninstalling launchd files...; \
+               $(RM) $(BUILDROOT)$(LAUNCHD_DIR)/org.cups.cupsd.plist; \
+               $(RM) $(BUILDROOT)$(LAUNCHD_DIR)/org.cups.cups-lpd.plist; \
+       fi
+       if test "x$SYSTEMD_DIR" != x; then \
+               echo Uninstalling systemd files...; \
+               $(RM) $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cupsd.path; \
+               $(RM) $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cupsd.service; \
+               $(RM) $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cupsd.socket; \
+       fi
+       if test "x$(SMFMANIFESTDIR)" != x; then \
+               echo Uninstalling SMF manifest file...;\
+               $(RM) $(BUILDROOT)$(SMFMANIFESTDIR)/cups.xml; \
+       fi
+       if test "x$(XINETD)" != x; then \
+               echo Uninstalling xinetd configuration file for cups-lpd...; \
+               $(RM) $(BUILDROOT)$(XINETD)/cups-lpd; \
+       fi
 
 
 #
@@ -323,6 +356,8 @@ apihelp:
                --css ../doc/cups-printable.css \
                --header api-mime.header --intro api-mime.shtml \
                mime.h $(LIBOBJS:.o=.c) >../doc/help/api-mime.html
+       mxmldoc --tokens help/api-mime.html api-mime.xml >../doc/help/api-mime.tokens
+       $(RM) api-mime.xml
 
 framedhelp:
        mxmldoc --framed api-mime \
@@ -341,16 +376,16 @@ cupsd:    $(CUPSDOBJS) $(LIBCUPSMIME) ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
                $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
-               $(LIBPAPER) $(LIBMALLOC) $(CUPSDLIBS) $(DNSSDLIBS) $(LIBS) \
-               $(LIBGSSAPI) $(LIBWRAP)
+               $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) \
+                $(DNSSDLIBS) $(LIBS) $(LIBGSSAPI) $(LIBWRAP)
 
-cupsd-static:  $(CUPSDOBJS) libcupsmime.a ../cups/libcups.a
+cupsd-static:  $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o cupsd-static $(CUPSDOBJS) libcupsmime.a \
                $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
-               ../cups/libcups.a $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
-               $(LIBMALLOC) $(CUPSDLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
-               $(LIBWRAP)
+               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
+               $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) $(DNSSDLIBS) \
+                $(LIBGSSAPI) $(LIBWRAP)
 
 
 #
@@ -363,6 +398,12 @@ cupsfilter:        cupsfilter.o $(LIBCUPSMIME) ../cups/$(LIBCUPS)
        $(RM) convert
        $(LN) cupsfilter convert
 
+cupsfilter-static:     cupsfilter.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
+       echo Linking $@...
+       $(CC) $(LDFLAGS) -o cupsfilter-static cupsfilter.o libcupsmime.a \
+               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
+               $(DNSSDLIBS) $(LIBGSSAPI)
+
 
 #
 # Make the device daemon, "cups-deviced".
@@ -384,58 +425,34 @@ cups-driverd:     cups-driverd.o util.o ../cups/$(LIBCUPS) ../ppdc/$(LIBCUPSPPDC)
 
 
 #
-# Make the line printer daemon, "cups-lpd".
+# Make the sandbox execution helper, "cups-exec".
 #
 
-cups-lpd:      cups-lpd.o ../cups/$(LIBCUPS)
+cups-exec:     cups-exec.o
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cups-lpd cups-lpd.o $(LIBS)
+       $(CC) $(LDFLAGS) -o cups-exec cups-exec.o $(LIBS)
 
 
 #
-# Make the polling daemon, "cups-polld".
+# Make the line printer daemon, "cups-lpd".
 #
 
-cups-polld:    cups-polld.o ../cups/$(LIBCUPS)
+cups-lpd:      cups-lpd.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cups-polld cups-polld.o $(LIBS)
+       $(CC) $(LDFLAGS) -o cups-lpd cups-lpd.o $(LIBS)
 
 
 #
-# libcupsmime.so.1, libcupsmime.sl.1
+# libcupsmime.so.1
 #
 
-libcupsmime.so.1 libcupsmime.sl.1:     $(LIBOBJS)
+libcupsmime.so.1     $(LIBOBJS)
        echo Linking $@...
        $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
        $(RM) `basename $@ .1`
        $(LN) $@ `basename $@ .1`
 
 
-#
-# 32bit/libcupsmime.so.1
-#
-
-32bit/libcupsmime.so.1:        $(LIB32OBJS)
-       echo Linking 32-bit $@...
-       -mkdir 32bit
-       $(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(LIBS)
-       $(RM) 32bit/libcupsmime.so
-       $(LN) libcupsmime.so.1 32bit/libcupsmime.so
-
-
-#
-# 64bit/libcupsmime.so.1
-#
-
-64bit/libcupsmime.so.1:        $(LIB64OBJS)
-       echo Linking 64-bit $@...
-       -mkdir 64bit
-       $(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(LIBS)
-       $(RM) 64bit/libcupsmime.so
-       $(LN) libcupsmime.so.1 64bit/libcupsmime.so
-
-
 #
 # libcupsmime.1.dylib
 #
@@ -452,17 +469,6 @@ libcupsmime.1.dylib:       $(LIBOBJS) libcupsmime.exp
        $(LN) $@ libcupsmime.dylib
 
 
-#
-# libcupsmime_s.a
-#
-
-libcupsmime_s.a:       $(LIBOBJS)
-       echo Creating $@...
-       $(DSO) $(DSOFLAGS) -o libcupsmime_s.o $(LIBOBJS) $(LIBS)
-       $(RM) $@
-       $(AR) $(ARFLAGS) $@ libcupsmime_s.o
-
-
 #
 # libcupsmime.la
 #
@@ -484,33 +490,25 @@ libcupsmime.a:    $(LIBOBJS)
        $(RANLIB) $@
 
 
-#
-# Make the test program, "testdirsvc".
-#
-
-testdirsvc:    testdirsvc.o
-       echo Linking $@...
-       $(CC) $(LDFLAGS) -o testdirsvc testdirsvc.o $(COMMONLIBS) $(NETLIBS)
-
-
 #
 # Make the test program, "testlpd".
 #
 
-testlpd:       testlpd.o ../cups/libcups.a cups-lpd
+testlpd:       testlpd.o ../cups/$(LIBCUPSSTATIC) cups-lpd
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o testlpd testlpd.o ../cups/libcups.a \
-               $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(LIBGSSAPI)
+       $(CC) $(LDFLAGS) -o testlpd testlpd.o ../cups/$(LIBCUPSSTATIC) \
+               $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
 
 
 #
 # testmime
 #
 
-testmime:      testmime.o libcupsmime.a ../cups/libcups.a
+testmime:      testmime.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testmime.o libcupsmime.a \
-               ../cups/libcups.a $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(LIBGSSAPI)
+               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
+               $(DNSSDLIBS) $(LIBGSSAPI)
        echo Running MIME tests...
        ./testmime
 
@@ -519,29 +517,33 @@ testmime: testmime.o libcupsmime.a ../cups/libcups.a
 # Make the test program, "testspeed".
 #
 
-testspeed:     testspeed.o ../cups/libcups.a
+testspeed:     testspeed.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o testspeed testspeed.o ../cups/libcups.a \
-               $(SSLLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
+       $(CC) $(LDFLAGS) -o testspeed testspeed.o ../cups/$(LIBCUPSSTATIC) \
+               $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
 #
 # Make the test program, "testsub".
 #
 
-testsub:       testsub.o ../cups/libcups.a
+testsub:       testsub.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o testsub testsub.o ../cups/libcups.a \
-               $(SSLLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
+       $(CC) $(LDFLAGS) -o testsub testsub.o ../cups/$(LIBCUPSSTATIC) \
+               $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
 #
-# Dependencies...
+# Lines of code computation...
 #
-  
-include Dependencies
+
+sloc:
+       echo "cupsd: \c"
+       sloccount $(CUPSDOBJS:.o=.c) $(LIBOBJS:.o=.c) cups-driverd.cxx cups-lpd.c 2>/dev/null | grep "Total Physical" | awk '{print $$9}'
 
 
 #
-# End of "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $".
+# Dependencies...
 #
+
+include Dependencies