Merge changes from CUPS 1.4svn-r7994.

[thirdparty/cups.git] / systemv / Makefile

diff --git a/systemv/Makefile b/systemv/Makefile
index 4e8d14f053fa9de435766cacd132164c4cdab589..58cc4ffa00873b2aa6a2a4c1e669fbc377ddac95 100644 (file)
--- 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
 
 
 #