summaryrefslogtreecommitdiff
path: root/scheduler/Makefile
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2011-01-17 23:54:15 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2011-01-17 23:54:15 +0000
commit0268488e2f31bbec0c6b02ff7b7594b3191e6177 (patch)
tree23495e9caedd80740ae4d956554c014d339da456 /scheduler/Makefile
parentc779abb06a2a4c102b65b3f9f65e4ca6a792fff7 (diff)
downloadcups-0268488e2f31bbec0c6b02ff7b7594b3191e6177.tar.gz
Merge changes from CUPS 1.5svn-r9491.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2949 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/Makefile')
-rw-r--r--scheduler/Makefile17
1 files changed, 15 insertions, 2 deletions
diff --git a/scheduler/Makefile b/scheduler/Makefile
index 9ce54b320..75a849949 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -49,6 +49,7 @@ COBJS = \
$(LIBOBJS) \
cupsfilter.o \
cups-deviced.o \
+ cups-exec.o \
cups-lpd.o \
cups-polld.o \
testdirsvc.o \
@@ -73,17 +74,18 @@ UNITTARGETS = \
testspeed \
testsub
-DAEMONS = \
+PROGRAMS = \
cupsd \
cupsfilter \
cups-deviced \
cups-driverd \
+ cups-exec \
cups-lpd \
cups-polld
TARGETS = \
$(LIBTARGETS) \
- $(DAEMONS)
+ $(PROGRAMS)
#
@@ -222,6 +224,7 @@ install-exec:
$(INSTALL_DIR) -m 755 $(SERVERBIN)/daemon
$(INSTALL_BIN) cups-deviced $(SERVERBIN)/daemon
$(INSTALL_BIN) cups-driverd $(SERVERBIN)/daemon
+ $(INSTALL_BIN) cups-exec $(SERVERBIN)/daemon
$(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
$(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
if test "x$(SYMROOT)" != "x"; then \
@@ -279,6 +282,7 @@ uninstall:
$(RM) $(SBINDIR)/cupsfilter
$(RM) $(SERVERBIN)/daemon/cups-deviced
$(RM) $(SERVERBIN)/daemon/cups-driverd
+ $(RM) $(SERVERBIN)/daemon/cups-exec
$(RM) $(SERVERBIN)/daemon/cups-lpd
$(RM) $(SERVERBIN)/daemon/cups-polld
$(RM) $(BUILDROOT)/System/Library/Printers/Libraries/convert
@@ -417,6 +421,15 @@ cups-driverd: cups-driverd.o util.o ../cups/$(LIBCUPS) ../ppdc/$(LIBCUPSPPDC)
#
+# Make the sandbox execution helper, "cups-exec".
+#
+
+cups-exec: cups-exec.o
+ echo Linking $@...
+ $(CC) $(LDFLAGS) -o cups-exec cups-exec.o $(LIBS)
+
+
+#
# Make the line printer daemon, "cups-lpd".
#