lpoptions now works with discovered but un-added printers (Issue #5045)

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index f3ae6cd66bcdc099c878cb7fcdc164fe65f706fc..f96a5e9bf4d0054d0841a1fa45d22dad00c8a031 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,16 +1,20 @@
 #
 # Common makefile definitions for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products, all rights reserved.
+# Copyright © 2007-2018 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
-# missing or damaged, see the license at "http://www.cups.org/".
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
+#
+# CUPS version...
+#
+
+CUPS_VERSION    =       @CUPS_VERSION@
+
+
 #
 # Programs...
 #
@@ -29,6 +33,7 @@ LD_CC         =       @LD_CC@
 LD_CXX         =       @LD_CXX@
 LIBTOOL                =       @LIBTOOL@
 LN             =       @LN@ -sf
+MKDIR           =       @MKDIR@ -p
 MV             =       @MV@
 RANLIB         =       @RANLIB@
 RM             =       @RM@ -f
@@ -87,10 +92,8 @@ LOCALTARGET     =       @LOCALTARGET@
 #
 
 LIBCUPS                =       @LIBCUPS@
-LIBCUPSCGI     =       @LIBCUPSCGI@
 LIBCUPSIMAGE   =       @LIBCUPSIMAGE@
-LIBCUPSMIME    =       @LIBCUPSMIME@
-LIBCUPSPPDC    =       @LIBCUPSPPDC@
+LIBCUPSOBJS    =       @LIBCUPSOBJS@
 LIBCUPSSTATIC  =       @LIBCUPSSTATIC@
 LIBGSSAPI      =       @LIBGSSAPI@
 LIBMALLOC      =       @LIBMALLOC@
@@ -118,6 +121,13 @@ IPPALIASES =       @IPPALIASES@
 
 INSTALLXPC     =       @INSTALLXPC@
 
+#
+# Code signing...
+#
+
+CODE_SIGN      =       @CODE_SIGN@
+CODE_SIGN_IDENTITY = -
+
 #
 # Program options...
 #
@@ -128,10 +138,12 @@ INSTALLXPC        =       @INSTALLXPC@
 #               for extra debug info)
 #
 
-ALL_CFLAGS     =       -I.. -D_CUPS_SOURCE $(CFLAGS) $(SSLFLAGS) \
-                       @LARGEFILE@ @PTHREAD_FLAGS@ $(ONDEMANDFLAGS) $(OPTIONS)
-ALL_CXXFLAGS   =       -I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \
-                       @LARGEFILE@ @PTHREAD_FLAGS@ $(ONDEMANDFLAGS) $(OPTIONS)
+ALL_CFLAGS     =       -I.. -D_CUPS_SOURCE $(CFLAGS) \
+                       $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
+                       $(ONDEMANDFLAGS) $(OPTIONS)
+ALL_CXXFLAGS   =       -I.. -D_CUPS_SOURCE $(CXXFLAGS) \
+                       $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
+                       $(ONDEMANDFLAGS) $(OPTIONS)
 ARCHFLAGS      =       @ARCHFLAGS@
 ARFLAGS                =       @ARFLAGS@
 BACKLIBS       =       @BACKLIBS@
@@ -143,21 +155,21 @@ CXXLIBS           =       @CXXLIBS@
 DBUS_NOTIFIER  =       @DBUS_NOTIFIER@
 DBUS_NOTIFIERLIBS =    @DBUS_NOTIFIERLIBS@
 DNSSD_BACKEND  =       @DNSSD_BACKEND@
-DSOFLAGS       =       -L../cups @DSOFLAGS@
+DSOFLAGS       =       -L../cups @ARCHFLAGS@ @LDFLAGS@ @RELROFLAGS@ \
+                       @DSOFLAGS@ $(OPTIM)
 DSOLIBS                =       @DSOLIBS@ $(COMMONLIBS)
 DNSSDLIBS      =       @DNSSDLIBS@
 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)
+LDFLAGS                =       -L../cups @LDARCHFLAGS@ @LDFLAGS@ @RELROFLAGS@ \
+                       @PIEFLAGS@ $(OPTIM)
 LINKCUPS       =       @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
 LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
 LIBS           =       $(LINKCUPS) $(COMMONLIBS)
 ONDEMANDFLAGS  =       @ONDEMANDFLAGS@
 ONDEMANDLIBS   =       @ONDEMANDLIBS@
 OPTIM          =       @OPTIM@
-OPTIONS                =
+OPTIONS                =       @WARNING_OPTIONS@
 PAMLIBS                =       @PAMLIBS@
 SERVERLIBS     =       @SERVERLIBS@
 SSLFLAGS       =       @SSLFLAGS@
@@ -220,6 +232,7 @@ RCLEVELS    =       @RCLEVELS@
 RCSTART                =       @RCSTART@
 RCSTOP         =       @RCSTOP@
 REQUESTS       =       $(BUILDROOT)@CUPS_REQUESTS@
+RESOURCEDIR    =       @CUPS_RESOURCEDIR@
 SBINDIR                =       $(BUILDROOT)@sbindir@
 SERVERBIN      =       $(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT     =       $(BUILDROOT)@CUPS_SERVERROOT@