Update svn:keyword properties.

[thirdparty/cups.git] / scheduler / Makefile

diff --git a/scheduler/Makefile b/scheduler/Makefile
index b297aec0afbac174d022a8086262f14c2ed866b1..3c0fff3e12c35c13cc8ac23d614ac8aaeccb443c 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 7875 2008-08-27 22:53:31Z mike $"
+# "$Id$"
 #
 #   Scheduler Makefile for CUPS.
 #
-#   Copyright 2007-2010 by Apple Inc.
+#   Copyright 2007-2012 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -21,9 +21,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,12 +36,12 @@ CUPSDOBJS = \
                printers.o \
                process.o \
                quotas.o \
-               removefile.o \
                select.o \
                server.o \
                statbuf.o \
                subscriptions.o \
-               sysman.o
+               sysman.o \
+               tls.o
 LIBOBJS =      \
                filter.o \
                mime.o \
@@ -51,8 +53,6 @@ COBJS =       \
                cups-deviced.o \
                cups-exec.o \
                cups-lpd.o \
-               cups-polld.o \
-               testdirsvc.o \
                testlpd.o \
                testmime.o \
                testspeed.o \
@@ -68,7 +68,6 @@ LIBTARGETS =  \
                libcupsmime.a
 
 UNITTARGETS =  \
-               testdirsvc \
                testlpd \
                testmime \
                testspeed \
@@ -80,8 +79,7 @@ PROGRAMS =    \
                cups-deviced \
                cups-driverd \
                cups-exec \
-               cups-lpd \
-               cups-polld
+               cups-lpd
 
 TARGETS        =       \
                $(LIBTARGETS) \
@@ -124,8 +122,16 @@ clean:
 #
 
 depend:
-       makedepend -Y -I.. -fDependencies $(COBJS:.o=.c) \
-               $(CXXOBJS:.o=.cxx) >/dev/null 2>&1
+       $(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)
 
 
 #
@@ -213,12 +219,8 @@ install-data:
 install-exec:
        echo Installing programs in $(SBINDIR)...
        $(INSTALL_DIR) -m 755 $(SBINDIR)
-       $(INSTALL_BIN) -m 500 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
@@ -226,11 +228,11 @@ install-exec:
        $(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 $(PROGRAMS); do \
                        cp $$file $(SYMROOT); \
+                       dsymutil $(SYMROOT)/$$file; \
                done \
        fi
 
@@ -264,6 +266,7 @@ install-libs: $(INSTALLSTATIC)
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
                cp $(LIBCUPSMIME) $(SYMROOT); \
+               dsymutil $(SYMROOT)/$(LIBCUPSMIME); \
        fi
 
 installstatic:
@@ -284,7 +287,6 @@ uninstall:
        $(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)
@@ -389,6 +391,8 @@ cupsd-static:       $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
                $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
                $(LIBWRAP)
 
+tls.o: tls-darwin.c tls-gnutls.c tls-openssl.c
+
 
 #
 # Make the cupsfilter utility.
@@ -438,15 +442,6 @@ cups-lpd:  cups-lpd.o ../cups/$(LIBCUPS)
        $(CC) $(LDFLAGS) -o cups-lpd cups-lpd.o $(LIBS)
 
 
-#
-# Make the polling daemon, "cups-polld".
-#
-
-cups-polld:    cups-polld.o ../cups/$(LIBCUPS)
-       echo Linking $@...
-       $(CC) $(LDFLAGS) -o cups-polld cups-polld.o $(LIBS)
-
-
 #
 # libcupsmime.so.1, libcupsmime.sl.1
 #
@@ -506,15 +501,6 @@ 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".
 #
@@ -564,16 +550,16 @@ testsub:  testsub.o ../cups/$(LIBCUPSSTATIC)
 
 sloc:
        echo "cupsd: \c"
-       sloccount $(CUPSDOBJS:.o=.c) $(LIBOBJS:.o=.c) cups-driverd.cxx cups-polld.c cups-lpd.c 2>/dev/null | grep "Total Physical" | awk '{print $$9}'
+       sloccount $(CUPSDOBJS:.o=.c) $(LIBOBJS:.o=.c) cups-driverd.cxx cups-lpd.c 2>/dev/null | grep "Total Physical" | awk '{print $$9}'
 
 
 #
 # Dependencies...
 #
-  
+
 include Dependencies
 
 
 #
-# End of "$Id: Makefile 7875 2008-08-27 22:53:31Z mike $".
+# End of "$Id$".
 #