diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2014-03-21 14:50:24 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2014-03-21 14:50:24 +0000 |
| commit | f2b8078bd6129eb05e81a9bb07a2d7a295d5422e (patch) | |
| tree | bc06eb159882b388eb60c2f71870ce9d724a4de9 /Makedefs.in | |
| parent | 9ca6ba8fcbf752dc4048bc687380744673da916b (diff) | |
| download | cups-f2b8078bd6129eb05e81a9bb07a2d7a295d5422e.tar.gz | |
Save work on generalizing startup of cupsd…
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11716 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'Makedefs.in')
| -rw-r--r-- | Makedefs.in | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/Makedefs.in b/Makedefs.in index f55057ae6..5d261c39d 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -3,7 +3,7 @@ # # Common makefile definitions for CUPS. # -# Copyright 2007-2013 by Apple Inc. +# Copyright 2007-2014 by Apple Inc. # Copyright 1997-2007 by Easy Software Products, all rights reserved. # # These coded instructions, statements, and computer programs are the @@ -121,9 +121,9 @@ INSTALLXPC = @INSTALLXPC@ # ALL_CFLAGS = -I.. -D_CUPS_SOURCE $(CFLAGS) $(SSLFLAGS) \ - @LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS) + @LARGEFILE@ @PTHREAD_FLAGS@ $(ONDEMANDFLAGS) $(OPTIONS) ALL_CXXFLAGS = -I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \ - @LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS) + @LARGEFILE@ @PTHREAD_FLAGS@ $(ONDEMANDFLAGS) $(OPTIONS) ARCHFLAGS = @ARCHFLAGS@ ARFLAGS = @ARFLAGS@ BACKLIBS = @BACKLIBS@ @@ -140,13 +140,14 @@ DSOLIBS = @DSOLIBS@ $(COMMONLIBS) DNSSDLIBS = @DNSSDLIBS@ IPPFIND_BIN = @IPPFIND_BIN@ IPPFIND_MAN = @IPPFIND_MAN@ -LAUNCHDLIBS = @LAUNCHDLIBS@ LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ -L../scheduler @LDARCHFLAGS@ \ @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ) LINKCUPSIMAGE = @LINKCUPSIMAGE@ LIBS = $(LINKCUPS) $(COMMONLIBS) +ONDEMANDFLAGS = @ONDEMANDFLAGS@ +ONDEMANDLIBS = @ONDEMANDLIBS@ OPTIM = @OPTIM@ OPTIONS = PAMLIBS = @PAMLIBS@ @@ -200,8 +201,6 @@ DATADIR = $(BUILDROOT)@CUPS_DATADIR@ DOCDIR = $(BUILDROOT)@CUPS_DOCROOT@ ICONDIR = @ICONDIR@ INCLUDEDIR = $(BUILDROOT)$(includedir) -INITDIR = @INITDIR@ -INITDDIR = @INITDDIR@ LIBDIR = $(BUILDROOT)$(libdir) LOCALEDIR = $(BUILDROOT)@CUPS_LOCALEDIR@ LOGDIR = $(BUILDROOT)@CUPS_LOGDIR@ @@ -216,10 +215,7 @@ REQUESTS = $(BUILDROOT)@CUPS_REQUESTS@ SBINDIR = $(BUILDROOT)@sbindir@ SERVERBIN = $(BUILDROOT)@CUPS_SERVERBIN@ SERVERROOT = $(BUILDROOT)@CUPS_SERVERROOT@ -SMFMANIFESTDIR = @SMFMANIFESTDIR@ STATEDIR = $(BUILDROOT)@CUPS_STATEDIR@ -USBQUIRKS = @USBQUIRKS@ -XINETD = @XINETD@ MAN1EXT = @MAN1EXT@ MAN5EXT = @MAN5EXT@ @@ -230,8 +226,15 @@ MAN8DIR = @MAN8DIR@ PAMDIR = @PAMDIR@ PAMFILE = @PAMFILE@ -DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@ DBUSDIR = @DBUSDIR@ +INITDIR = @INITDIR@ +INITDDIR = @INITDDIR@ +LAUNCHD_DIR = @LAUNCHD_DIR@ +SMFMANIFESTDIR = @SMFMANIFESTDIR@ +SYSTEMD_DIR = @SYSTEMD_DIR@ +XINETD = @XINETD@ + +USBQUIRKS = @USBQUIRKS@ # |