Merge changes from CUPS trunk, r7566.

[thirdparty/cups.git] / conf / Makefile

diff --git a/conf/Makefile b/conf/Makefile
index 968e66004bbf153186d1a9b6c7e14a77d0bdd625..90ab0cd543bae232e49d6da31ce162ccd235199b 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,25 +1,16 @@
 #
-# "$Id: Makefile 5412 2006-04-17 14:30:53Z mike $"
+# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1993-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   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
@@ -28,7 +19,7 @@ include ../Makedefs
 # Config files...
 #
 
-KEEP   =       cupsd.conf
+KEEP   =       cupsd.conf snmp.conf
 REPLACE        =       mime.convs mime.types
 
 
@@ -39,6 +30,13 @@ REPLACE      =       mime.convs mime.types
 all:
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all config and object files...
 #
@@ -54,10 +52,17 @@ depend:
 
 
 #
-# Install files...
+# Install all targets...
 #
 
-install:       all
+install:       all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
        $(INSTALL_DIR) -m 755 $(SERVERROOT)
        for file in $(KEEP); do \
                if test -r $(SERVERROOT)/$$file ; then \
@@ -86,6 +91,27 @@ install:     all
        fi
 
 
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
 #
 # Uninstall files...
 #
@@ -102,5 +128,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 5412 2006-04-17 14:30:53Z mike $".
+# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
 #