diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-09-29 17:17:42 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-09-29 17:17:42 +0000 |
commit | 1f6f3dbcf92ae4c7e22a6b143ef27dd330e8ddbb (patch) | |
tree | 2bd75a648fdfc2bcb00b506378bfac8b62cceeee /systemv/Makefile | |
parent | 0af14961a854522d785f6716459b8fb951632963 (diff) | |
download | cups-1f6f3dbcf92ae4c7e22a6b143ef27dd330e8ddbb.tar.gz |
Merge changes from CUPS 1.4svn-r7994.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@989 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'systemv/Makefile')
-rw-r--r-- | systemv/Makefile | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/systemv/Makefile b/systemv/Makefile index 4e8d14f05..58cc4ffa0 100644 --- a/systemv/Makefile +++ b/systemv/Makefile @@ -15,9 +15,9 @@ include ../Makedefs -TARGETS = accept cancel cupsaddsmb cupsctl cupstestdsc cupstestppd \ +TARGETS = cancel cupsaccept cupsaddsmb cupsctl cupstestdsc cupstestppd \ lp lpadmin lpinfo lpmove lpoptions lppasswd lpstat -OBJS = accept.o cancel.o cupsaddsmb.o cupsctl.o cupstestdsc.o \ +OBJS = cancel.o cupsaccept.o cupsaddsmb.o cupsctl.o cupstestdsc.o \ cupstestppd.o lp.o lpadmin.o lpinfo.o lpmove.o lpoptions.o \ lppasswd.o lpstat.o @@ -49,7 +49,7 @@ unittests: clean: $(RM) $(OBJS) $(TARGETS) - $(RM) cupsaccept cupsdisable cupsenable cupsreject reject + $(RM) accept cupsdisable cupsenable cupsreject reject # @@ -153,27 +153,25 @@ uninstall: # -# accept +# cancel # -accept: accept.o ../cups/$(LIBCUPS) +cancel: cancel.o ../cups/$(LIBCUPS) echo Linking $@... - $(CC) $(LDFLAGS) -o accept accept.o $(LIBS) - $(RM) cupsaccept cupsenable cupsdisable cupsreject reject - $(LN) accept reject - $(LN) accept cupsaccept - $(LN) accept cupsenable - $(LN) accept cupsdisable - $(LN) accept cupsreject + $(CC) $(LDFLAGS) -o cancel cancel.o $(LIBS) # -# cancel +# cupsaccept # -cancel: cancel.o ../cups/$(LIBCUPS) +cupsaccept: cupsaccept.o ../cups/$(LIBCUPS) echo Linking $@... - $(CC) $(LDFLAGS) -o cancel cancel.o $(LIBS) + $(CC) $(LDFLAGS) -o cupsaccept cupsaccept.o $(LIBS) + for file in accept cupsenable cupsdisable cupsreject reject; do \ + $(RM) $$file; \ + $(LN) cupsaccept $$file; \ + done # |