Merge changes from CUPS 1.5svn-r9385.

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index e557871d2124b3da1f105b483500b80828069c86..c7d066d426e9bf524e8cd0399ad09a38e2ea31ac 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,9 +1,9 @@
 #
 # "$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-2009 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
@@ -83,6 +83,7 @@ LIBCUPSDRIVER =       @LIBCUPSDRIVER@
 LIBCUPSIMAGE   =       @LIBCUPSIMAGE@
 LIBCUPSMIME    =       @LIBCUPSMIME@
 LIBCUPSPPDC    =       @LIBCUPSPPDC@
+LIBCUPSSTATIC  =       @LIBCUPSSTATIC@
 LIBJPEG                =       @LIBJPEG@
 LIBLDAP                =       @LIBLDAP@
 LIBMALLOC      =       @LIBMALLOC@
@@ -123,9 +124,9 @@ ARCHFLAGS   =       @ARCHFLAGS@
 ARFLAGS                =       @ARFLAGS@
 BACKLIBS       =       @BACKLIBS@
 BANNERTOPS     =       @BANNERTOPS@
+BUILDDIRS      =       @BUILDDIRS@
 CFLAGS         =       @CPPFLAGS@ @CFLAGS@
 COMMONLIBS     =       @LIBS@
-CUPSDLIBS      =       @CUPSDLIBS@
 CXXFLAGS       =       @CPPFLAGS@ @CXXFLAGS@
 CXXLIBS                =       @CXXLIBS@
 DBUS_NOTIFIER  =       @DBUS_NOTIFIER@
@@ -142,8 +143,6 @@ 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) $(DNSSDLIBS)
 LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
 LIBS           =       $(LINKCUPS) $(COMMONLIBS)
@@ -154,6 +153,7 @@ PAP         =       @PAP@
 PDFTOPS                =       @PDFTOPS@
 PHPDIR         =       @PHPDIR@
 PHPOPTIONS     =       @PHPOPTIONS@ -I../.. `$(PHPCONFIG) --includes`
+SERVERLIBS     =       @SERVERLIBS@
 SSLFLAGS       =       @SSLFLAGS@
 SSLLIBS                =       @SSLLIBS@
 TEXTTOPS       =       @TEXTTOPS@
@@ -207,6 +207,7 @@ localstatedir       =       @localstatedir@
 mandir         =       @mandir@
 oldincludedir  =       @oldincludedir@
 prefix         =       @prefix@
+privateinclude =       @privateinclude@
 sbindir                =       @sbindir@
 sharedstatedir =       @sharedstatedir@
 srcdir         =       @srcdir@
@@ -217,6 +218,7 @@ BUILDROOT   =       $(DSTROOT)
 
 AMANDIR                =       $(BUILDROOT)@AMANDIR@
 BINDIR         =       $(BUILDROOT)@bindir@
+BUNDLEDIR      =       @CUPS_BUNDLEDIR@
 CACHEDIR       =       $(BUILDROOT)@CUPS_CACHEDIR@
 DATADIR                =       $(BUILDROOT)@CUPS_DATADIR@
 DOCDIR         =       $(BUILDROOT)@CUPS_DOCROOT@
@@ -230,6 +232,7 @@ LOGDIR              =       $(BUILDROOT)@CUPS_LOGDIR@
 MANDIR         =       $(BUILDROOT)@mandir@
 MENUDIR                =       @MENUDIR@
 PMANDIR                =       $(BUILDROOT)@PMANDIR@
+PRIVATEINCLUDE =       $(BUILDROOT)@PRIVATEINCLUDE@
 RCLEVELS       =       @RCLEVELS@
 RCSTART                =       @RCSTART@
 RCSTOP         =       @RCSTOP@
@@ -263,7 +266,7 @@ DBUSDIR             =       @DBUSDIR@
 
 .c.o:
        echo Compiling $<...
-       $(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c $<
+       $(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
 
 .c.32.o:
        echo Compiling 32-bit $<...
@@ -275,7 +278,7 @@ DBUSDIR             =       @DBUSDIR@
 
 .cxx.o:
        echo Compiling $<...
-       $(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c $<
+       $(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $<
 
 .man.1 .man.1m .man.3 .man.5 .man.7 .man.8:
        echo Linking $<...