Merge changes from CUPS 1.5svn-r9000.

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index d4a8929d634071ab2c74c285f83b570b4c1aeb0e..d173cb7be430d98f5339fb6a9c85c226a32ea14b 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,9 +1,9 @@
 #
-# "$Id: Makedefs.in 7016 2007-10-10 22:07:51Z mike $"
+# "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $"
 #
-#   Common makefile definitions for the Common UNIX Printing System (CUPS).
+#   Common makefile definitions for CUPS.
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -20,6 +20,7 @@
 AR             =       @AR@
 AWK            =       @AWK@
 CC             =       @LIBTOOL@ @CC@
+CHMOD          =       @CHMOD@
 CXX            =       @LIBTOOL@ @CXX@
 DSO            =       @DSO@
 DSOXX          =       @DSOXX@
@@ -36,18 +37,17 @@ RMDIR               =       @RMDIR@
 SED            =       @SED@
 SHELL          =       /bin/sh
 
-
 #
 # Installation programs...
 #
 
-INSTALL_BIN    =       $(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
-INSTALL_CONFIG =       $(INSTALL) -m @CUPS_CONFIG_FILE_PERM@
-INSTALL_DATA   =       $(INSTALL) -m 644
+INSTALL_BIN    =       $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+INSTALL_CONFIG =       $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+INSTALL_DATA   =       $(INSTALL) -c -m 444
 INSTALL_DIR    =       $(INSTALL) -d
-INSTALL_LIB    =       $(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
-INSTALL_MAN    =       $(INSTALL) -m 644
-INSTALL_SCRIPT =       $(INSTALL) -m 755
+INSTALL_LIB    =       $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+INSTALL_MAN    =       $(INSTALL) -c -m 444
+INSTALL_SCRIPT =       $(INSTALL) -c -m 555
 
 #
 # Default user, group, and system groups for the scheduler...
@@ -83,6 +83,7 @@ LIBCUPSDRIVER =       @LIBCUPSDRIVER@
 LIBCUPSIMAGE   =       @LIBCUPSIMAGE@
 LIBCUPSMIME    =       @LIBCUPSMIME@
 LIBCUPSPPDC    =       @LIBCUPSPPDC@
+LIBCUPSSTATIC  =       @LIBCUPSSTATIC@
 LIBJPEG                =       @LIBJPEG@
 LIBLDAP                =       @LIBLDAP@
 LIBMALLOC      =       @LIBMALLOC@
@@ -91,6 +92,8 @@ LIBPNG                =       @LIBPNG@
 LIBSLP         =       @LIBSLP@
 LIBGSSAPI      =       @LIBGSSAPI@
 LIBTIFF                =       @LIBTIFF@
+LIBUSB         =       @LIBUSB@
+LIBWRAP                =       @LIBWRAP@
 LIBZ           =       @LIBZ@
 
 #
@@ -120,11 +123,15 @@ ALL_CXXFLAGS      =       -I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \
 ARCHFLAGS      =       @ARCHFLAGS@
 ARFLAGS                =       @ARFLAGS@
 BACKLIBS       =       @BACKLIBS@
+BANNERTOPS     =       @BANNERTOPS@
 CFLAGS         =       @CPPFLAGS@ @CFLAGS@
 COMMONLIBS     =       @LIBS@
 CUPSDLIBS      =       @CUPSDLIBS@
 CXXFLAGS       =       @CPPFLAGS@ @CXXFLAGS@
 CXXLIBS                =       @CXXLIBS@
+DBUS_NOTIFIER  =       @DBUS_NOTIFIER@
+DBUS_NOTIFIERLIBS =    @DBUS_NOTIFIERLIBS@
+DNSSD_BACKEND  =       @DNSSD_BACKEND@
 DSOFLAGS       =       -L../cups @DSOFLAGS@
 DSOLIBS                =       @DSOLIBS@ $(COMMONLIBS)
 DNSSDLIBS      =       @DNSSDLIBS@
@@ -132,12 +139,13 @@ FONTS             =       @FONTS@
 IMGLIBS                =       @IMGLIBS@
 IMGFILTERS     =       @IMGFILTERS@
 LAUNCHDLIBS    =       @LAUNCHDLIBS@
-LDFLAGS                =       -L../cups -L../filter @LDARCHFLAGS@ \
+LDFLAGS                =       -L../cgi-bin -L../cups -L../filter -L../ppdc \
+                       -L../scheduler @LDARCHFLAGS@ \
                        @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
 LEGACY_BACKENDS        =       @LEGACY_BACKENDS@
 LIBCUPSORDER   =       @LIBCUPSORDER@
 LIBCUPSIMAGEORDER =    @LIBCUPSIMAGEORDER@
-LINKCUPS       =       @LINKCUPS@ $(SSLLIBS)
+LINKCUPS       =       @LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS)
 LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
 LIBS           =       $(LINKCUPS) $(COMMONLIBS)
 OPTIM          =       @OPTIM@
@@ -146,8 +154,12 @@ PAMLIBS            =       @PAMLIBS@
 PAP            =       @PAP@
 PDFTOPS                =       @PDFTOPS@
 PHPDIR         =       @PHPDIR@
+PHPOPTIONS     =       @PHPOPTIONS@ -I../.. `$(PHPCONFIG) --includes`
 SSLFLAGS       =       @SSLFLAGS@
 SSLLIBS                =       @SSLLIBS@
+TEXTTOPS       =       @TEXTTOPS@
+UNITTESTS      =       @UNITTESTS@
+
 
 #
 # Separate 32/64-bit library support...
@@ -226,6 +238,7 @@ REQUESTS    =       $(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR                =       $(BUILDROOT)@sbindir@
 SERVERBIN      =       $(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT     =       $(BUILDROOT)@CUPS_SERVERROOT@
+SMFMANIFESTDIR =       @SMFMANIFESTDIR@
 STATEDIR       =       $(BUILDROOT)@CUPS_STATEDIR@
 XINETD         =       @XINETD@
 
@@ -277,5 +290,5 @@ DBUSDIR             =       @DBUSDIR@
 
 
 #
-# End of "$Id: Makedefs.in 7016 2007-10-10 22:07:51Z mike $"
+# End of "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $"
 #