Update API help files, fix annotation of some cups_printer_t enums.

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index 5db6b0ab72e6c685a767bde768ab5d7f49fd1bab..dae0e7d3227c2449c956a22ba33d5aa84405732e 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,16 +1,14 @@
 #
-# "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $"
+# Common makefile definitions for CUPS.
 #
-#   Common makefile definitions for CUPS.
+# Copyright 2007-2014 by Apple Inc.
+# Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
-#   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
-#   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
+# missing or damaged, see the license at "http://www.cups.org/".
 #
 
 #
@@ -24,7 +22,7 @@ CHMOD         =       @CHMOD@
 CXX            =       @LIBTOOL@ @CXX@
 DSO            =       @DSO@
 DSOXX          =       @DSOXX@
-HTMLDOC                =       @HTMLDOC@
+GZIP           =       @GZIP@
 INSTALL                =       @INSTALL@
 LD             =       @LD@
 LIBTOOL                =       @LIBTOOL@
@@ -41,6 +39,7 @@ SHELL         =       /bin/sh
 #
 
 INSTALL_BIN    =       $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+INSTALL_COMPDATA =     $(INSTALL) -c -m 444 @INSTALL_GZIP@
 INSTALL_CONFIG =       $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
 INSTALL_DATA   =       $(INSTALL) -c -m 444
 INSTALL_DIR    =       $(INSTALL) -d
@@ -62,6 +61,7 @@ CUPS_PRIMARY_SYSTEM_GROUP =   @CUPS_PRIMARY_SYSTEM_GROUP@
 #
 
 CUPS_CONFIG_FILE_PERM = @CUPS_CONFIG_FILE_PERM@
+CUPS_CUPSD_FILE_PERM = @CUPS_CUPSD_FILE_PERM@
 CUPS_LOG_FILE_PERM = @CUPS_LOG_FILE_PERM@
 
 #
@@ -119,9 +119,9 @@ INSTALLXPC  =       @INSTALLXPC@
 #
 
 ALL_CFLAGS     =       -I.. -D_CUPS_SOURCE $(CFLAGS) $(SSLFLAGS) \
-                       @LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
+                       @LARGEFILE@ @PTHREAD_FLAGS@ $(ONDEMANDFLAGS) $(OPTIONS)
 ALL_CXXFLAGS   =       -I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \
-                       @LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
+                       @LARGEFILE@ @PTHREAD_FLAGS@ $(ONDEMANDFLAGS) $(OPTIONS)
 ARCHFLAGS      =       @ARCHFLAGS@
 ARFLAGS                =       @ARFLAGS@
 BACKLIBS       =       @BACKLIBS@
@@ -136,13 +136,16 @@ DNSSD_BACKEND     =       @DNSSD_BACKEND@
 DSOFLAGS       =       -L../cups @DSOFLAGS@
 DSOLIBS                =       @DSOLIBS@ $(COMMONLIBS)
 DNSSDLIBS      =       @DNSSDLIBS@
-LAUNCHDLIBS    =       @LAUNCHDLIBS@
+IPPFIND_BIN    =       @IPPFIND_BIN@
+IPPFIND_MAN    =       @IPPFIND_MAN@
 LDFLAGS                =       -L../cgi-bin -L../cups -L../filter -L../ppdc \
                        -L../scheduler @LDARCHFLAGS@ \
                        @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-LINKCUPS       =       @LINKCUPS@ $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ)
+LINKCUPS       =       @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
 LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
 LIBS           =       $(LINKCUPS) $(COMMONLIBS)
+ONDEMANDFLAGS  =       @ONDEMANDFLAGS@
+ONDEMANDLIBS   =       @ONDEMANDLIBS@
 OPTIM          =       @OPTIM@
 OPTIONS                =
 PAMLIBS                =       @PAMLIBS@
@@ -196,8 +199,6 @@ DATADIR             =       $(BUILDROOT)@CUPS_DATADIR@
 DOCDIR         =       $(BUILDROOT)@CUPS_DOCROOT@
 ICONDIR                =       @ICONDIR@
 INCLUDEDIR     =       $(BUILDROOT)$(includedir)
-INITDIR                =       @INITDIR@
-INITDDIR       =       @INITDDIR@
 LIBDIR         =       $(BUILDROOT)$(libdir)
 LOCALEDIR      =       $(BUILDROOT)@CUPS_LOCALEDIR@
 LOGDIR         =       $(BUILDROOT)@CUPS_LOGDIR@
@@ -212,9 +213,7 @@ REQUESTS    =       $(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR                =       $(BUILDROOT)@sbindir@
 SERVERBIN      =       $(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT     =       $(BUILDROOT)@CUPS_SERVERROOT@
-SMFMANIFESTDIR =       @SMFMANIFESTDIR@
 STATEDIR       =       $(BUILDROOT)@CUPS_STATEDIR@
-XINETD         =       @XINETD@
 
 MAN1EXT                =       @MAN1EXT@
 MAN5EXT                =       @MAN5EXT@
@@ -225,8 +224,15 @@ MAN8DIR            =       @MAN8DIR@
 PAMDIR         =       @PAMDIR@
 PAMFILE                =       @PAMFILE@
 
-DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@
 DBUSDIR                =       @DBUSDIR@
+INITDIR                =       @INITDIR@
+INITDDIR       =       @INITDDIR@
+LAUNCHD_DIR    =       @LAUNCHD_DIR@
+SMFMANIFESTDIR =       @SMFMANIFESTDIR@
+SYSTEMD_DIR    =       @SYSTEMD_DIR@
+XINETD         =       @XINETD@
+
+USBQUIRKS      =       @USBQUIRKS@
 
 
 #
@@ -253,8 +259,3 @@ DBUSDIR             =       @DBUSDIR@
        echo -n Compressing $<...
        $(RM) $@
        gzip -v9 <$< >$@
-
-
-#
-# End of "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $"
-#