diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-11-08 00:30:03 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-11-08 00:30:03 +0000 |
commit | a2326b5b72c5117a00d4342dde8e4d20ff41defe (patch) | |
tree | ecd2d60a15f7bad184a6f6e7c20f846e8a4cfadf /scheduler/Makefile | |
parent | d7225fc298cb8397b85758198e70fc5399a44720 (diff) | |
download | cups-a2326b5b72c5117a00d4342dde8e4d20ff41defe.tar.gz |
Merge changes from CUPS 1.6svn-r10112.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3486 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/Makefile')
-rw-r--r-- | scheduler/Makefile | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/scheduler/Makefile b/scheduler/Makefile index d562437a3..c8570be62 100644 --- a/scheduler/Makefile +++ b/scheduler/Makefile @@ -51,8 +51,6 @@ COBJS = \ cups-deviced.o \ cups-exec.o \ cups-lpd.o \ - cups-polld.o \ - testdirsvc.o \ testlpd.o \ testmime.o \ testspeed.o \ @@ -68,7 +66,6 @@ LIBTARGETS = \ libcupsmime.a UNITTARGETS = \ - testdirsvc \ testlpd \ testmime \ testspeed \ @@ -80,8 +77,7 @@ PROGRAMS = \ cups-deviced \ cups-driverd \ cups-exec \ - cups-lpd \ - cups-polld + cups-lpd TARGETS = \ $(LIBTARGETS) \ @@ -215,10 +211,6 @@ install-exec: $(INSTALL_DIR) -m 755 $(SBINDIR) $(INSTALL_BIN) -m 500 cupsd $(SBINDIR) $(INSTALL_BIN) cupsfilter $(SBINDIR) - -if test "x`uname`" = xDarwin; then \ - $(INSTALL_DIR) $(BUILDROOT)/System/Library/Printers/Libraries; \ - $(LN) $(sbindir)/cupsfilter $(BUILDROOT)/System/Library/Printers/Libraries/convert; \ - fi echo Installing programs in $(SERVERBIN)/daemon... $(INSTALL_DIR) -m 755 $(SERVERBIN) $(INSTALL_DIR) -m 755 $(SERVERBIN)/daemon @@ -439,15 +431,6 @@ cups-lpd: cups-lpd.o ../cups/$(LIBCUPS) # -# Make the polling daemon, "cups-polld". -# - -cups-polld: cups-polld.o ../cups/$(LIBCUPS) - echo Linking $@... - $(CC) $(LDFLAGS) -o cups-polld cups-polld.o $(LIBS) - - -# # libcupsmime.so.1, libcupsmime.sl.1 # @@ -507,15 +490,6 @@ libcupsmime.a: $(LIBOBJS) # -# Make the test program, "testdirsvc". -# - -testdirsvc: testdirsvc.o - echo Linking $@... - $(CC) $(LDFLAGS) -o testdirsvc testdirsvc.o $(COMMONLIBS) $(NETLIBS) - - -# # Make the test program, "testlpd". # |