Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index 01480314c7d871e13f5201b7c04b63559d9412ce..f213a3f38f157aea6e3ab178e9a2fa1c57276fb4 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,9 +1,9 @@
 #
-# "$Id: Makedefs.in 6649 2007-07-11 21:46:42Z mike $"
+# "$Id: Makedefs.in 7687 2008-06-24 01:28:36Z mike $"
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -22,6 +22,7 @@ AWK           =       @AWK@
 CC             =       @LIBTOOL@ @CC@
 CXX            =       @LIBTOOL@ @CXX@
 DSO            =       @DSO@
+DSOXX          =       @DSOXX@
 HTMLDOC                =       @HTMLDOC@
 INSTALL                =       @INSTALL@
 LD             =       @LD@
@@ -34,17 +35,17 @@ RM          =       @RM@ -f
 RMDIR          =       @RMDIR@
 SED            =       @SED@
 SHELL          =       /bin/sh
-STRIP          =       @STRIP@
+
 
 #
 # Installation programs...
 #
 
-INSTALL_BIN    =       $(LIBTOOL) $(INSTALL) -m 755
+INSTALL_BIN    =       $(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
 INSTALL_CONFIG =       $(INSTALL) -m @CUPS_CONFIG_FILE_PERM@
 INSTALL_DATA   =       $(INSTALL) -m 644
 INSTALL_DIR    =       $(INSTALL) -d
-INSTALL_LIB    =       $(LIBTOOL) $(INSTALL) -m 755
+INSTALL_LIB    =       $(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
 INSTALL_MAN    =       $(INSTALL) -m 644
 INSTALL_SCRIPT =       $(INSTALL) -m 755
 
@@ -77,7 +78,11 @@ UNINSTALL_LANGUAGES =        @UNINSTALL_LANGUAGES@
 #
 
 LIBCUPS                =       @LIBCUPS@
+LIBCUPSCGI     =       @LIBCUPSCGI@
+LIBCUPSDRIVER  =       @LIBCUPSDRIVER@
 LIBCUPSIMAGE   =       @LIBCUPSIMAGE@
+LIBCUPSMIME    =       @LIBCUPSMIME@
+LIBCUPSPPDC    =       @LIBCUPSPPDC@
 LIBJPEG                =       @LIBJPEG@
 LIBLDAP                =       @LIBLDAP@
 LIBMALLOC      =       @LIBMALLOC@
@@ -86,6 +91,8 @@ LIBPNG                =       @LIBPNG@
 LIBSLP         =       @LIBSLP@
 LIBGSSAPI      =       @LIBGSSAPI@
 LIBTIFF                =       @LIBTIFF@
+LIBUSB         =       @LIBUSB@
+LIBWRAP                =       @LIBWRAP@
 LIBZ           =       @LIBZ@
 
 #
@@ -108,19 +115,19 @@ INSTALLSTATIC     =       @INSTALLSTATIC@
 #               for extra debug info)
 #
 
-ALL_CFLAGS     =       $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
-                       $(OPTIONS) $(CFLAGS)
+ALL_CFLAGS     =       -I.. -D_CUPS_SOURCE $(CFLAGS) $(SSLFLAGS) \
+                       @LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
+ALL_CXXFLAGS   =       -I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \
+                       @LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
 ARCHFLAGS      =       @ARCHFLAGS@
 ARFLAGS                =       @ARFLAGS@
 BACKLIBS       =       @BACKLIBS@
-CFLAGS         =       -I.. @CPPFLAGS@ @CFLAGS@ \
-                       @LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
+CFLAGS         =       @CPPFLAGS@ @CFLAGS@
 COMMONLIBS     =       @LIBS@
 CUPSDLIBS      =       @CUPSDLIBS@
-CXXFLAGS       =       -I.. $(SSLFLAGS) @CPPFLAGS@ @CXXFLAGS@ \
-                       @LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
+CXXFLAGS       =       @CPPFLAGS@ @CXXFLAGS@
 CXXLIBS                =       @CXXLIBS@
-DSOFLAGS       =       @DSOFLAGS@
+DSOFLAGS       =       -L../cups @DSOFLAGS@
 DSOLIBS                =       @DSOLIBS@ $(COMMONLIBS)
 DNSSDLIBS      =       @DNSSDLIBS@
 FONTS          =       @FONTS@
@@ -131,17 +138,22 @@ 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)
+MDNS           =       @MDNS@
 OPTIM          =       @OPTIM@
 OPTIONS                =
 PAMLIBS                =       @PAMLIBS@
 PAP            =       @PAP@
 PDFTOPS                =       @PDFTOPS@
 PHPDIR         =       @PHPDIR@
+PHPOPTIONS     =       @PHPOPTIONS@ -I../.. `$(PHPCONFIG) --includes`
 SSLFLAGS       =       @SSLFLAGS@
 SSLLIBS                =       @SSLLIBS@
+UNITTESTS      =       @UNITTESTS@
+
 
 #
 # Separate 32/64-bit library support...
@@ -220,6 +232,7 @@ REQUESTS    =       $(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR                =       $(BUILDROOT)@sbindir@
 SERVERBIN      =       $(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT     =       $(BUILDROOT)@CUPS_SERVERROOT@
+SMFMANIFESTDIR =       @SMFMANIFESTDIR@
 STATEDIR       =       $(BUILDROOT)@CUPS_STATEDIR@
 XINETD         =       @XINETD@
 
@@ -241,7 +254,7 @@ DBUSDIR             =       @DBUSDIR@
 #
 
 .SILENT:
-.SUFFIXES:     .1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
+.SUFFIXES:     .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
 
 .c.o:
        echo Compiling $<...
@@ -257,19 +270,19 @@ DBUSDIR           =       @DBUSDIR@
 
 .cxx.o:
        echo Compiling $<...
-       $(CXX) $(ARCHFLAGS) $(OPTIM) $(CXXFLAGS) -c $<
+       $(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c $<
 
-.man.1 .man.1m .man.5 .man.7 .man.8:
+.man.1 .man.1m .man.3 .man.5 .man.7 .man.8:
        echo Linking $<...
        $(RM) $@
        $(LN) $< $@
 
-.man.1.gz .man.1m.gz .man.5.gz .man.7.gz .man.8.gz .man.gz:
+.man.1.gz .man.1m.gz .man.3.gz .man.5.gz .man.7.gz .man.8.gz .man.gz:
        echo -n Compressing $<...
        $(RM) $@
        gzip -v9 <$< >$@
 
 
 #
-# End of "$Id: Makedefs.in 6649 2007-07-11 21:46:42Z mike $"
+# End of "$Id: Makedefs.in 7687 2008-06-24 01:28:36Z mike $"
 #