Fix missing header in ippeveps.c, add .gz to man pages in RPM spec file (Red

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index f96a5e9bf4d0054d0841a1fa45d22dad00c8a031..e345e2fd1e24a6b31c50e501fce4a2055ec71039 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,7 +1,7 @@
 #
 # Common makefile definitions for CUPS.
 #
-# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -96,8 +96,9 @@ LIBCUPSIMAGE  =       @LIBCUPSIMAGE@
 LIBCUPSOBJS    =       @LIBCUPSOBJS@
 LIBCUPSSTATIC  =       @LIBCUPSSTATIC@
 LIBGSSAPI      =       @LIBGSSAPI@
+LIBHEADERS     =       @LIBHEADERS@
+LIBHEADERSPRIV =       @LIBHEADERSPRIV@
 LIBMALLOC      =       @LIBMALLOC@
-LIBMXML                =       @LIBMXML@
 LIBPAPER       =       @LIBPAPER@
 LIBUSB         =       @LIBUSB@
 LIBWRAP                =       @LIBWRAP@
@@ -115,6 +116,14 @@ INSTALLSTATIC      =       @INSTALLSTATIC@
 
 IPPALIASES     =       @IPPALIASES@
 
+
+#
+# ippeveprinter commands...
+#
+
+IPPEVECOMMANDS =       @IPPEVECOMMANDS@
+
+
 #
 # Install XPC backends?
 #
@@ -144,6 +153,9 @@ ALL_CFLAGS  =       -I.. -D_CUPS_SOURCE $(CFLAGS) \
 ALL_CXXFLAGS   =       -I.. -D_CUPS_SOURCE $(CXXFLAGS) \
                        $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
                        $(ONDEMANDFLAGS) $(OPTIONS)
+ALL_DSOFLAGS   =       -L../cups @ARCHFLAGS@ @RELROFLAGS@ $(DSOFLAGS) $(OPTIM)
+ALL_LDFLAGS    =       -L../cups @LDARCHFLAGS@ @RELROFLAGS@ $(LDFLAGS)  \
+                       @PIEFLAGS@ $(OPTIM)
 ARCHFLAGS      =       @ARCHFLAGS@
 ARFLAGS                =       @ARFLAGS@
 BACKLIBS       =       @BACKLIBS@
@@ -155,14 +167,12 @@ CXXLIBS           =       @CXXLIBS@
 DBUS_NOTIFIER  =       @DBUS_NOTIFIER@
 DBUS_NOTIFIERLIBS =    @DBUS_NOTIFIERLIBS@
 DNSSD_BACKEND  =       @DNSSD_BACKEND@
-DSOFLAGS       =       -L../cups @ARCHFLAGS@ @LDFLAGS@ @RELROFLAGS@ \
-                       @DSOFLAGS@ $(OPTIM)
+DSOFLAGS       =       @DSOFLAGS@
 DSOLIBS                =       @DSOLIBS@ $(COMMONLIBS)
 DNSSDLIBS      =       @DNSSDLIBS@
 IPPFIND_BIN    =       @IPPFIND_BIN@
 IPPFIND_MAN    =       @IPPFIND_MAN@
-LDFLAGS                =       -L../cups @LDARCHFLAGS@ @LDFLAGS@ @RELROFLAGS@ \
-                       @PIEFLAGS@ $(OPTIM)
+LDFLAGS                =       @LDFLAGS@
 LINKCUPS       =       @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
 LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
 LIBS           =       $(LINKCUPS) $(COMMONLIBS)
@@ -211,9 +221,8 @@ srcdir              =       @srcdir@
 sysconfdir     =       @sysconfdir@
 top_srcdir     =       @top_srcdir@
 
-BUILDROOT      =       $(DSTROOT)
+BUILDROOT      =       $(DSTROOT)$(DESTDIR)
 
-AMANDIR                =       $(BUILDROOT)@AMANDIR@
 BINDIR         =       $(BUILDROOT)@bindir@
 BUNDLEDIR      =       @CUPS_BUNDLEDIR@
 CACHEDIR       =       $(BUILDROOT)@CUPS_CACHEDIR@
@@ -226,7 +235,6 @@ LOCALEDIR   =       $(BUILDROOT)@CUPS_LOCALEDIR@
 LOGDIR         =       $(BUILDROOT)@CUPS_LOGDIR@
 MANDIR         =       $(BUILDROOT)@mandir@
 MENUDIR                =       @MENUDIR@
-PMANDIR                =       $(BUILDROOT)@PMANDIR@
 PRIVATEINCLUDE =       $(BUILDROOT)@PRIVATEINCLUDE@
 RCLEVELS       =       @RCLEVELS@
 RCSTART                =       @RCSTART@
@@ -238,12 +246,6 @@ SERVERBIN  =       $(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT     =       $(BUILDROOT)@CUPS_SERVERROOT@
 STATEDIR       =       $(BUILDROOT)@CUPS_STATEDIR@
 
-MAN1EXT                =       @MAN1EXT@
-MAN5EXT                =       @MAN5EXT@
-MAN7EXT                =       @MAN7EXT@
-MAN8EXT                =       @MAN8EXT@
-MAN8DIR                =       @MAN8DIR@
-
 PAMDIR         =       @PAMDIR@
 PAMFILE                =       @PAMFILE@