Import CUPS 1.4svn r7023 into easysw/current.

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index 8629f6a573bf595a326887339d29ad22b94e1627..258d577b431e07aa41972c3e5864b8d2115ec8f0 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,25 +1,16 @@
 #
-# "$Id: Makedefs.in 5563 2006-05-21 17:18:40Z mike $"
+# "$Id: Makedefs.in 7016 2007-10-10 22:07:51Z mike $"
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+#   Copyright 2007 by Apple Inc.
+#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   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/".
 #
 
 #
@@ -78,6 +69,8 @@ CUPS_LOG_FILE_PERM = @CUPS_LOG_FILE_PERM@
 #
 
 LANGUAGES      =       @LANGUAGES@
+INSTALL_LANGUAGES =    @INSTALL_LANGUAGES@
+UNINSTALL_LANGUAGES =  @UNINSTALL_LANGUAGES@
 
 #
 # Libraries...
@@ -91,6 +84,7 @@ LIBMALLOC     =       @LIBMALLOC@
 LIBPAPER       =       @LIBPAPER@
 LIBPNG         =       @LIBPNG@
 LIBSLP         =       @LIBSLP@
+LIBGSSAPI      =       @LIBGSSAPI@
 LIBTIFF                =       @LIBTIFF@
 LIBZ           =       @LIBZ@
 
@@ -103,8 +97,7 @@ INSTALLSTATIC        =       @INSTALLSTATIC@
 #
 # Program options...
 #
-# ARCHFLAGS     Defines the default architecture build options, used
-#               when compiling separate 32/64-bit libraries.
+# ARCHFLAGS     Defines the default architecture build options.
 # ARCH32FLAGS   Defines the 32-bit architecture build options, used
 #               when compiling separate 32/64-bit libraries.
 # ARCH64FLAGS   Defines the 64-bit architecture build options, used
@@ -115,10 +108,12 @@ INSTALLSTATIC     =       @INSTALLSTATIC@
 #               for extra debug info)
 #
 
+ALL_CFLAGS     =       $(CFLAGS) $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
+                       $(OPTIONS)
 ARCHFLAGS      =       @ARCHFLAGS@
 ARFLAGS                =       @ARFLAGS@
 BACKLIBS       =       @BACKLIBS@
-CFLAGS         =       -I.. $(SSLFLAGS) @CPPFLAGS@ @CFLAGS@ \
+CFLAGS         =       -I.. @CPPFLAGS@ @CFLAGS@ \
                        @LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
 COMMONLIBS     =       @LIBS@
 CUPSDLIBS      =       @CUPSDLIBS@
@@ -127,10 +122,16 @@ CXXFLAGS  =       -I.. $(SSLFLAGS) @CPPFLAGS@ @CXXFLAGS@ \
 CXXLIBS                =       @CXXLIBS@
 DSOFLAGS       =       @DSOFLAGS@
 DSOLIBS                =       @DSOLIBS@ $(COMMONLIBS)
-IMGLIBS                =       @IMGLIBS@ -lm
+DNSSDLIBS      =       @DNSSDLIBS@
+FONTS          =       @FONTS@
+IMGLIBS                =       @IMGLIBS@
 IMGFILTERS     =       @IMGFILTERS@
-LDFLAGS                =       -L../cups -L../filter $(RC_CFLAGS) $(ARCHFLAGS) \
-                       @LDFLAGS@ @PIEFLAGS@ $(OPTIM)
+LAUNCHDLIBS    =       @LAUNCHDLIBS@
+LDFLAGS                =       -L../cups -L../filter @LDARCHFLAGS@ \
+                       @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
+LEGACY_BACKENDS        =       @LEGACY_BACKENDS@
+LIBCUPSORDER   =       @LIBCUPSORDER@
+LIBCUPSIMAGEORDER =    @LIBCUPSIMAGEORDER@
 LINKCUPS       =       @LINKCUPS@ $(SSLLIBS)
 LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
 LIBS           =       $(LINKCUPS) $(COMMONLIBS)
@@ -142,7 +143,6 @@ PDFTOPS             =       @PDFTOPS@
 PHPDIR         =       @PHPDIR@
 SSLFLAGS       =       @SSLFLAGS@
 SSLLIBS                =       @SSLLIBS@
-LAUNCHDLIBS    =       @LAUNCHDLIBS@
 
 #
 # Separate 32/64-bit library support...
@@ -172,12 +172,16 @@ UNINSTALL64       =       @UNINSTALL64@
 # We have to define these first because autoconf uses ${prefix}
 # and ${exec_prefix} for most of the other directories...
 #
+# The "datarootdir" variable may not get defined if you are using
+# a version of autoconf prior to 2.60.
+#
 # This is immediately followed by definition in ALL CAPS for the
 # needed directories...
 #
 
 bindir         =       @bindir@
 datadir                =       @datadir@
+datarootdir    =       @datarootdir@
 exec_prefix    =       @exec_prefix@
 includedir     =       @includedir@
 infodir                =       @infodir@
@@ -200,6 +204,7 @@ BINDIR              =       $(BUILDROOT)@bindir@
 CACHEDIR       =       $(BUILDROOT)@CUPS_CACHEDIR@
 DATADIR                =       $(BUILDROOT)@CUPS_DATADIR@
 DOCDIR         =       $(BUILDROOT)@CUPS_DOCROOT@
+ICONDIR                =       @ICONDIR@
 INCLUDEDIR     =       $(BUILDROOT)$(includedir)
 INITDIR                =       @INITDIR@
 INITDDIR       =       @INITDDIR@
@@ -207,7 +212,11 @@ LIBDIR             =       $(BUILDROOT)$(libdir)
 LOCALEDIR      =       $(BUILDROOT)@CUPS_LOCALEDIR@
 LOGDIR         =       $(BUILDROOT)@CUPS_LOGDIR@
 MANDIR         =       $(BUILDROOT)@mandir@
+MENUDIR                =       @MENUDIR@
 PMANDIR                =       $(BUILDROOT)@PMANDIR@
+RCLEVELS       =       @RCLEVELS@
+RCSTART                =       @RCSTART@
+RCSTOP         =       @RCSTOP@
 REQUESTS       =       $(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR                =       $(BUILDROOT)@sbindir@
 SERVERBIN      =       $(BUILDROOT)@CUPS_SERVERBIN@
@@ -237,15 +246,15 @@ DBUSDIR           =       @DBUSDIR@
 
 .c.o:
        echo Compiling $<...
-       $(CC) $(ARCHFLAGS) $(OPTIM) $(CFLAGS) -c $<
+       $(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c $<
 
 .c.32.o:
        echo Compiling 32-bit $<...
-       $(CC) $(ARCH32FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<
+       $(CC) $(ARCH32FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
 
 .c.64.o:
        echo Compiling 64-bit $<...
-       $(CC) $(ARCH64FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<
+       $(CC) $(ARCH64FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
 
 .cxx.o:
        echo Compiling $<...
@@ -263,5 +272,5 @@ DBUSDIR             =       @DBUSDIR@
 
 
 #
-# End of "$Id: Makedefs.in 5563 2006-05-21 17:18:40Z mike $"
+# End of "$Id: Makedefs.in 7016 2007-10-10 22:07:51Z mike $"
 #