Remove all of the Subversion keywords from various source files.

[thirdparty/cups.git] / scheduler / Makefile

diff --git a/scheduler/Makefile b/scheduler/Makefile
index 5e3750c1b2f949296f1fd6bd4027b35afc7c592e..3f707ae08fb09a2cb041c87a3171037068e7065d 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,9 +1,7 @@
 #
-# "$Id$"
-#
 # Scheduler Makefile for CUPS.
 #
-# Copyright 2007-2013 by Apple Inc.
+# Copyright 2007-2015 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -149,8 +147,6 @@ install-data:
        $(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
        echo Creating $(SERVERROOT)...
        $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)
-       echo Creating $(SERVERROOT)/interfaces...
-       $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/interfaces
        echo Creating $(SERVERROOT)/ppd...
        $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/ppd
        if test "x`uname`" != xDarwin; then \
@@ -171,7 +167,7 @@ install-data:
        echo Creating $(REQUESTS)/tmp...
        $(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp
        echo Creating $(CACHEDIR)...
-       $(INSTALL_DIR) -m 775 -g $(CUPS_GROUP) $(CACHEDIR)
+       $(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; \
@@ -206,8 +202,9 @@ install-data:
                $(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); \
-       fi
-       if test "x$(XINETD)" != x; then \
+               $(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; \
@@ -401,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".
@@ -544,8 +547,3 @@ sloc:
 #
 
 include Dependencies
-
-
-#
-# End of "$Id$".
-#